diff --git a/.classpath b/.classpath index c08f7a09ee..528ea3ff5a 100644 --- a/.classpath +++ b/.classpath @@ -15,7 +15,7 @@ - + diff --git a/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java b/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java index 8c5bed5d70..6bac472d51 100644 --- a/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java +++ b/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java @@ -54,6 +54,7 @@ public class PaymentWorker { private static int rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); /** @deprecated */ + @Deprecated public static void getPartyPaymentMethodValueMaps(PageContext pageContext, String partyId, Boolean showOld, String paymentMethodValueMapsAttr) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); List paymentMethodValueMaps = getPartyPaymentMethodValueMaps(delegator, partyId, showOld); @@ -98,6 +99,7 @@ public class PaymentWorker { /** TODO: REMOVE (DEJ 20030301): This is the OLD style and should be removed when the eCommerce and party mgr JSPs are */ /** @deprecated */ + @Deprecated public static void getPaymentMethodAndRelated(PageContext pageContext, String partyId, String paymentMethodAttr, String creditCardAttr, String eftAccountAttr, String paymentMethodIdAttr, String curContactMechIdAttr, String donePageAttr, String tryEntityAttr) { diff --git a/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java b/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java index f81c24f54a..74c55dcef4 100644 --- a/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java +++ b/applications/accounting/src/org/ofbiz/accounting/test/FinAccountTests.java @@ -40,10 +40,12 @@ public class FinAccountTests extends OFBizTestCase { super(name); } + @Override protected void setUp() throws Exception { userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system")); } + @Override protected void tearDown() throws Exception { } diff --git a/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java b/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java index aec7210787..ebb500c010 100644 --- a/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java +++ b/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java @@ -18,29 +18,35 @@ *******************************************************************************/ package org.ofbiz.accounting.thirdparty.clearcommerce; -import java.util.Map; -import java.util.List; -import java.util.Iterator; -import java.util.ArrayList; -import java.text.DecimalFormat; -import java.io.OutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; -import org.ofbiz.base.util.*; -import org.ofbiz.entity.GenericValue; +import org.ofbiz.accounting.payment.PaymentGatewayServices; +import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.GeneralException; +import org.ofbiz.base.util.HttpClient; +import org.ofbiz.base.util.HttpClientException; +import org.ofbiz.base.util.UtilGenerics; +import org.ofbiz.base.util.UtilNumber; +import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.base.util.UtilXml; import org.ofbiz.entity.GenericEntityException; +import org.ofbiz.entity.GenericValue; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; -import org.ofbiz.accounting.payment.PaymentGatewayServices; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; -import org.apache.xml.serialize.XMLSerializer; -import org.apache.xml.serialize.OutputFormat; /** @@ -53,7 +59,7 @@ public class CCPaymentServices { private static int rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); - public static Map ccAuth(DispatchContext dctx, Map context) { + public static Map ccAuth(DispatchContext dctx, Map context) { String ccAction = (String) context.get("ccAction"); if (ccAction == null) ccAction = new String("PreAuth"); Document authRequestDoc = buildPrimaryTxRequest(context, ccAction, (BigDecimal) context.get("processAmount"), @@ -67,11 +73,11 @@ public class CCPaymentServices { } if (getMessageListMaxSev(authResponseDoc) > 4) { // 5 and higher, process error from HSBC - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); result.put("authResult", new Boolean(false)); result.put("processAmount", new BigDecimal("0.00")); result.put("authRefNum", getReferenceNum(authResponseDoc)); - List messages = getMessageList(authResponseDoc); + List messages = getMessageList(authResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -81,7 +87,7 @@ public class CCPaymentServices { return processAuthResponse(authResponseDoc); } - public static Map ccCredit(DispatchContext dctx, Map context) { + public static Map ccCredit(DispatchContext dctx, Map context) { String action = new String("Credit"); if (context.get("pbOrder") != null) { action = new String("Auth"); // required for periodic billing.... @@ -97,11 +103,11 @@ public class CCPaymentServices { } if (getMessageListMaxSev(creditResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); result.put("creditResult", new Boolean(false)); result.put("creditAmount", new BigDecimal("0.00")); result.put("creditRefNum", getReferenceNum(creditResponseDoc)); - List messages = getMessageList(creditResponseDoc); + List messages = getMessageList(creditResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -111,7 +117,7 @@ public class CCPaymentServices { return processCreditResponse(creditResponseDoc); } - public static Map ccCapture(DispatchContext dctx, Map context) { + public static Map ccCapture(DispatchContext dctx, Map context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -130,11 +136,11 @@ public class CCPaymentServices { } if (getMessageListMaxSev(captureResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); result.put("captureResult", new Boolean(false)); result.put("captureAmount", new BigDecimal("0.00")); result.put("captureRefNum", getReferenceNum(captureResponseDoc)); - List messages = getMessageList(captureResponseDoc); + List messages = getMessageList(captureResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -144,7 +150,7 @@ public class CCPaymentServices { return processCaptureResponse(captureResponseDoc); } - public static Map ccRelease(DispatchContext dctx, Map context) { + public static Map ccRelease(DispatchContext dctx, Map context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -162,11 +168,11 @@ public class CCPaymentServices { } if (getMessageListMaxSev(releaseResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); result.put("releaseResult", new Boolean(false)); result.put("releaseAmount", new BigDecimal("0.00")); result.put("releaseRefNum", getReferenceNum(releaseResponseDoc)); - List messages = getMessageList(releaseResponseDoc); + List messages = getMessageList(releaseResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -176,7 +182,7 @@ public class CCPaymentServices { return processReleaseResponse(releaseResponseDoc); } - public static Map ccReleaseNoop(DispatchContext dctx, Map context) { + public static Map ccReleaseNoop(DispatchContext dctx, Map context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -184,7 +190,7 @@ public class CCPaymentServices { return ServiceUtil.returnError("No authorization transaction found; cannot release"); } - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); result.put("releaseResult", Boolean.valueOf(true)); result.put("releaseCode", authTransaction.getString("gatewayCode")); result.put("releaseAmount", authTransaction.getBigDecimal("amount")); @@ -195,7 +201,7 @@ public class CCPaymentServices { return result; } - public static Map ccRefund(DispatchContext dctx, Map context) { + public static Map ccRefund(DispatchContext dctx, Map context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -216,11 +222,11 @@ public class CCPaymentServices { } if (getMessageListMaxSev(refundResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); result.put("refundResult", new Boolean(false)); result.put("refundAmount", new BigDecimal("0.00")); result.put("refundRefNum", getReferenceNum(refundResponseDoc)); - List messages = getMessageList(refundResponseDoc); + List messages = getMessageList(refundResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -230,7 +236,7 @@ public class CCPaymentServices { return processRefundResponse(refundResponseDoc); } - public static Map ccReAuth(DispatchContext dctx, Map context) { + public static Map ccReAuth(DispatchContext dctx, Map context) { GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference"); GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference); @@ -249,11 +255,11 @@ public class CCPaymentServices { } if (getMessageListMaxSev(reauthResponseDoc) > 4) { - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); result.put("reauthResult", new Boolean(false)); result.put("reauthAmount", new BigDecimal("0.00")); result.put("reauthRefNum", getReferenceNum(reauthResponseDoc)); - List messages = getMessageList(reauthResponseDoc); + List messages = getMessageList(reauthResponseDoc); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } @@ -264,7 +270,7 @@ public class CCPaymentServices { } - public static Map ccReport(DispatchContext dctx, Map context) { + public static Map ccReport(DispatchContext dctx, Map context) { // configuration file String paymentConfig = (String) context.get("paymentConfig"); @@ -345,28 +351,29 @@ public class CCPaymentServices { UtilXml.addChildElementValue(value,"OrderId", orderId, requestDocument); Debug.set(Debug.VERBOSE, true); - Document reportResponseDoc = null; + //Document reportResponseDoc = null; try { - reportResponseDoc = sendRequest(requestDocument, (String) context.get("paymentConfig")); + //reportResponseDoc = + sendRequest(requestDocument, (String) context.get("paymentConfig")); } catch (ClearCommerceException cce) { return ServiceUtil.returnError(cce.getMessage()); } Debug.set(Debug.VERBOSE, true); - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); return result; } - private static Map processAuthResponse(Document responseDocument) { + private static Map processAuthResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -398,21 +405,21 @@ public class CCPaymentServices { result.put("scoreCode", UtilXml.childElementValue(fraudInfoElement, "TotalScore")); } - List messages = getMessageList(responseDocument); + List messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processCreditResponse(Document responseDocument) { + private static Map processCreditResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -432,21 +439,21 @@ public class CCPaymentServices { result.put("creditFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("creditMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processCaptureResponse(Document responseDocument) { + private static Map processCaptureResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -466,21 +473,21 @@ public class CCPaymentServices { result.put("captureFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("captureMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processReleaseResponse(Document responseDocument) { + private static Map processReleaseResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -500,21 +507,21 @@ public class CCPaymentServices { result.put("releaseFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("releaseMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processRefundResponse(Document responseDocument) { + private static Map processRefundResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -534,21 +541,21 @@ public class CCPaymentServices { result.put("refundFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("refundMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static Map processReAuthResponse(Document responseDocument) { + private static Map processReAuthResponse(Document responseDocument) { Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element orderFormElement = UtilXml.firstChildElement(engineDocElement, "OrderFormDoc"); Element transactionElement = UtilXml.firstChildElement(orderFormElement, "Transaction"); Element procResponseElement = UtilXml.firstChildElement(transactionElement, "CardProcResp"); - Map result = ServiceUtil.returnSuccess(); + Map result = ServiceUtil.returnSuccess(); String errorCode = UtilXml.childElementValue(procResponseElement, "CcErrCode"); if ("1".equals(errorCode)) { @@ -568,23 +575,23 @@ public class CCPaymentServices { result.put("reauthFlag", UtilXml.childElementValue(procResponseElement, "Status")); result.put("reauthMessage", UtilXml.childElementValue(procResponseElement, "CcReturnMsg")); - List messages = getMessageList(responseDocument); + List messages = getMessageList(responseDocument); if (UtilValidate.isNotEmpty(messages)) { result.put("internalRespMsgs", messages); } return result; } - private static List getMessageList(Document responseDocument) { + private static List getMessageList(Document responseDocument) { - List messageList = new ArrayList(); + List messageList = new ArrayList(); Element engineDocElement = UtilXml.firstChildElement(responseDocument.getDocumentElement(), "EngineDoc"); Element messageListElement = UtilXml.firstChildElement(engineDocElement, "MessageList"); - List messageElementList = UtilXml.childElementList(messageListElement, "Message"); + List messageElementList = UtilXml.childElementList(messageListElement, "Message"); if (UtilValidate.isNotEmpty(messageElementList)) { - for (Iterator i = messageElementList.iterator(); i.hasNext();) { - Element messageElement = (Element) i.next(); + for (Iterator i = messageElementList.iterator(); i.hasNext();) { + Element messageElement = i.next(); int severity = 0; try { severity = Integer.parseInt(UtilXml.childElementValue(messageElement, "Sev")); @@ -631,7 +638,7 @@ public class CCPaymentServices { return referenceNum; } - private static Document buildPrimaryTxRequest(Map context, String type, BigDecimal amount, String refNum) { + private static Document buildPrimaryTxRequest(Map context, String type, BigDecimal amount, String refNum) { String paymentConfig = (String) context.get("paymentConfig"); if (UtilValidate.isEmpty(paymentConfig)) { @@ -689,7 +696,7 @@ public class CCPaymentServices { // TODO: determine if adding OrderItemList is worthwhile - JFE 2004.02.14 - Map pbOrder = (Map) context.get("pbOrder"); + Map pbOrder = UtilGenerics.checkMap(context.get("pbOrder")); if (pbOrder != null) { if (Debug.verboseOn()) Debug.logInfo("pbOrder Map not empty:" + pbOrder.toString(),module); Element pbOrderElement = UtilXml.addChildElement(orderFormDocElement, "PbOrder", requestDocument); // periodic billing order @@ -702,16 +709,16 @@ public class CCPaymentServices { else if (context.get("OrderFrequencyCycle") != null && context.get("OrderFrequencyInterval") != null && context.get("TotalNumberPayments") != null) { Element pbOrderElement = UtilXml.addChildElement(orderFormDocElement, "PbOrder", requestDocument); // periodic billing order UtilXml.addChildElementValue(pbOrderElement, "OrderFrequencyCycle", (String) context.get("OrderFrequencyCycle"), requestDocument); - Element interval = UtilXml.addChildElementValue(pbOrderElement, "OrderFrequencyInterval", (String) pbOrder.get("OrderFrequencyInterval"), requestDocument); + Element interval = UtilXml.addChildElementValue(pbOrderElement, "OrderFrequencyInterval", (String) context.get("OrderFrequencyInterval"), requestDocument); interval.setAttribute("DataType", "S32"); - Element total = UtilXml.addChildElementValue(pbOrderElement, "TotalNumberPayments", (String) pbOrder.get("TotalNumberPayments"), requestDocument); + Element total = UtilXml.addChildElementValue(pbOrderElement, "TotalNumberPayments", (String) context.get("TotalNumberPayments"), requestDocument); total.setAttribute("DataType", "S32"); } return requestDocument; } - private static Document buildSecondaryTxRequest(Map context, String id, String type, BigDecimal amount) { + private static Document buildSecondaryTxRequest(Map context, String id, String type, BigDecimal amount) { String paymentConfig = (String) context.get("paymentConfig"); if (UtilValidate.isEmpty(paymentConfig)) { @@ -875,17 +882,10 @@ public class CCPaymentServices { OutputStream os = new ByteArrayOutputStream(); - OutputFormat format = new OutputFormat(); - format.setOmitDocumentType(true); - format.setOmitXMLDeclaration(true); - format.setIndenting(false); - - XMLSerializer serializer = new XMLSerializer(os, format); try { - serializer.asDOMSerializer(); - serializer.serialize(requestDocument.getDocumentElement()); - } catch (IOException ioe) { - throw new ClearCommerceException("Error serializing requestDocument: " + ioe.getMessage()); + UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true, false, 0); + } catch (TransformerException e) { + throw new ClearCommerceException("Error serializing requestDocument: " + e.getMessage()); } String xmlString = os.toString(); diff --git a/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java b/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java index 337acc05d7..677407ca49 100644 --- a/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java +++ b/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java @@ -62,6 +62,7 @@ public class CCServicesTest extends OFBizTestCase { super(name); } + @Override protected void setUp() throws Exception { // populate test data configFile = new String("paymentTest.properties"); diff --git a/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java b/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java index 4636427365..93738f370f 100644 --- a/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java +++ b/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java @@ -165,6 +165,7 @@ public class PcChargeApi { return UtilXml.childElementValue(req, name); } + @Override public String toString() { try { return UtilXml.writeXmlDocument(document); diff --git a/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java b/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java index a29242d40b..abc71bcc71 100644 --- a/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java +++ b/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java @@ -148,6 +148,7 @@ public class RitaApi { return (String) document.get(name); } + @Override public String toString() { StringBuilder buf = new StringBuilder(); Iterator i = document.entrySet().iterator(); diff --git a/applications/content/src/ControlApplet.java b/applications/content/src/ControlApplet.java index 333e877730..d4e7f61111 100644 --- a/applications/content/src/ControlApplet.java +++ b/applications/content/src/ControlApplet.java @@ -57,6 +57,7 @@ public class ControlApplet extends Applet implements Runnable { protected Thread thread = null; + @Override public void init() { ctx = this.getAppletContext(); this.sessionId = this.getParameter("sessionId"); @@ -106,6 +107,7 @@ public class ControlApplet extends Applet implements Runnable { } } + @Override public void destroy() { this.stopped = true; } diff --git a/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java b/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java index d12231f26b..2e8f8e5b46 100644 --- a/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java +++ b/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java @@ -283,6 +283,7 @@ public class ContentMapFacade implements Map { } } + @Override public String toString() { return this.renderThis(); } @@ -342,6 +343,7 @@ public class ContentMapFacade implements Map { } class Content extends AbstractInfo { + @Override public Object get(Object key) { if (!(key instanceof String)) { Debug.logWarning("Key parameters must be a string", module); @@ -372,6 +374,7 @@ public class ContentMapFacade implements Map { } class SubContent extends AbstractInfo { + @Override public Object get(Object key) { if (!(key instanceof String)) { Debug.logWarning("Key parameters must be a string", module); @@ -406,6 +409,7 @@ public class ContentMapFacade implements Map { } class MetaData extends AbstractInfo { + @Override public Object get(Object key) { if (!(key instanceof String)) { Debug.logWarning("Key parameters must be a string", module); @@ -427,6 +431,7 @@ public class ContentMapFacade implements Map { } class DataResource extends AbstractInfo { + @Override public Object get(Object key) { if (!(key instanceof String)) { Debug.logWarning("Key parameters must be a string", module); diff --git a/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java b/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java index 7f8192afbd..3f2a2857a7 100644 --- a/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java +++ b/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java @@ -393,6 +393,7 @@ public class DataResourceWorker implements org.ofbiz.widget.DataResourceWorkerI } /** @deprecated */ + @Deprecated public static String getImageType(GenericDelegator delegator, GenericValue dataResource) { String imageType = null; if (dataResource != null) { @@ -715,24 +716,28 @@ public class DataResourceWorker implements org.ofbiz.widget.DataResourceWorkerI /** @deprecated */ + @Deprecated public static String renderDataResourceAsText(GenericDelegator delegator, String dataResourceId, Map templateContext, GenericValue view, Locale locale, String mimeTypeId) throws GeneralException, IOException { return renderDataResourceAsText(delegator, dataResourceId, templateContext, locale, mimeTypeId, false); } /** @deprecated */ + @Deprecated public static void renderDataResourceAsText(GenericDelegator delegator, String dataResourceId, Appendable out, Map templateContext, GenericValue view, Locale locale, String targetMimeTypeId) throws GeneralException, IOException { renderDataResourceAsText(delegator, dataResourceId, out, templateContext, locale, targetMimeTypeId, false); } /** @deprecated */ + @Deprecated public static String renderDataResourceAsTextCache(GenericDelegator delegator, String dataResourceId, Map templateContext, GenericValue view, Locale locale, String mimeTypeId) throws GeneralException, IOException { return renderDataResourceAsText(delegator, dataResourceId, templateContext, locale, mimeTypeId, true); } /** @deprecated */ + @Deprecated public static void renderDataResourceAsTextCache(GenericDelegator delegator, String dataResourceId, Appendable out, Map templateContext, GenericValue view, Locale locale, String targetMimeTypeId) throws GeneralException, IOException { renderDataResourceAsText(delegator, dataResourceId, out, templateContext, locale, targetMimeTypeId, true); @@ -844,24 +849,28 @@ public class DataResourceWorker implements org.ofbiz.widget.DataResourceWorkerI } /** @deprecated */ + @Deprecated public static String getDataResourceTextCache(GenericValue dataResource, String mimeTypeId, Locale locale, Map context, GenericDelegator delegator) throws IOException, GeneralException { return getDataResourceText(dataResource, mimeTypeId, locale, context, delegator, true); } /** @deprecated */ + @Deprecated public static void writeDataResourceTextCache(GenericValue dataResource, String mimeTypeId, Locale locale, Map context, GenericDelegator delegator, Appendable outWriter) throws IOException, GeneralException { writeDataResourceText(dataResource, mimeTypeId, locale, context, delegator, outWriter, true); } /** @deprecated */ + @Deprecated public static String getDataResourceText(GenericValue dataResource, String mimeTypeId, Locale locale, Map context, GenericDelegator delegator) throws IOException, GeneralException { return getDataResourceText(dataResource, mimeTypeId, locale, context, delegator, false); } /** @deprecated */ + @Deprecated public static void writeDataResourceText(GenericValue dataResource, String mimeTypeId, Locale locale, Map context, GenericDelegator delegator, Appendable out) throws IOException, GeneralException { writeDataResourceText(dataResource, mimeTypeId, locale, context, delegator, out, false); diff --git a/applications/content/src/org/ofbiz/content/search/ContentDocument.java b/applications/content/src/org/ofbiz/content/search/ContentDocument.java index 1bb027652a..286ee295a1 100644 --- a/applications/content/src/org/ofbiz/content/search/ContentDocument.java +++ b/applications/content/src/org/ofbiz/content/search/ContentDocument.java @@ -76,7 +76,7 @@ public class ContentDocument { // make a new, empty document doc = new Document(); String contentId = content.getString("contentId"); - doc.add(new Field("contentId", contentId, Store.YES, Index.UN_TOKENIZED, TermVector.NO)); + doc.add(new Field("contentId", contentId, Store.YES, Index.NOT_ANALYZED, TermVector.NO)); // Add the last modified date of the file a field named "modified". Use // a // Keyword field, so that it's searchable, but so that no attempt is @@ -87,14 +87,14 @@ public class ContentDocument { modDate = (Timestamp) content.get("createdDate"); } if (modDate != null) { - doc.add(new Field("modified", modDate.toString(), Store.YES, Index.UN_TOKENIZED, TermVector.NO)); + doc.add(new Field("modified", modDate.toString(), Store.YES, Index.NOT_ANALYZED, TermVector.NO)); } String contentName = content.getString("contentName"); if (UtilValidate.isNotEmpty(contentName)) - doc.add(new Field("title", contentName, Store.YES, Index.TOKENIZED, TermVector.NO)); + doc.add(new Field("title", contentName, Store.YES, Index.ANALYZED, TermVector.NO)); String description = content.getString("description"); if (UtilValidate.isNotEmpty(description)) - doc.add(new Field("description", description, Store.YES, Index.TOKENIZED, TermVector.NO)); + doc.add(new Field("description", description, Store.YES, Index.ANALYZED, TermVector.NO)); List ancestorList = FastList.newInstance(); GenericDelegator delegator = content.getDelegator(); ContentWorker.getContentAncestryAll(delegator, contentId, "WEB_SITE_PUB_PT", "TO", ancestorList); @@ -102,7 +102,7 @@ public class ContentDocument { //Debug.logInfo("in ContentDocument, ancestorString:" + ancestorString, // module); if (UtilValidate.isNotEmpty(ancestorString)) { - Field field = new Field("site", ancestorString, Store.NO, Index.TOKENIZED, TermVector.NO); + Field field = new Field("site", ancestorString, Store.NO, Index.ANALYZED, TermVector.NO); //Debug.logInfo("in ContentDocument, field:" + field.stringValue(), // module); doc.add(field); @@ -165,7 +165,7 @@ public class ContentDocument { } //Debug.logInfo("in DataResourceDocument, text:" + text, module); if (UtilValidate.isNotEmpty(text)) { - Field field = new Field("content", text, Store.NO, Index.TOKENIZED, TermVector.NO); + Field field = new Field("content", text, Store.NO, Index.ANALYZED, TermVector.NO); //Debug.logInfo("in ContentDocument, field:" + field.stringValue(), module); doc.add(field); } @@ -188,7 +188,7 @@ public class ContentDocument { String featureString = StringUtil.join(featureList, " "); //Debug.logInfo("in ContentDocument, featureString:" + featureString, module); if (UtilValidate.isNotEmpty(featureString)) { - Field field = new Field("feature", featureString, Store.NO, Index.TOKENIZED, TermVector.NO); + Field field = new Field("feature", featureString, Store.NO, Index.ANALYZED, TermVector.NO); doc.add(field); } return true; diff --git a/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java b/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java index 60e0fd6348..058c3cab50 100644 --- a/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java +++ b/applications/content/src/org/ofbiz/content/search/DataResourceDocument.java @@ -60,7 +60,7 @@ public class DataResourceDocument { // make a new, empty document doc = new Document(); - doc.add(new Field("dataResourceId", id, Store.YES, Index.UN_TOKENIZED, TermVector.NO)); + doc.add(new Field("dataResourceId", id, Store.YES, Index.NOT_ANALYZED, TermVector.NO)); String mimeTypeId = dataResource.getString("mimeTypeId"); if (UtilValidate.isEmpty(mimeTypeId)) { @@ -84,7 +84,7 @@ public class DataResourceDocument { String text = outWriter.toString(); Debug.logInfo("in DataResourceDocument, text:" + text, module); if (UtilValidate.isNotEmpty(text)) - doc.add(new Field("content", text, Store.NO, Index.TOKENIZED, TermVector.NO)); + doc.add(new Field("content", text, Store.NO, Index.ANALYZED, TermVector.NO)); return doc; } diff --git a/applications/content/src/org/ofbiz/content/search/SearchWorker.java b/applications/content/src/org/ofbiz/content/search/SearchWorker.java index 6e3af9dde8..7ad8a4a6dd 100644 --- a/applications/content/src/org/ofbiz/content/search/SearchWorker.java +++ b/applications/content/src/org/ofbiz/content/search/SearchWorker.java @@ -139,9 +139,9 @@ public class SearchWorker { // Now create IndexWriter writer = null; try { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED); } catch (Exception e) { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED); } //if (Debug.infoOn()) Debug.logInfo("in indexContent, writer:" + // writer, module); @@ -189,10 +189,10 @@ public class SearchWorker { String indexAllPath = getIndexPath(path); IndexWriter writer = null; try { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED); if (Debug.infoOn()) Debug.logInfo("Used old directory:" + indexAllPath, module); } catch (FileNotFoundException e) { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED); if (Debug.infoOn()) Debug.logInfo("Created new directory:" + indexAllPath, module); } @@ -229,13 +229,13 @@ public class SearchWorker { String indexAllPath = getIndexPath(path); IndexWriter writer = null; try { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED); } catch (FileNotFoundException e) { - writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true); + writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED); } indexDataResource(delegator, context, id, writer); writer.optimize(); - writer.close(); + writer.close(); } diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java index e90777b570..6d76cb15df 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java @@ -90,14 +90,17 @@ public class CheckPermissionTransform implements TemplateTransformModel { return new LoopWriter(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { List trail = (List)templateCtx.get("globalNodeTrail"); String trailCsv = ContentWorker.nodeTrailToCsv(trail); @@ -195,6 +198,7 @@ public class CheckPermissionTransform implements TemplateTransformModel { } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateCtx, savedValues, env); String wrappedContent = buf.toString(); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java index 7da793da5d..b49441d0b8 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java @@ -122,14 +122,17 @@ public class EditRenderSubContentCacheTransform implements TemplateTransformMode return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateCtx, savedValues, env); String wrappedContent = buf.toString(); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java index e66977ee3c..b732c83a4b 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java @@ -161,14 +161,17 @@ public class EditRenderSubContentTransform implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { String wrappedFTL = buf.toString(); if (editTemplate != null && editTemplate.equalsIgnoreCase("true")) { diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java index 04a43978d3..66decffbab 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java @@ -80,14 +80,17 @@ public class InjectNodeTrailCsvTransform implements TemplateTransformModel { final String passedCsv = (String)templateCtx.get("nodeTrailCsv"); + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { String csvTrail = null; @@ -160,6 +163,7 @@ public class InjectNodeTrailCsvTransform implements TemplateTransformModel { } + @Override public void close() throws IOException { templateCtx.put("nodeTrailCsv", passedCsv); String wrappedContent = buf.toString(); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java index f7ca0dd3c9..6254ec6cd0 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java @@ -156,16 +156,19 @@ public class LimitedSubContentCacheTransform implements TemplateTransformModel { return new LoopWriter(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); //StringBuilder ctxBuf = (StringBuilder) templateRoot.get("buf"); //ctxBuf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { List globalNodeTrail = (List) templateRoot.get("globalNodeTrail"); @@ -184,6 +187,7 @@ public class LimitedSubContentCacheTransform implements TemplateTransformModel { } } + @Override public int afterBody() throws TemplateModelException, IOException { FreeMarkerWorker.reloadValues(templateRoot, savedValues, env); List list = (List) templateRoot.get("globalNodeTrail"); @@ -207,6 +211,7 @@ public class LimitedSubContentCacheTransform implements TemplateTransformModel { } } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateRoot, savedValuesUp, env); String wrappedContent = buf.toString(); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java index 2b4218823b..924cdc5630 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java @@ -178,14 +178,17 @@ public class LoopSubContentTransform implements TemplateTransformModel { return new LoopWriter(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { templateCtx.put("entityIndex", Integer.valueOf(0)); boolean inProgress = prepCtx(delegator, templateCtx); @@ -196,6 +199,7 @@ public class LoopSubContentTransform implements TemplateTransformModel { } } + @Override public int afterBody() throws TemplateModelException, IOException { boolean inProgress = prepCtx(delegator, templateCtx); if (inProgress) { @@ -205,6 +209,7 @@ public class LoopSubContentTransform implements TemplateTransformModel { } } + @Override public void close() throws IOException { String wrappedFTL = buf.toString(); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java index 847992ccb5..6e3767326d 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java @@ -76,13 +76,16 @@ public class RenderContentAndSubContent implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { renderSubContent(); //if (Debug.verboseOn()) Debug.logVerbose("in Render(2), globalNodeTrail ." + getWrapped(env, "globalNodeTrail") , module); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java index 2c01e87640..1e70344810 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java @@ -127,13 +127,16 @@ public class RenderContentAsText implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { List globalNodeTrail = (List)templateRoot.get("globalNodeTrail"); if (Debug.verboseOn()) Debug.logVerbose("Render close, globalNodeTrail(2a):" + ContentWorker.nodeTrailToCsv(globalNodeTrail), ""); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java index 9d4c9edf89..8962b8017a 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java @@ -66,13 +66,16 @@ public class RenderContentTransform implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { renderSubContent(); } diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java index 1e2ed9f39a..ac14c93a31 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java @@ -126,13 +126,16 @@ public class RenderSubContentAsText implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { List globalNodeTrail = (List)templateRoot.get("globalNodeTrail"); if (Debug.infoOn()) Debug.logInfo("Render close, globalNodeTrail(2a):" + ContentWorker.nodeTrailToCsv(globalNodeTrail), ""); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java index 514c86a26c..a0d5cf0603 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java @@ -126,13 +126,16 @@ public class RenderSubContentCacheTransform implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { List globalNodeTrail = (List)templateRoot.get("globalNodeTrail"); //if (Debug.infoOn()) Debug.logInfo("Render close, globalNodeTrail(2a):" + FreeMarkerWorker.nodeTrailToCsv(globalNodeTrail), ""); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java index 65f751f838..2154920d74 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java @@ -102,13 +102,16 @@ public class RenderSubContentTransform implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { renderSubContent(); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java index d03707ebda..f98ac94d61 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java @@ -138,16 +138,19 @@ public class TraverseSubContentCacheTransform implements TemplateTransformModel return new LoopWriter(out) { + @Override public void write(char cbuf[], int off, int len) { //StringBuilder ctxBuf = (StringBuilder) templateContext.get("buf"); //ctxBuf.append(cbuf, off, len); buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { //templateContext.put("buf", new StringBuilder()); List nodeTrail = null; @@ -200,6 +203,7 @@ public class TraverseSubContentCacheTransform implements TemplateTransformModel } } + @Override public int afterBody() throws TemplateModelException, IOException { @@ -221,6 +225,7 @@ public class TraverseSubContentCacheTransform implements TemplateTransformModel return TransformControl.END_EVALUATION; } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateRoot, savedValuesUp, env); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java index 96245d5cd8..c4bf6f8e18 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java @@ -155,16 +155,19 @@ public class TraverseSubContentTransform implements TemplateTransformModel { return new LoopWriter(out) { + @Override public void write(char cbuf[], int off, int len) { //StringBuilder ctxBuf = (StringBuilder) templateContext.get("buf"); //ctxBuf.append(cbuf, off, len); buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public int onStart() throws TemplateModelException, IOException { //templateContext.put("buf", new StringBuilder()); List nodeTrail = FastList.newInstance(); @@ -201,6 +204,7 @@ public class TraverseSubContentTransform implements TemplateTransformModel { } } + @Override public int afterBody() throws TemplateModelException, IOException { //out.write(buf.toString()); //buf.setLength(0); @@ -217,6 +221,7 @@ public class TraverseSubContentTransform implements TemplateTransformModel { return TransformControl.END_EVALUATION; } + @Override public void close() throws IOException { String wrappedFTL = buf.toString(); diff --git a/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java b/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java index 099b3a75ae..450340864b 100644 --- a/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java +++ b/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java @@ -137,14 +137,17 @@ public class WrapSubContentCacheTransform implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateCtx, savedValues, env); //if (Debug.infoOn()) Debug.logInfo("in Wrap(2), savedValues ." + savedValues , module); diff --git a/applications/order/src/org/ofbiz/order/order/OrderListState.java b/applications/order/src/org/ofbiz/order/order/OrderListState.java index 7cb972cf44..e5d207c021 100644 --- a/applications/order/src/org/ofbiz/order/order/OrderListState.java +++ b/applications/order/src/org/ofbiz/order/order/OrderListState.java @@ -259,6 +259,7 @@ public class OrderListState { return orders; } + @Override public String toString() { StringBuilder buff = new StringBuilder("OrderListState:\n\t"); buff.append("viewIndex=").append(viewIndex).append(", viewSize=").append(viewSize).append("\n\t"); diff --git a/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java b/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java index 2a5868dfd9..d03070db9a 100644 --- a/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java +++ b/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java @@ -471,6 +471,7 @@ public class OrderReadHelper { } /** @deprecated */ + @Deprecated public GenericValue getShippingAddress() { try { GenericValue orderContactMech = EntityUtil.getFirst(orderHeader.getRelatedByAnd("OrderContactMech", UtilMisc.toMap( @@ -513,6 +514,7 @@ public class OrderReadHelper { } /** @deprecated */ + @Deprecated public GenericValue getBillingAddress() { GenericValue billingAddress = null; try { diff --git a/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java b/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java index b993812dff..195182b776 100644 --- a/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java +++ b/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java @@ -341,6 +341,7 @@ public class ProductDisplayWorker { return ((Comparable) value).compareTo(value2); } + @Override public boolean equals(java.lang.Object obj) { if ((obj != null) && (obj instanceof ProductByMapComparator)) { ProductByMapComparator that = (ProductByMapComparator) obj; diff --git a/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java b/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java index 921f1bf33d..fab61ddebc 100644 --- a/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java +++ b/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java @@ -39,10 +39,12 @@ public class PurchaseOrderTest extends OFBizTestCase { super(name); } + @Override protected void setUp() throws Exception { userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system")); } + @Override protected void tearDown() throws Exception { } diff --git a/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java b/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java index 1ffc516c15..caf8dcad75 100644 --- a/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java +++ b/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java @@ -37,10 +37,12 @@ public class SalesOrderTest extends OFBizTestCase { super(name); } + @Override protected void setUp() throws Exception { userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system")); } + @Override protected void tearDown() throws Exception { } diff --git a/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java b/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java index 9a08c30f6e..2191058c52 100644 --- a/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java +++ b/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java @@ -48,6 +48,7 @@ public class ContactMechWorker { public static final String module = ContactMechWorker.class.getName(); /** @deprecated */ + @Deprecated public static void getPartyContactMechValueMaps(PageContext pageContext, String partyId, boolean showOld, String partyContactMechValueMapsAttr) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); List> partyContactMechValueMaps = getPartyContactMechValueMaps(delegator, partyId, showOld); @@ -204,6 +205,7 @@ public class ContactMechWorker { /** @deprecated */ + @Deprecated public static void getOrderContactMechValueMaps(PageContext pageContext, String orderId, String orderContactMechValueMapsAttr) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); List> maps = getOrderContactMechValueMaps(delegator, orderId); diff --git a/applications/party/src/org/ofbiz/party/party/PartyWorker.java b/applications/party/src/org/ofbiz/party/party/PartyWorker.java index 441b507123..c4f53f1ad6 100644 --- a/applications/party/src/org/ofbiz/party/party/PartyWorker.java +++ b/applications/party/src/org/ofbiz/party/party/PartyWorker.java @@ -84,6 +84,7 @@ public class PartyWorker { } /** @deprecated */ + @Deprecated public static void getPartyOtherValues(PageContext pageContext, String partyId, String partyAttr, String personAttr, String partyGroupAttr) { Map partyMap = getPartyOtherValues(pageContext.getRequest(), partyId, partyAttr, personAttr, partyGroupAttr); for (Map.Entry e: partyMap.entrySet()) { diff --git a/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java b/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java index 8fcb953313..92b20edee7 100644 --- a/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java +++ b/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java @@ -57,6 +57,7 @@ public class CatalogUrlServlet extends HttpServlet { /** * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig) */ + @Override public void init(ServletConfig config) throws ServletException { super.init(config); } @@ -64,6 +65,7 @@ public class CatalogUrlServlet extends HttpServlet { /** * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doGet(request, response); } @@ -71,6 +73,7 @@ public class CatalogUrlServlet extends HttpServlet { /** * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { GenericDelegator delegator = (GenericDelegator) getServletContext().getAttribute("delegator"); @@ -146,6 +149,7 @@ public class CatalogUrlServlet extends HttpServlet { /** * @see javax.servlet.Servlet#destroy() */ + @Override public void destroy() { super.destroy(); } diff --git a/applications/product/src/org/ofbiz/product/category/CategoryWorker.java b/applications/product/src/org/ofbiz/product/category/CategoryWorker.java index e31f3c7010..9d758ff7ad 100644 --- a/applications/product/src/org/ofbiz/product/category/CategoryWorker.java +++ b/applications/product/src/org/ofbiz/product/category/CategoryWorker.java @@ -52,6 +52,7 @@ public class CategoryWorker { public static final String module = CategoryWorker.class.getName(); /** @deprecated */ + @Deprecated public static String getCatalogTopCategory(PageContext pageContext, String defaultTopCategory) { return getCatalogTopCategory(pageContext.getRequest(), defaultTopCategory); } @@ -84,6 +85,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static void getCategoriesWithNoParent(PageContext pageContext, String attributeName) { getCategoriesWithNoParent(pageContext.getRequest(), attributeName); } @@ -110,6 +112,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static void getRelatedCategories(PageContext pageContext, String attributeName, boolean limitView) { getRelatedCategories(pageContext.getRequest(), attributeName, limitView); } @@ -128,6 +131,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static void getRelatedCategories(PageContext pageContext, String attributeName, String parentId, boolean limitView) { getRelatedCategories(pageContext.getRequest(), attributeName, parentId, limitView); } @@ -144,6 +148,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static List getRelatedCategoriesRet(PageContext pageContext, String attributeName, String parentId, boolean limitView) { return getRelatedCategoriesRet(pageContext.getRequest(), attributeName, parentId, limitView); } @@ -267,6 +272,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static void setTrail(PageContext pageContext, String currentCategory) { setTrail(pageContext.getRequest(), currentCategory); } @@ -349,6 +355,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static List getTrail(PageContext pageContext) { return getTrail(pageContext.getRequest()); } @@ -360,6 +367,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static List setTrail(PageContext pageContext, List crumb) { return setTrail(pageContext.getRequest(), crumb); } @@ -371,6 +379,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static boolean checkTrailItem(PageContext pageContext, String category) { return checkTrailItem(pageContext.getRequest(), category); } @@ -386,6 +395,7 @@ public class CategoryWorker { } /** @deprecated */ + @Deprecated public static String lastTrailItem(PageContext pageContext) { return lastTrailItem(pageContext.getRequest()); } diff --git a/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java b/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java index d9d1cc123c..671eeb7a57 100644 --- a/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java +++ b/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java @@ -202,6 +202,7 @@ public class ProductConfigWrapper implements Serializable { return configId; } + @Override public boolean equals(Object obj) { if (!(obj instanceof ProductConfigWrapper)) { return false; @@ -223,6 +224,7 @@ public class ProductConfigWrapper implements Serializable { return true; } + @Override public String toString() { return questions.toString(); } @@ -492,6 +494,7 @@ public class ProductConfigWrapper implements Serializable { return null; } + @Override public boolean equals(Object obj) { if (obj == null || !(obj instanceof ConfigItem)) { return false; @@ -513,6 +516,7 @@ public class ProductConfigWrapper implements Serializable { return true; } + @Override public String toString() { return configItem.getString("configItemId"); } @@ -740,6 +744,7 @@ public class ProductConfigWrapper implements Serializable { return componentOptions; } + @Override public boolean equals(Object obj) { if (obj == null || !(obj instanceof ConfigOption)) { return false; @@ -752,6 +757,7 @@ public class ProductConfigWrapper implements Serializable { return isSelected() == co.isSelected(); } + @Override public String toString() { return configOption.getString("configItemId") + "/" + configOption.getString("configOptionId") + (isSelected()? "*": ""); } diff --git a/applications/product/src/org/ofbiz/product/product/ProductEvents.java b/applications/product/src/org/ofbiz/product/product/ProductEvents.java index cb37216e1a..fa9b4a5e9b 100644 --- a/applications/product/src/org/ofbiz/product/product/ProductEvents.java +++ b/applications/product/src/org/ofbiz/product/product/ProductEvents.java @@ -37,7 +37,6 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.base.util.UtilParse; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.GenericDelegator; @@ -433,10 +432,10 @@ public class ProductEvents { product.set("lastModifiedDate", nowTimestamp); product.setString("lastModifiedByUserLogin", userLogin.getString("userLoginId")); try { - product.set("productHeight", UtilParse.parseBigDecimalForEntity(request.getParameter("productHeight"))); - product.set("productWidth", UtilParse.parseBigDecimalForEntity(request.getParameter("productWidth"))); - product.set("productDepth", UtilParse.parseBigDecimalForEntity(request.getParameter("productDepth"))); - product.set("weight", UtilParse.parseBigDecimalForEntity(request.getParameter("weight"))); + product.set("productHeight", new BigDecimal(request.getParameter("productHeight"))); + product.set("productWidth", parseBigDecimalForEntity(request.getParameter("productWidth"))); + product.set("productDepth", parseBigDecimalForEntity(request.getParameter("productDepth"))); + product.set("weight", parseBigDecimalForEntity(request.getParameter("weight"))); // default unit settings for shipping parameters product.set("heightUomId", "LEN_in"); @@ -444,10 +443,10 @@ public class ProductEvents { product.set("depthUomId", "LEN_in"); product.set("weightUomId", "WT_oz"); - BigDecimal floz = UtilParse.parseBigDecimalForEntity(request.getParameter("~floz")); - BigDecimal ml = UtilParse.parseBigDecimalForEntity(request.getParameter("~ml")); - BigDecimal ntwt = UtilParse.parseBigDecimalForEntity(request.getParameter("~ntwt")); - BigDecimal grams = UtilParse.parseBigDecimalForEntity(request.getParameter("~grams")); + BigDecimal floz = parseBigDecimalForEntity(request.getParameter("~floz")); + BigDecimal ml = parseBigDecimalForEntity(request.getParameter("~ml")); + BigDecimal ntwt = parseBigDecimalForEntity(request.getParameter("~ntwt")); + BigDecimal grams = parseBigDecimalForEntity(request.getParameter("~grams")); List currentProductFeatureAndAppls = EntityUtil.filterByDate(delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId, "productFeatureApplTypeId", "STANDARD_FEATURE")), true); setOrCreateProdFeature(delegator, productId, currentProductFeatureAndAppls, "VLIQ_ozUS", "AMOUNT", floz); @@ -470,14 +469,14 @@ public class ProductEvents { do { GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId)); try { - product.set("productHeight", UtilParse.parseBigDecimalForEntity(request.getParameter("productHeight" + attribIdx))); - product.set("productWidth", UtilParse.parseBigDecimalForEntity(request.getParameter("productWidth" + attribIdx))); - product.set("productDepth", UtilParse.parseBigDecimalForEntity(request.getParameter("productDepth" + attribIdx))); - product.set("weight", UtilParse.parseBigDecimalForEntity(request.getParameter("weight" + attribIdx))); - BigDecimal floz = UtilParse.parseBigDecimalForEntity(request.getParameter("~floz" + attribIdx)); - BigDecimal ml = UtilParse.parseBigDecimalForEntity(request.getParameter("~ml" + attribIdx)); - BigDecimal ntwt = UtilParse.parseBigDecimalForEntity(request.getParameter("~ntwt" + attribIdx)); - BigDecimal grams = UtilParse.parseBigDecimalForEntity(request.getParameter("~grams" + attribIdx)); + product.set("productHeight", parseBigDecimalForEntity(request.getParameter("productHeight" + attribIdx))); + product.set("productWidth", parseBigDecimalForEntity(request.getParameter("productWidth" + attribIdx))); + product.set("productDepth", parseBigDecimalForEntity(request.getParameter("productDepth" + attribIdx))); + product.set("weight", parseBigDecimalForEntity(request.getParameter("weight" + attribIdx))); + BigDecimal floz = parseBigDecimalForEntity(request.getParameter("~floz" + attribIdx)); + BigDecimal ml = parseBigDecimalForEntity(request.getParameter("~ml" + attribIdx)); + BigDecimal ntwt = parseBigDecimalForEntity(request.getParameter("~ntwt" + attribIdx)); + BigDecimal grams = parseBigDecimalForEntity(request.getParameter("~grams" + attribIdx)); List currentProductFeatureAndAppls = EntityUtil.filterByDate(delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId, "productFeatureApplTypeId", "STANDARD_FEATURE")), true); setOrCreateProdFeature(delegator, productId, currentProductFeatureAndAppls, "VLIQ_ozUS", "AMOUNT", floz); @@ -1041,12 +1040,7 @@ public class ProductEvents { return "success"; } - /** - * Return nulls for empty strings, as the entity engine can deal with nulls. This will provide blanks - * in fields where doubles display. Blank meaning null, vs. 0 which means 0 - * @param doubleString - * @return a Double for the parsed value - */ + @Deprecated public static Double parseDoubleForEntity(String doubleString) throws NumberFormatException { if (doubleString == null) { return null; @@ -1058,4 +1052,23 @@ public class ProductEvents { } return Double.valueOf(doubleString); } + + /** + * Return nulls for empty strings, as the entity engine can deal with nulls. This will provide blanks + * in fields where BigDecimal display. Blank meaning null, vs. 0 which means 0 + * @param bigDecimalString + * @return a BigDecimal for the parsed value + */ + public static BigDecimal parseBigDecimalForEntity(String bigDecimalString) throws NumberFormatException { + if (bigDecimalString == null) { + return null; + } + bigDecimalString = bigDecimalString.trim(); + bigDecimalString = bigDecimalString.replaceAll(",", ""); + if (bigDecimalString.length() < 1) { + return null; + } + return new BigDecimal(bigDecimalString); + } + } diff --git a/applications/product/src/org/ofbiz/product/product/ProductSearch.java b/applications/product/src/org/ofbiz/product/product/ProductSearch.java index 75c2013a39..8002e129af 100644 --- a/applications/product/src/org/ofbiz/product/product/ProductSearch.java +++ b/applications/product/src/org/ofbiz/product/product/ProductSearch.java @@ -829,6 +829,7 @@ public class ProductSearch { this.productCategories = productCategories; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { List productCategoryIds = FastList.newInstance(); for (GenericValue category: productCategories) { @@ -854,6 +855,7 @@ public class ProductSearch { } /** pretty print for log messages and even UI stuff */ + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { GenericValue prodCatalog = null; try { @@ -869,6 +871,7 @@ public class ProductSearch { return ppBuf.toString(); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof CatalogConstraint) { @@ -908,6 +911,7 @@ public class ProductSearch { this.exclude = exclude; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { Set productCategoryIdSet = FastSet.newInstance(); if (includeSubCategories) { @@ -931,6 +935,7 @@ public class ProductSearch { } /** pretty print for log messages and even UI stuff */ + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { GenericValue productCategory = null; try { @@ -958,6 +963,7 @@ public class ProductSearch { return ppBuf.toString(); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof CategoryConstraint) { @@ -997,6 +1003,7 @@ public class ProductSearch { this.exclude = exclude; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { // just add to global sets if (exclude == null) { @@ -1011,6 +1018,7 @@ public class ProductSearch { productSearchContext.productSearchConstraintList.add(productSearchContext.getDelegator().makeValue("ProductSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", this.productFeatureId))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { GenericValue productFeature = null; GenericValue productFeatureType = null; @@ -1039,6 +1047,7 @@ public class ProductSearch { return (ppBuf.toString()); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof FeatureConstraint) { @@ -1076,6 +1085,7 @@ public class ProductSearch { this.exclude = exclude; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { // just add to global sets if (exclude == null) { @@ -1090,6 +1100,7 @@ public class ProductSearch { productSearchContext.productSearchConstraintList.add(productSearchContext.getDelegator().makeValue("ProductSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", this.productFeatureCategoryId))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { GenericValue productFeatureCategory = null; try { @@ -1117,6 +1128,7 @@ public class ProductSearch { return (ppBuf.toString()); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof FeatureCategoryConstraint) { @@ -1153,6 +1165,7 @@ public class ProductSearch { this.exclude = exclude; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { // just add to global sets if (exclude == null) { @@ -1167,6 +1180,7 @@ public class ProductSearch { productSearchContext.productSearchConstraintList.add(productSearchContext.getDelegator().makeValue("ProductSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", this.productFeatureGroupId))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { GenericValue productFeatureGroup = null; try { @@ -1193,6 +1207,7 @@ public class ProductSearch { return (ppBuf.toString()); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof FeatureGroupConstraint) { @@ -1231,6 +1246,7 @@ public class ProductSearch { this.exclude = exclude; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { // just add to global sets if (exclude == null) { @@ -1253,6 +1269,7 @@ public class ProductSearch { productSearchContext.productSearchConstraintList.add(productSearchContext.getDelegator().makeValue("ProductSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", featureIdInfo.toString()))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { StringBuilder infoOut = new StringBuilder(); try { @@ -1284,6 +1301,7 @@ public class ProductSearch { return infoOut.toString(); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof FeatureConstraint) { @@ -1341,6 +1359,7 @@ public class ProductSearch { return fullKeywordSet; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { // just make the fixed keyword lists and put them in the context if (isAnd) { @@ -1381,6 +1400,7 @@ public class ProductSearch { } /** pretty print for log messages and even UI stuff */ + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { StringBuilder ppBuf = new StringBuilder(); ppBuf.append(UtilProperties.getMessage(resource, "ProductKeywords", locale)).append(": \""); @@ -1389,6 +1409,7 @@ public class ProductSearch { return ppBuf.toString(); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof KeywordConstraint) { @@ -1431,16 +1452,19 @@ public class ProductSearch { this.thruDate = thruDate; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { // TODO: implement LastUpdatedRangeConstraint makeEntityCondition } /** pretty print for log messages and even UI stuff */ + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { // TODO: implement the pretty print for log messages and even UI stuff return null; } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof LastUpdatedRangeConstraint) { @@ -1482,6 +1506,7 @@ public class ProductSearch { this.currencyUomId = currencyUomId; } + @Override public void addConstraint(ProductSearchContext context) { String entityAlias = "PSPP" + context.index; String prefix = "PSPP" + context.index; @@ -1504,6 +1529,7 @@ public class ProductSearch { context.entityConditionList.add(EntityCondition.makeCondition(prefix + "FromDate", EntityOperator.LESS_THAN, context.nowTimestamp)); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { StringBuilder buff = new StringBuilder(); buff.append("Product Store Mandatory Price Constraint: "); @@ -1513,6 +1539,7 @@ public class ProductSearch { return buff.toString(); } + @Override public boolean equals(Object o) { if (o instanceof StoreGroupPriceConstraint) { StoreGroupPriceConstraint other = (StoreGroupPriceConstraint) o; @@ -1538,6 +1565,7 @@ public class ProductSearch { this.currencyUomId = UtilValidate.isNotEmpty(currencyUomId) ? currencyUomId : "USD"; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { // make index based values and increment String entityAlias = "PP" + productSearchContext.index; @@ -1574,6 +1602,7 @@ public class ProductSearch { UtilMisc.toMap("constraintName", constraintName, "infoString", "low [" + this.lowPrice + "] high [" + this.highPrice + "] currency [" + this.currencyUomId + "]"))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { if (this.lowPrice == null && this.highPrice == null) { // dummy constraint, no values @@ -1600,6 +1629,7 @@ public class ProductSearch { return msgBuf.toString(); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof ListPriceRangeConstraint) { @@ -1637,6 +1667,7 @@ public class ProductSearch { this.supplierPartyId = supplierPartyId; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { // make index based values and increment String entityAlias = "SP" + productSearchContext.index; @@ -1652,10 +1683,12 @@ public class ProductSearch { productSearchContext.productSearchConstraintList.add(productSearchContext.getDelegator().makeValue("ProductSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", this.supplierPartyId))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { return UtilProperties.getMessage(resource, "ProductSupplier", locale)+": " + PartyHelper.getPartyName(delegator, supplierPartyId, false); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof SupplierConstraint) { @@ -1682,6 +1715,7 @@ public class ProductSearch { public ExcludeVariantsConstraint() { } + @Override public void addConstraint(ProductSearchContext productSearchContext) { productSearchContext.dynamicViewEntity.addAlias("PROD", "prodIsVariant", "isVariant", null, null, null, null); productSearchContext.entityConditionList.add(EntityCondition.makeCondition("prodIsVariant", EntityOperator.NOT_EQUAL, "Y")); @@ -1690,10 +1724,12 @@ public class ProductSearch { productSearchContext.productSearchConstraintList.add(productSearchContext.getDelegator().makeValue("ProductSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", ""))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { return UtilProperties.getMessage(resource, "ProductExcludeVariants", locale); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof ExcludeVariantsConstraint) { @@ -1710,6 +1746,7 @@ public class ProductSearch { public AvailabilityDateConstraint() { } + @Override public void addConstraint(ProductSearchContext productSearchContext) { productSearchContext.dynamicViewEntity.addAlias("PROD", "prodIntroductionDate", "introductionDate", null, null, null, null); productSearchContext.entityConditionList.add(EntityCondition.makeCondition(EntityCondition.makeCondition("prodIntroductionDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("prodIntroductionDate", EntityOperator.LESS_THAN_EQUAL_TO, productSearchContext.nowTimestamp))); @@ -1718,10 +1755,12 @@ public class ProductSearch { productSearchContext.productSearchConstraintList.add(productSearchContext.getDelegator().makeValue("ProductSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", ""))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { return UtilProperties.getMessage(resource, "ProductFilterByAvailabilityDates", locale); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof AvailabilityDateConstraint) { @@ -1744,6 +1783,7 @@ public class ProductSearch { this.include = include; } + @Override public void addConstraint(ProductSearchContext productSearchContext) { if (UtilValidate.isNotEmpty(goodIdentificationTypeId) || UtilValidate.isNotEmpty(goodIdentificationValue) || @@ -1780,6 +1820,7 @@ public class ProductSearch { } } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { if (UtilValidate.isEmpty(goodIdentificationTypeId) && UtilValidate.isEmpty(goodIdentificationValue) && @@ -1812,6 +1853,7 @@ public class ProductSearch { return msgBuf.toString(); } + @Override public boolean equals(Object obj) { ProductSearchConstraint psc = (ProductSearchConstraint) obj; if (psc instanceof GoodIdentificationConstraint) { @@ -1840,6 +1882,7 @@ public class ProductSearch { public SortKeywordRelevancy() { } + @Override public void setSortOrder(ProductSearchContext productSearchContext) { if (productSearchContext.includedKeywordSearch) { // we have to check this in order to be sure that there is a totalRelevancy to sort by... @@ -1848,14 +1891,17 @@ public class ProductSearch { } } + @Override public String getOrderName() { return "KeywordRelevancy"; } + @Override public String prettyPrintSortOrder(boolean detailed, Locale locale) { return UtilProperties.getMessage(resource, "ProductKeywordRelevancy", locale); } + @Override public boolean isAscending() { return false; } @@ -1877,6 +1923,7 @@ public class ProductSearch { this.ascending = ascending; } + @Override public void setSortOrder(ProductSearchContext productSearchContext) { if (productSearchContext.getDelegator().getModelEntity("Product").isField(fieldName)) { productSearchContext.dynamicViewEntity.addAlias("PROD", fieldName); @@ -1891,10 +1938,12 @@ public class ProductSearch { productSearchContext.fieldsToSelect.add(fieldName); } + @Override public String getOrderName() { return "ProductField:" + this.fieldName; } + @Override public String prettyPrintSortOrder(boolean detailed, Locale locale) { if ("productName".equals(this.fieldName)) { return UtilProperties.getMessage(resource, "ProductProductName", locale); @@ -1908,6 +1957,7 @@ public class ProductSearch { return this.fieldName; } + @Override public boolean isAscending() { return this.ascending; } @@ -1931,6 +1981,7 @@ public class ProductSearch { this.ascending = ascending; } + @Override public void setSortOrder(ProductSearchContext productSearchContext) { if (this.currencyUomId == null) { this.currencyUomId = UtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD"); @@ -1965,10 +2016,12 @@ public class ProductSearch { productSearchContext.fieldsToSelect.add("sortPrice"); } + @Override public String getOrderName() { return "ProductPrice:" + productPriceTypeId; } + @Override public String prettyPrintSortOrder(boolean detailed, Locale locale) { String priceTypeName = null; if ("LIST_PRICE".equals(this.productPriceTypeId)) { @@ -1990,6 +2043,7 @@ public class ProductSearch { return priceTypeName; } + @Override public boolean isAscending() { return this.ascending; } diff --git a/applications/product/src/org/ofbiz/product/product/ProductServices.java b/applications/product/src/org/ofbiz/product/product/ProductServices.java index c3a784a167..f1ab602e65 100644 --- a/applications/product/src/org/ofbiz/product/product/ProductServices.java +++ b/applications/product/src/org/ofbiz/product/product/ProductServices.java @@ -964,10 +964,9 @@ public class ProductServices { /* scale Image in different sizes */ String viewNumber = String.valueOf(productContentTypeId.charAt(productContentTypeId.length() - 1)); - ScaleImage imageTransform = new ScaleImage(); Map resultResize = FastMap.newInstance(); try { - resultResize.putAll(imageTransform.scaleImageInAllSize(context, filenameToUse, "additional", viewNumber)); + resultResize.putAll(ScaleImage.scaleImageInAllSize(context, filenameToUse, "additional", viewNumber)); } catch (IOException e) { String errMsg = "Scale additional image in all different sizes is impossible : " + e.toString(); Debug.logError(e, errMsg, module); diff --git a/applications/product/src/org/ofbiz/product/product/ProductWorker.java b/applications/product/src/org/ofbiz/product/product/ProductWorker.java index a7c016193b..e52ffaba99 100644 --- a/applications/product/src/org/ofbiz/product/product/ProductWorker.java +++ b/applications/product/src/org/ofbiz/product/product/ProductWorker.java @@ -60,6 +60,7 @@ public class ProductWorker { public static final MathContext generalRounding = new MathContext(10); /** @deprecated */ + @Deprecated public static void getProduct(PageContext pageContext, String attributeName) { getProduct(pageContext, attributeName, null); } @@ -150,6 +151,7 @@ public class ProductWorker { } /** @deprecated */ + @Deprecated public static void getProduct(PageContext pageContext, String attributeName, String productId) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); ServletRequest request = pageContext.getRequest(); @@ -291,6 +293,7 @@ public class ProductWorker { } /** @deprecated */ + @Deprecated public static void getAssociatedProducts(PageContext pageContext, String productAttributeName, String assocPrefix) { GenericValue product = (GenericValue) pageContext.getAttribute(productAttributeName); diff --git a/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java b/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java index b8609f6465..778fae3ac7 100644 --- a/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java +++ b/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java @@ -119,7 +119,8 @@ public class SubscriptionServices { calendar.add(times[0], (useTime.intValue() * times[1])); } else { Debug.logWarning("Don't know anything about useTimeUomId [" + useTimeUomId + "], defaulting to month", module); - calendar.add(Calendar.MONTH, (useTime.intValue() * times[1])); + // FIXME: times[] can only be null here + //calendar.add(Calendar.MONTH, (useTime.intValue() * times[1])); } thruDate = new Timestamp(calendar.getTimeInMillis()); diff --git a/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java b/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java index eeefac2cce..75aa4c9877 100644 --- a/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java +++ b/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java @@ -39,10 +39,12 @@ public class InventoryItemTransferTest extends OFBizTestCase { super(name); } + @Override protected void setUp() throws Exception { userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system")); } + @Override protected void tearDown() throws Exception { } diff --git a/applications/product/src/org/ofbiz/product/test/StockMovesTest.java b/applications/product/src/org/ofbiz/product/test/StockMovesTest.java index 32a40f52de..cc1db3ed88 100644 --- a/applications/product/src/org/ofbiz/product/test/StockMovesTest.java +++ b/applications/product/src/org/ofbiz/product/test/StockMovesTest.java @@ -41,10 +41,12 @@ public class StockMovesTest extends OFBizTestCase { super(name); } + @Override protected void setUp() throws Exception { userLogin = delegator.findByPrimaryKey("UserLogin", UtilMisc.toMap("userLoginId", "system")); } + @Override protected void tearDown() throws Exception { } diff --git a/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java b/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java index fdd178edbe..6a717d0c1f 100644 --- a/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java +++ b/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java @@ -1006,10 +1006,12 @@ public class PackingSession implements java.io.Serializable { return quantity; } + @Override public Set entrySet() { return null; } + @Override public Object get(Object name) { if ("orderItem".equals(name.toString())) { return orderItem; @@ -1021,6 +1023,7 @@ public class PackingSession implements java.io.Serializable { return null; } + @Override public boolean equals(Object o) { if (o instanceof ItemDisplay) { ItemDisplay d = (ItemDisplay) o; diff --git a/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java b/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java index 89d7eefd79..22e4071625 100644 --- a/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java +++ b/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java @@ -31,13 +31,12 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.Debug; -import org.apache.xml.serialize.OutputFormat; -import org.apache.xml.serialize.XMLSerializer; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; @@ -54,14 +53,17 @@ public class UspsMockApiServlet extends HttpServlet { super(); } + @Override public void init(ServletConfig config) throws ServletException { super.init(config); } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doGet(request, response); } + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // we're only testing the Rate API right now @@ -123,16 +125,9 @@ public class UspsMockApiServlet extends HttpServlet { OutputStream os = new ByteArrayOutputStream(); - OutputFormat format = new OutputFormat(responseDocument); - format.setOmitDocumentType(true); - format.setOmitXMLDeclaration(false); - format.setIndenting(false); - - XMLSerializer serializer = new XMLSerializer(os, format); try { - serializer.asDOMSerializer(); - serializer.serialize(responseDocument.getDocumentElement()); - } catch (IOException e) { + UtilXml.writeXmlDocument(responseDocument, os, "UTF-8", true, false, 0); + } catch (TransformerException e) { Debug.log(e, module); return; } @@ -144,6 +139,7 @@ public class UspsMockApiServlet extends HttpServlet { } } + @Override public void destroy() { super.destroy(); } diff --git a/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java b/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java index 101b457db9..65d1e8c925 100644 --- a/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java +++ b/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java @@ -33,13 +33,12 @@ import java.util.Locale; import java.util.Map; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; import javolution.util.FastList; import javolution.util.FastMap; import org.apache.commons.lang.StringUtils; -import org.apache.xml.serialize.OutputFormat; -import org.apache.xml.serialize.XMLSerializer; import org.ofbiz.base.util.Base64; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -1329,16 +1328,9 @@ public class UspsServices { OutputStream os = new ByteArrayOutputStream(); - OutputFormat format = new OutputFormat(requestDocument); - format.setOmitDocumentType(true); - format.setOmitXMLDeclaration(true); - format.setIndenting(false); - - XMLSerializer serializer = new XMLSerializer(os, format); try { - serializer.asDOMSerializer(); - serializer.serialize(requestDocument.getDocumentElement()); - } catch (IOException e) { + UtilXml.writeXmlDocument(requestDocument, os, "UTF-8", true, false, 0); + } catch (TransformerException e) { throw new UspsRequestException("Error serializing requestDocument: " + e.getMessage()); } diff --git a/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java b/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java index 3756664981..e4525a63e2 100644 --- a/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java +++ b/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java @@ -48,9 +48,11 @@ public class UspsServicesTests extends OFBizTestCase { super(name); } + @Override protected void setUp() throws Exception { } + @Override protected void tearDown() throws Exception { } diff --git a/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java b/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java index a29948323a..74bb714b13 100644 --- a/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java +++ b/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java @@ -43,6 +43,7 @@ public class ProjectWorker { public static final String module = ProjectWorker.class.getName(); /** @deprecated */ + @Deprecated public static void getAssignedProjects(PageContext pageContext, String projectsAttrName) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); @@ -71,6 +72,7 @@ public class ProjectWorker { } /** @deprecated */ + @Deprecated public static void getAllAssignedProjects(PageContext pageContext, String projectsAttrName) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); @@ -96,6 +98,7 @@ public class ProjectWorker { } /** @deprecated */ + @Deprecated public static void getAllProjectPhases(PageContext pageContext, String phasesAttrName) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); @@ -144,6 +147,7 @@ public class ProjectWorker { } /** @deprecated */ + @Deprecated public static void getAllPhaseTasks(PageContext pageContext, String tasksAttrName) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); @@ -191,6 +195,7 @@ public class ProjectWorker { } /** @deprecated */ + @Deprecated public static void getTaskNotes(PageContext pageContext, String notesAttrName) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); diff --git a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java index 207a88dc77..18db9ca09b 100644 --- a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java +++ b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java @@ -273,7 +273,6 @@ public class ICalWorker { return true; } - @SuppressWarnings("unchecked") protected static void logInUser(HttpServletRequest request, HttpServletResponse response) throws GenericServiceException, GenericEntityException { Map serviceMap = (Map) WebDavUtil.getCredentialsFromRequest(request); if (serviceMap == null) { diff --git a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java index 3eedc858ba..0f29739476 100644 --- a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java +++ b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java @@ -506,6 +506,7 @@ public class WorkEffortSearch { this.includeSubWorkEfforts = includeSubWorkEfforts; } + @Override public void addConstraint(WorkEffortSearchContext workEffortSearchContext) { Set workEffortIdSet = FastSet.newInstance(); if (includeSubWorkEfforts) { @@ -573,6 +574,7 @@ public class WorkEffortSearch { /** pretty print for log messages and even UI stuff */ + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { GenericValue workEffort = null; GenericValue workEffortAssocType = null; @@ -609,6 +611,7 @@ public class WorkEffortSearch { return ppBuf.toString(); } + @Override public boolean equals(Object obj) { WorkEffortSearchConstraint psc = (WorkEffortSearchConstraint) obj; if (psc instanceof WorkEffortAssocConstraint) { @@ -648,6 +651,7 @@ public class WorkEffortSearch { this.reviewTextString = reviewTextString; } + @Override public void addConstraint(WorkEffortSearchContext workEffortSearchContext) { String entityAlias = "WFR" + workEffortSearchContext.index; String prefix = "wfr" + workEffortSearchContext.index; @@ -663,6 +667,7 @@ public class WorkEffortSearch { /** pretty print for log messages and even UI stuff */ + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { StringBuilder ppBuf = new StringBuilder(); ppBuf.append(UtilProperties.getMessage(resource, "WorkEffortReviews", locale) + ": \""); @@ -670,6 +675,7 @@ public class WorkEffortSearch { return ppBuf.toString(); } + @Override public boolean equals(Object obj) { WorkEffortSearchConstraint psc = (WorkEffortSearchConstraint) obj; if (psc instanceof WorkEffortReviewConstraint) { @@ -700,6 +706,7 @@ public class WorkEffortSearch { this.roleTypeId = roleTypeId; } + @Override public void addConstraint(WorkEffortSearchContext workEffortSearchContext) { // make index based values and increment String entityAlias = "WEPA" + workEffortSearchContext.index; @@ -724,6 +731,7 @@ public class WorkEffortSearch { workEffortSearchContext.workEffortSearchConstraintList.add(workEffortSearchContext.getDelegator().makeValue("WorkEffortSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", this.partyId + "," + this.roleTypeId))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { GenericValue partyNameView = null; GenericValue roleType = null; @@ -768,6 +776,7 @@ public class WorkEffortSearch { return ppBuf.toString(); } + @Override public boolean equals(Object obj) { WorkEffortSearchConstraint psc = (WorkEffortSearchConstraint) obj; if (psc instanceof PartyAssignmentConstraint) { @@ -805,6 +814,7 @@ public class WorkEffortSearch { this.productIdSet = UtilMisc.makeSetWritable(productIdSet); } + @Override public void addConstraint(WorkEffortSearchContext workEffortSearchContext) { // make index based values and increment String entityAlias = "WEGS" + workEffortSearchContext.index; @@ -835,6 +845,7 @@ public class WorkEffortSearch { workEffortSearchContext.workEffortSearchConstraintList.add(workEffortSearchContext.getDelegator().makeValue("WorkEffortSearchConstraint", UtilMisc.toMap("constraintName", constraintName, "infoString", productIdInfo.toString()))); } + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { StringBuilder infoOut = new StringBuilder(); try { @@ -861,6 +872,7 @@ public class WorkEffortSearch { return infoOut.toString(); } + @Override public boolean equals(Object obj) { WorkEffortSearchConstraint psc = (WorkEffortSearchConstraint) obj; if (psc instanceof ProductSetConstraint) { @@ -918,6 +930,7 @@ public class WorkEffortSearch { return fullKeywordSet; } + @Override public void addConstraint(WorkEffortSearchContext workEffortSearchContext) { // just make the fixed keyword lists and put them in the context if (isAnd) { @@ -958,6 +971,7 @@ public class WorkEffortSearch { } /** pretty print for log messages and even UI stuff */ + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { StringBuilder ppBuf = new StringBuilder(); ppBuf.append(UtilProperties.getMessage(resource, "WorkEffortKeywords", locale)).append(": \""); @@ -966,6 +980,7 @@ public class WorkEffortSearch { return ppBuf.toString(); } + @Override public boolean equals(Object obj) { WorkEffortSearchConstraint psc = (WorkEffortSearchConstraint) obj; if (psc instanceof KeywordConstraint) { @@ -1008,6 +1023,7 @@ public class WorkEffortSearch { this.thruDate = thruDate; } + @Override public void addConstraint(WorkEffortSearchContext workEffortSearchContext) { workEffortSearchContext.dynamicViewEntity.addAlias("WEFF", "lastModifiedDate", "lastModifiedDate", null, null, null, null); @@ -1042,6 +1058,7 @@ public class WorkEffortSearch { } /** pretty print for log messages and even UI stuff */ + @Override public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { StringBuilder ppBuf = new StringBuilder(); ppBuf.append(UtilProperties.getMessage(resource, "WorkEffortLastModified", locale)).append(": \""); @@ -1050,6 +1067,7 @@ public class WorkEffortSearch { } + @Override public boolean equals(Object obj) { WorkEffortSearchConstraint psc = (WorkEffortSearchConstraint) obj; if (psc instanceof LastUpdatedRangeConstraint) { @@ -1097,6 +1115,7 @@ public class WorkEffortSearch { public SortKeywordRelevancy() { } + @Override public void setSortOrder(WorkEffortSearchContext workEffortSearchContext) { if (workEffortSearchContext.includedKeywordSearch) { // we have to check this in order to be sure that there is a totalRelevancy to sort by... @@ -1105,14 +1124,17 @@ public class WorkEffortSearch { } } + @Override public String getOrderName() { return "KeywordRelevancy"; } + @Override public String prettyPrintSortOrder(boolean detailed, Locale locale) { return UtilProperties.getMessage(resource, "WorkEffortKeywordRelevancy", locale); } + @Override public boolean isAscending() { return false; } @@ -1134,6 +1156,7 @@ public class WorkEffortSearch { this.ascending = ascending; } + @Override public void setSortOrder(WorkEffortSearchContext workEffortSearchContext) { if (workEffortSearchContext.getDelegator().getModelEntity("WorkEffort").isField(fieldName)) { workEffortSearchContext.dynamicViewEntity.addAlias("WEFF", fieldName); @@ -1146,10 +1169,12 @@ public class WorkEffortSearch { workEffortSearchContext.fieldsToSelect.add(fieldName); } + @Override public String getOrderName() { return "WorkEffortField:" + this.fieldName; } + @Override public String prettyPrintSortOrder(boolean detailed, Locale locale) { if ("workEffortName".equals(this.fieldName)) { return UtilProperties.getMessage(resource, "WorkEffortName", locale); @@ -1163,6 +1188,7 @@ public class WorkEffortSearch { return this.fieldName; } + @Override public boolean isAscending() { return this.ascending; } diff --git a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java index 26ef46493d..040cac6ada 100644 --- a/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java +++ b/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java @@ -50,6 +50,7 @@ public class WorkEffortWorker { public static final String module = WorkEffortWorker.class.getName(); /** @deprecated */ + @Deprecated public static void getWorkEffort(PageContext pageContext, String workEffortIdAttrName, String workEffortAttrName, String partyAssignsAttrName, String canViewAttrName, String tryEntityAttrName, String currentStatusAttrName) { GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); @@ -134,14 +135,17 @@ public class WorkEffortWorker { } /** @deprecated */ + @Deprecated public static void getMonthWorkEffortEvents(PageContext pageContext, String attributeName) {} /** @deprecated */ + @Deprecated public static void getActivityContext(PageContext pageContext, String workEffortId) { getActivityContext(pageContext, workEffortId, "activityContext"); } /** @deprecated */ + @Deprecated public static void getActivityContext(PageContext pageContext, String workEffortId, String attribute) { LocalDispatcher dispatcher = (LocalDispatcher) pageContext.getRequest().getAttribute("dispatcher"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); diff --git a/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java b/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java index ab5351ba8f..1e77dcbac4 100644 --- a/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java +++ b/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java @@ -77,7 +77,7 @@ public class GenerateContainer implements Container { */ public void init(String[] args, String configFile) { ofbizHome = System.getProperty("ofbiz.home"); - configFile = configFile; + this.configFile = configFile; this.args = args; isGeronimo = args[0].toLowerCase().contains("geronimo") || args[0].toLowerCase().contains("wasce"); if (isGeronimo) { diff --git a/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java b/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java index 5bf7c13d21..06c29f6cae 100644 --- a/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java +++ b/framework/base/src/org/ofbiz/base/component/ComponentResourceHandler.java @@ -89,6 +89,7 @@ public class ComponentResourceHandler implements ResourceHandler { return ComponentConfig.getFullLocation(componentName, loaderName, location); } + @Override public boolean equals(Object obj) { if (obj instanceof ComponentResourceHandler) { ComponentResourceHandler other = (ComponentResourceHandler) obj; @@ -102,11 +103,13 @@ public class ComponentResourceHandler implements ResourceHandler { return false; } + @Override public int hashCode() { // the hashCode will weight by a combination componentName and the combination of loaderName and location return (this.componentName.hashCode() + ((this.loaderName.hashCode() + this.location.hashCode()) >> 1)) >> 1; } + @Override public String toString() { return "ComponentResourceHandler from XML file [" + this.componentName + "] with loaderName [" + loaderName + "] and location [" + location + "]"; } diff --git a/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java b/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java index 4643e54c2a..585d096a3f 100644 --- a/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java +++ b/framework/base/src/org/ofbiz/base/config/ClasspathLoader.java @@ -28,6 +28,7 @@ import org.ofbiz.base.util.*; */ public class ClasspathLoader extends ResourceLoader implements java.io.Serializable { + @Override public URL getURL(String location) throws GenericConfigException { String fullLocation = fullLocation(location); URL url = UtilURL.fromResource(fullLocation); @@ -37,6 +38,7 @@ public class ClasspathLoader extends ResourceLoader implements java.io.Serializa return url; } + @Override public InputStream loadResource(String location) throws GenericConfigException { URL url = getURL(location); try { diff --git a/framework/base/src/org/ofbiz/base/config/FileLoader.java b/framework/base/src/org/ofbiz/base/config/FileLoader.java index 68f3dfa062..a19050b7d4 100644 --- a/framework/base/src/org/ofbiz/base/config/FileLoader.java +++ b/framework/base/src/org/ofbiz/base/config/FileLoader.java @@ -28,6 +28,7 @@ import org.ofbiz.base.util.*; */ public class FileLoader extends ResourceLoader implements java.io.Serializable { + @Override public URL getURL(String location) throws GenericConfigException { String fullLocation = fullLocation(location); URL fileUrl = null; @@ -39,6 +40,7 @@ public class FileLoader extends ResourceLoader implements java.io.Serializable { return fileUrl; } + @Override public InputStream loadResource(String location) throws GenericConfigException { URL fileUrl = getURL(location); try { diff --git a/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java b/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java index 1e2e00a863..798ff5d2fd 100644 --- a/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java +++ b/framework/base/src/org/ofbiz/base/config/MainResourceHandler.java @@ -95,6 +95,7 @@ public final class MainResourceHandler implements ResourceHandler { return loader.fullLocation(location); } + @Override public boolean equals(Object obj) { if (obj instanceof MainResourceHandler) { MainResourceHandler other = (MainResourceHandler) obj; @@ -108,11 +109,13 @@ public final class MainResourceHandler implements ResourceHandler { return false; } + @Override public int hashCode() { // the hashCode will weight by a combination xmlFilename and the combination of loaderName and location return (this.xmlFilename.hashCode() + ((this.loaderName.hashCode() + this.location.hashCode()) >> 1)) >> 1; } + @Override public String toString() { return "ResourceHandler from XML file [" + this.xmlFilename + "] with loaderName [" + loaderName + "] and location [" + location + "]"; } diff --git a/framework/base/src/org/ofbiz/base/config/UrlLoader.java b/framework/base/src/org/ofbiz/base/config/UrlLoader.java index 4ad5e76d6b..0844f8f09c 100644 --- a/framework/base/src/org/ofbiz/base/config/UrlLoader.java +++ b/framework/base/src/org/ofbiz/base/config/UrlLoader.java @@ -27,6 +27,7 @@ import java.io.*; */ public class UrlLoader extends ResourceLoader implements java.io.Serializable { + @Override public URL getURL(String location) throws GenericConfigException { String fullLocation = fullLocation(location); @@ -44,6 +45,7 @@ public class UrlLoader extends ResourceLoader implements java.io.Serializable { return url; } + @Override public InputStream loadResource(String location) throws GenericConfigException { URL url = getURL(location); diff --git a/framework/base/src/org/ofbiz/base/splash/SplashScreen.java b/framework/base/src/org/ofbiz/base/splash/SplashScreen.java index d72f7336f0..eedf193904 100644 --- a/framework/base/src/org/ofbiz/base/splash/SplashScreen.java +++ b/framework/base/src/org/ofbiz/base/splash/SplashScreen.java @@ -87,6 +87,7 @@ public final class SplashScreen extends Frame { setVisible(true); } + @Override public void paint(Graphics graphics) { if (fImage != null) { graphics.drawImage(fImage, 0, 0, this); diff --git a/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java b/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java index ca75f3dc17..f20aff20ae 100644 --- a/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java +++ b/framework/base/src/org/ofbiz/base/util/CachedClassLoader.java @@ -150,14 +150,17 @@ public class CachedClassLoader extends URLClassLoader { this(url, parent, "__globalContext"); } + @Override public String toString() { return "org.ofbiz.base.util.CachedClassLoader(" + contextName + ") / " + getParent().toString(); } + @Override public Class loadClass(String name) throws ClassNotFoundException { return loadClass(name, false); } + @Override protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { //check glocal common classes, ie for all instances Class theClass = globalClassNameClassMap.get(name); @@ -202,6 +205,7 @@ public class CachedClassLoader extends URLClassLoader { return theClass; } + @Override public URL getResource(String name) { //check glocal common resources, ie for all instances URL theResource = globalResourceMap.get(name); diff --git a/framework/base/src/org/ofbiz/base/util/DateRange.java b/framework/base/src/org/ofbiz/base/util/DateRange.java index 2ec8f1d074..34353c5d53 100644 --- a/framework/base/src/org/ofbiz/base/util/DateRange.java +++ b/framework/base/src/org/ofbiz/base/util/DateRange.java @@ -60,10 +60,12 @@ public class DateRange implements Serializable { } } + @Override public boolean equals(Object obj) { return obj instanceof DateRange && ((DateRange)obj).start.equals(this.start) && ((DateRange)obj).end.equals(this.end); } + @Override public String toString() { return this.start + " - " + this.end; } diff --git a/framework/base/src/org/ofbiz/base/util/GeneralException.java b/framework/base/src/org/ofbiz/base/util/GeneralException.java index ac4ee9e599..5f54800c82 100644 --- a/framework/base/src/org/ofbiz/base/util/GeneralException.java +++ b/framework/base/src/org/ofbiz/base/util/GeneralException.java @@ -110,6 +110,7 @@ public class GeneralException extends Exception { } /** Returns the detail message, including the message from the nested exception if there is one. */ + @Override public String getMessage() { Throwable nested = getCause(); if (nested != null) { @@ -142,16 +143,19 @@ public class GeneralException extends Exception { } /** Prints the composite message to System.err. */ + @Override public void printStackTrace() { super.printStackTrace(); } /** Prints the composite message and the embedded stack trace to the specified stream ps. */ + @Override public void printStackTrace(PrintStream ps) { super.printStackTrace(ps); } /** Prints the composite message and the embedded stack trace to the specified print writer pw. */ + @Override public void printStackTrace(PrintWriter pw) { super.printStackTrace(pw); } diff --git a/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java b/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java index 2d0ab0f03a..89d7f9b916 100644 --- a/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java +++ b/framework/base/src/org/ofbiz/base/util/GeneralRuntimeException.java @@ -63,6 +63,7 @@ public class GeneralRuntimeException extends RuntimeException { } /** Returns the detail message, including the message from the nested exception if there is one. */ + @Override public String getMessage() { if (nested != null) return super.getMessage() + " (" + nested.getMessage() + ")"; @@ -81,18 +82,21 @@ public class GeneralRuntimeException extends RuntimeException { } /** Prints the composite message to System.err. */ + @Override public void printStackTrace() { super.printStackTrace(); if (nested != null) nested.printStackTrace(); } /** Prints the composite message and the embedded stack trace to the specified stream ps. */ + @Override public void printStackTrace(PrintStream ps) { super.printStackTrace(ps); if (nested != null) nested.printStackTrace(ps); } /** Prints the composite message and the embedded stack trace to the specified print writer pw. */ + @Override public void printStackTrace(PrintWriter pw) { super.printStackTrace(pw); if (nested != null) nested.printStackTrace(pw); diff --git a/framework/base/src/org/ofbiz/base/util/Log4jLoggerWriter.java b/framework/base/src/org/ofbiz/base/util/Log4jLoggerWriter.java index b96dd577e8..6644424f5e 100755 --- a/framework/base/src/org/ofbiz/base/util/Log4jLoggerWriter.java +++ b/framework/base/src/org/ofbiz/base/util/Log4jLoggerWriter.java @@ -52,6 +52,7 @@ public class Log4jLoggerWriter extends PrintWriter { this.priority = priority; } + @Override public void write(char[] cbuf, int off, int len) throws IOException { if (closed) { throw new IOException("Writer is closed"); @@ -68,12 +69,14 @@ public class Log4jLoggerWriter extends PrintWriter { } } + @Override public void flush() throws IOException { if (closed) { throw new IOException("Writer is closed"); } } + @Override public void close() { closed = true; } diff --git a/framework/base/src/org/ofbiz/base/util/MessageString.java b/framework/base/src/org/ofbiz/base/util/MessageString.java index 2d62efad64..42f02569f1 100644 --- a/framework/base/src/org/ofbiz/base/util/MessageString.java +++ b/framework/base/src/org/ofbiz/base/util/MessageString.java @@ -247,6 +247,7 @@ public class MessageString implements Serializable { this.isError = isError; } + @Override public String toString() { return this.message; } diff --git a/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java b/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java index 7c6f9b89be..e2884593d8 100644 --- a/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java +++ b/framework/base/src/org/ofbiz/base/util/ObjectInputStream.java @@ -39,6 +39,7 @@ public class ObjectInputStream extends java.io.ObjectInputStream { /** * @see java.io.ObjectInputStream#resolveClass(java.io.ObjectStreamClass) */ + @Override protected Class resolveClass(ObjectStreamClass classDesc) throws IOException, ClassNotFoundException { return ObjectType.loadClass(classDesc.getName(), classloader); } @@ -46,6 +47,7 @@ public class ObjectInputStream extends java.io.ObjectInputStream { /** * @see java.io.ObjectInputStream#resolveProxyClass(java.lang.String[]) */ + @Override protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException { Class[] cinterfaces = new Class[interfaces.length]; for (int i = 0; i < interfaces.length; i++) diff --git a/framework/base/src/org/ofbiz/base/util/ObjectType.java b/framework/base/src/org/ofbiz/base/util/ObjectType.java index 922a6107b5..990355921c 100644 --- a/framework/base/src/org/ofbiz/base/util/ObjectType.java +++ b/framework/base/src/org/ofbiz/base/util/ObjectType.java @@ -1239,10 +1239,12 @@ public class ObjectType { public static final class NullObject { public NullObject() { } + @Override public String toString() { return "ObjectType.NullObject"; } + @Override public boolean equals(Object other) { if (other instanceof NullObject) { // should do equality of object? don't think so, just same type diff --git a/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java b/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java index d1d4baf5ec..47c09efb7f 100644 --- a/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java +++ b/framework/base/src/org/ofbiz/base/util/OfbizBshBsfEngine.java @@ -63,6 +63,7 @@ public class OfbizBshBsfEngine extends BSFEngineImpl { public static UtilCache parsedScripts = new UtilCache("script.BshBsfParsedCache", 0, 0, false); + @Override public void initialize(BSFManager mgr, String lang, Vector declaredBeans) throws BSFException { super.initialize(mgr, lang, declaredBeans); @@ -135,6 +136,7 @@ public class OfbizBshBsfEngine extends BSFEngineImpl { * It exectutes the funcBody text in an "anonymous" method call with * arguments. */ + @Override public Object apply(String source, int lineNo, int columnNo, Object funcBody, Vector namesVec, Vector argsVec) throws BSFException { if (namesVec.size() != argsVec.size()) throw new BSFException("number of params/names mismatch"); if (!(funcBody instanceof String)) throw new BSFException("apply: function body must be a string"); @@ -199,6 +201,7 @@ public class OfbizBshBsfEngine extends BSFEngineImpl { } + @Override public void exec(String source, int lineNo, int columnNo, Object script) throws BSFException { eval(source, lineNo, columnNo, script); } @@ -216,6 +219,7 @@ public class OfbizBshBsfEngine extends BSFEngineImpl { Object script, CodeBuffer cb) throws BSFException; */ + @Override public void declareBean(BSFDeclaredBean bean) throws BSFException { try { interpreter.set(bean.name, bean.bean); @@ -224,6 +228,7 @@ public class OfbizBshBsfEngine extends BSFEngineImpl { } } + @Override public void undeclareBean(BSFDeclaredBean bean) throws BSFException { try { interpreter.unset(bean.name); @@ -232,6 +237,7 @@ public class OfbizBshBsfEngine extends BSFEngineImpl { } } + @Override public void terminate() { } private String sourceInfo(String source, int lineNo, int columnNo) { diff --git a/framework/base/src/org/ofbiz/base/util/OutputStreamByteCount.java b/framework/base/src/org/ofbiz/base/util/OutputStreamByteCount.java index 829725b49b..d8330837d6 100644 --- a/framework/base/src/org/ofbiz/base/util/OutputStreamByteCount.java +++ b/framework/base/src/org/ofbiz/base/util/OutputStreamByteCount.java @@ -23,11 +23,13 @@ import java.io.OutputStream; /** @deprecated */ +@Deprecated public class OutputStreamByteCount extends OutputStream { protected long byteCount = 0; /** @deprecated */ + @Deprecated public OutputStreamByteCount() { super(); } @@ -35,14 +37,17 @@ public class OutputStreamByteCount extends OutputStream { /** * @see java.io.OutputStream#write(int) */ + @Override public void write(int arg0) throws IOException { byteCount++; } + @Override public void write(byte[] b) throws IOException { byteCount += b.length; } + @Override public void write(byte[] b, int off, int len) throws IOException { byteCount += len; } diff --git a/framework/base/src/org/ofbiz/base/util/StringUtil.java b/framework/base/src/org/ofbiz/base/util/StringUtil.java index 4d52f208cc..648e257897 100644 --- a/framework/base/src/org/ofbiz/base/util/StringUtil.java +++ b/framework/base/src/org/ofbiz/base/util/StringUtil.java @@ -600,6 +600,7 @@ public class StringUtil { * * @deprecated Use StringUtil.htmlEncoder instead. */ + @Deprecated public static String htmlSpecialChars(String html, boolean doubleQuotes, boolean singleQuotes, boolean insertBR) { html = StringUtil.replaceString(html, "&", "&"); html = StringUtil.replaceString(html, "<", "<"); @@ -698,6 +699,7 @@ public class StringUtil { /** * @return The String this object wraps. */ + @Override public String toString() { return this.theString; } @@ -709,6 +711,7 @@ public class StringUtil { */ public static class HtmlEncodingMapWrapper implements Map, Reusable { protected static final ObjectFactory> mapStackFactory = new ObjectFactory>() { + @Override protected HtmlEncodingMapWrapper create() { return new HtmlEncodingMapWrapper(); } @@ -758,6 +761,7 @@ public class StringUtil { public Set keySet() { return this.internalMap.keySet(); } public Collection values() { return this.internalMap.values(); } public Set> entrySet() { return this.internalMap.entrySet(); } + @Override public String toString() { return this.internalMap.toString(); } } } diff --git a/framework/base/src/org/ofbiz/base/util/TimeDuration.java b/framework/base/src/org/ofbiz/base/util/TimeDuration.java index cb5e5e753e..fb96ffca5e 100644 --- a/framework/base/src/org/ofbiz/base/util/TimeDuration.java +++ b/framework/base/src/org/ofbiz/base/util/TimeDuration.java @@ -67,6 +67,7 @@ public class TimeDuration implements Serializable { this.set(cal1, cal2); } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -80,6 +81,7 @@ public class TimeDuration implements Serializable { return false; } + @Override public String toString() { return this.years + ":" + this.months + ":" + this.days + ":" + this.hours + ":" + this.minutes + ":" + this.seconds + ":" + this.millis; } @@ -282,6 +284,7 @@ public class TimeDuration implements Serializable { protected static class NullDuration extends TimeDuration { protected NullDuration() {} + @Override public Calendar addToCalendar(Calendar cal) { return cal; } diff --git a/framework/base/src/org/ofbiz/base/util/UtilMisc.java b/framework/base/src/org/ofbiz/base/util/UtilMisc.java index 337fb2aca5..6962b6a342 100644 --- a/framework/base/src/org/ofbiz/base/util/UtilMisc.java +++ b/framework/base/src/org/ofbiz/base/util/UtilMisc.java @@ -911,6 +911,7 @@ public class UtilMisc { } } + @Override public String toString() { if (realMapIfNeeded != null) { return realMapIfNeeded.toString(); @@ -929,6 +930,7 @@ public class UtilMisc { } } + @Override public int hashCode() { if (realMapIfNeeded != null) { return realMapIfNeeded.hashCode(); @@ -944,6 +946,7 @@ public class UtilMisc { } } + @Override public boolean equals(Object obj) { if (realMapIfNeeded != null) { return realMapIfNeeded.equals(obj); diff --git a/framework/base/src/org/ofbiz/base/util/UtilParse.java b/framework/base/src/org/ofbiz/base/util/UtilParse.java index e30d5a5cce..81f8c0c421 100644 --- a/framework/base/src/org/ofbiz/base/util/UtilParse.java +++ b/framework/base/src/org/ofbiz/base/util/UtilParse.java @@ -21,9 +21,11 @@ package org.ofbiz.base.util; import java.math.BigDecimal; /** @deprecated */ +@Deprecated public class UtilParse { /** @deprecated */ + @Deprecated public static BigDecimal parseBigDecimalForEntity(String bigDecimalString) throws NumberFormatException { if (bigDecimalString == null) { return null; diff --git a/framework/base/src/org/ofbiz/base/util/UtilProperties.java b/framework/base/src/org/ofbiz/base/util/UtilProperties.java index d69453181c..401ed54b8e 100644 --- a/framework/base/src/org/ofbiz/base/util/UtilProperties.java +++ b/framework/base/src/org/ofbiz/base/util/UtilProperties.java @@ -874,22 +874,27 @@ public class UtilProperties implements java.io.Serializable { return bundle; } + @Override public int hashCode() { return this.hashCode; } + @Override public boolean equals(Object obj) { return obj == null ? false : obj.hashCode() == this.hashCode; } + @Override public Locale getLocale() { return this.locale; } + @Override protected Object handleGetObject(String key) { return properties.get(key); } + @Override public Enumeration getKeys() { return new Enumeration() { Iterator i = properties.keySet().iterator(); @@ -924,6 +929,7 @@ public class UtilProperties implements java.io.Serializable { } in.close(); } + @Override public void loadFromXML(InputStream in) throws IOException, InvalidPropertiesFormatException { xmlToProperties(in, null, this); in.close(); diff --git a/framework/base/src/org/ofbiz/base/util/UtilXml.java b/framework/base/src/org/ofbiz/base/util/UtilXml.java index a1c01ee61f..9078d2b3de 100644 --- a/framework/base/src/org/ofbiz/base/util/UtilXml.java +++ b/framework/base/src/org/ofbiz/base/util/UtilXml.java @@ -278,7 +278,7 @@ public class UtilXml { /** * @deprecated Use writeXmlDocument(Node node, OutputStream os, String encoding, boolean omitXmlDeclaration, boolean indent, int indentAmount) */ - @SuppressWarnings("deprecation") + @Deprecated public static void writeXmlDocument(OutputStream os, Element element, OutputFormat format) throws java.io.IOException { if (element == null) { Debug.logWarning("[UtilXml.writeXmlDocument] Element was null, doing nothing", module); @@ -353,6 +353,7 @@ public class UtilXml { /** * @deprecated */ + @Deprecated public static Document readXmlDocument(InputStream is) throws SAXException, ParserConfigurationException, java.io.IOException { return readXmlDocument(is, true, null); @@ -468,41 +469,49 @@ public class UtilXml { } } + @Override public void startGeneralEntity(String name, XMLResourceIdentifier identifier, String encoding, Augmentations augs) throws XNIException { super.startGeneralEntity(name, identifier, encoding, augs); setLineColumn(); } + @Override public void comment(XMLString text, Augmentations augs) throws XNIException { super.comment(text, augs); setLastChildLineColumn(); } + @Override public void processingInstruction(String target, XMLString data, Augmentations augs) throws XNIException { super.processingInstruction(target, data, augs); setLastChildLineColumn(); } + @Override public void startDocument(XMLLocator locator, String encoding, NamespaceContext namespaceContext, Augmentations augs) throws XNIException { super.startDocument(locator, encoding, namespaceContext, augs); this.locator = locator; setLineColumn(); } + @Override public void doctypeDecl(String rootElement, String publicId, String systemId, Augmentations augs) throws XNIException { super.doctypeDecl(rootElement, publicId, systemId, augs); } + @Override public void startElement(QName elementQName, XMLAttributes attrList, Augmentations augs) throws XNIException { super.startElement(elementQName, attrList, augs); setLineColumn(); } + @Override public void characters(XMLString text, Augmentations augs) throws XNIException { super.characters(text, augs); setLastChildLineColumn(); } + @Override public void ignorableWhitespace(XMLString text, Augmentations augs) throws XNIException { super.ignorableWhitespace(text, augs); setLastChildLineColumn(); diff --git a/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java b/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java index 50b24e5891..d207f8020b 100644 --- a/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java +++ b/framework/base/src/org/ofbiz/base/util/cache/CacheSoftReference.java @@ -36,6 +36,7 @@ public class CacheSoftReference extends SoftReference implements Serializa super(o, referenceQueue); } + @Override public void clear() { if (Debug.verboseOn()) { Debug.logVerbose(new Exception("UtilCache.CacheSoftRef.clear()"), "Clearing UtilCache SoftReference - " + get(), module); @@ -43,6 +44,7 @@ public class CacheSoftReference extends SoftReference implements Serializa super.clear(); } + @Override public void finalize() throws Throwable { if (Debug.verboseOn()) { Debug.logVerbose(new Exception("UtilCache.CacheSoftRef.finalize()"), "Finalize UtilCache SoftReference - " + get(), module); diff --git a/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java b/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java index 859048b53e..6d0becf473 100644 --- a/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java +++ b/framework/base/src/org/ofbiz/base/util/cache/HardRefCacheLine.java @@ -31,10 +31,12 @@ public final class HardRefCacheLine extends CacheLine { this.value = value; } + @Override public V getValue() { return value; } + @Override public boolean isInvalid() { return value == null; } diff --git a/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java b/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java index b18de5d057..215cae82c2 100644 --- a/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java +++ b/framework/base/src/org/ofbiz/base/util/cache/SoftRefCacheLine.java @@ -31,10 +31,12 @@ public final class SoftRefCacheLine extends CacheLine { this.ref = new CacheSoftReference(value); } + @Override public V getValue() { return ref.get(); } + @Override public boolean isInvalid() { return ref.get() == null; } diff --git a/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java b/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java index d677c971a4..669c2f56db 100644 --- a/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java +++ b/framework/base/src/org/ofbiz/base/util/collections/FlexibleMapAccessor.java @@ -196,6 +196,7 @@ public class FlexibleMapAccessor implements Serializable { return expression; } + @Override public String toString() { if (this.isEmpty()) { return super.toString(); @@ -203,6 +204,7 @@ public class FlexibleMapAccessor implements Serializable { return this.original; } + @Override @SuppressWarnings("unchecked") public boolean equals(Object obj) { if (this == obj) { @@ -218,6 +220,7 @@ public class FlexibleMapAccessor implements Serializable { return false; } + @Override public int hashCode() { return this.original == null ? super.hashCode() : this.original.hashCode(); } diff --git a/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java b/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java index 063adf4ce9..8961ba0350 100644 --- a/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java +++ b/framework/base/src/org/ofbiz/base/util/collections/FlexibleServletAccessor.java @@ -158,6 +158,7 @@ public class FlexibleServletAccessor implements Serializable { /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key * * @return the hashcode */ + @Override public int hashCode() { return this.name.hashCode(); } @@ -166,6 +167,7 @@ public class FlexibleServletAccessor implements Serializable { * @param obj * @return whether this object is equal to the passed object */ + @Override public boolean equals(Object obj) { if (obj instanceof FlexibleServletAccessor) { FlexibleServletAccessor flexibleServletAccessor = (FlexibleServletAccessor) obj; @@ -185,6 +187,7 @@ public class FlexibleServletAccessor implements Serializable { /** To be used for a string representation of the accessor, returns the original name. * @return the name of this accessor */ + @Override public String toString() { return this.name; } diff --git a/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java b/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java index e317326c72..3e9b3686fe 100644 --- a/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java +++ b/framework/base/src/org/ofbiz/base/util/collections/LRUMap.java @@ -54,6 +54,7 @@ public class LRUMap extends LinkedHashMap { this.maxSize = size; } + @Override protected boolean removeEldestEntry(Map.Entry entry) { return size() > maxSize; } diff --git a/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java b/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java index f94e69027f..caa4626c05 100644 --- a/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java +++ b/framework/base/src/org/ofbiz/base/util/collections/LifoSet.java @@ -63,6 +63,7 @@ public class LifoSet extends AbstractSet implements Serializable { /** * @see java.util.Collection#size() */ + @Override public int size() { return backedList.size(); } @@ -70,6 +71,7 @@ public class LifoSet extends AbstractSet implements Serializable { /** * @see java.util.Collection#add(java.lang.Object) */ + @Override public boolean add(V obj) { int index = backedList.indexOf(obj); @@ -87,6 +89,7 @@ public class LifoSet extends AbstractSet implements Serializable { /** * @see java.util.Collection#iterator() */ + @Override public Iterator iterator() { return backedList.iterator(); } diff --git a/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java b/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java index dd7dfd930a..981ecd9ad4 100644 --- a/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java +++ b/framework/base/src/org/ofbiz/base/util/collections/MapComparator.java @@ -47,6 +47,7 @@ public class MapComparator implements Comparator> { /** * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { return obj.equals(this); } diff --git a/framework/base/src/org/ofbiz/base/util/collections/MapStack.java b/framework/base/src/org/ofbiz/base/util/collections/MapStack.java index e6469bcf54..156c99997f 100644 --- a/framework/base/src/org/ofbiz/base/util/collections/MapStack.java +++ b/framework/base/src/org/ofbiz/base/util/collections/MapStack.java @@ -44,6 +44,7 @@ public class MapStack implements Map, Reusable, LocalizedMap> mapStackFactory = new ObjectFactory>() { + @Override protected MapStack create() { return new MapStack(); } @@ -335,6 +336,7 @@ public class MapStack implements Map, Reusable, LocalizedMapBuilder class needed to implement a custom parser. */ @SuppressWarnings("serial") protected static class ExtendedBuilder extends Builder { + @Override public Tree build(String expression) throws ELException { try { return new ExtendedParser(this, expression).tree(); diff --git a/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java b/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java index 11bc5ffca9..f95af3733a 100644 --- a/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java +++ b/framework/base/src/org/ofbiz/base/util/string/UelFunctions.java @@ -261,6 +261,7 @@ public class UelFunctions { } Debug.logVerbose("UelFunctions.Functions loaded " + this.functionMap.size() + " functions", module); } + @Override public Method resolveFunction(String prefix, String localName) { return functionMap.get(prefix + ":" + localName); } diff --git a/framework/base/src/org/ofbiz/base/util/string/UelUtil.java b/framework/base/src/org/ofbiz/base/util/string/UelUtil.java index 3858533825..9823eff463 100644 --- a/framework/base/src/org/ofbiz/base/util/string/UelUtil.java +++ b/framework/base/src/org/ofbiz/base/util/string/UelUtil.java @@ -109,12 +109,15 @@ public class UelUtil { public BasicContext(Map context) { this.variableMapper = new BasicVariableMapper(context, this); } + @Override public ELResolver getELResolver() { return defaultResolver; } + @Override public FunctionMapper getFunctionMapper() { return UelFunctions.getFunctionMapper(); } + @Override public VariableMapper getVariableMapper() { return this.variableMapper; } @@ -134,6 +137,7 @@ public class UelUtil { * @param variable the variable's name * @return a BasicValueExpression containing the variable's value or null if the variable is unknown */ + @Override public ValueExpression resolveVariable(String variable) { Object obj = null; String createObjectType = null; @@ -189,6 +193,7 @@ public class UelUtil { } return null; } + @Override public ValueExpression setVariable(String variable, ValueExpression expression) { return new BasicValueExpression(this.variables.put(variable, expression.getValue(this.elContext))); } @@ -201,6 +206,7 @@ public class UelUtil { super(); this.object = object; } + @Override public boolean equals(Object obj) { if (this == obj) { return true; @@ -214,30 +220,39 @@ public class UelUtil { } catch (Exception e) {} return false; } + @Override public int hashCode() { return this.object == null ? 0 : this.object.hashCode(); } + @Override public Object getValue(ELContext context) { return this.object; } + @Override public String getExpressionString() { return null; } + @Override public boolean isLiteralText() { return false; } + @Override public Class getType(ELContext context) { return this.object == null ? null : this.object.getClass(); } + @Override public boolean isReadOnly(ELContext context) { return false; } + @Override public void setValue(ELContext context, Object value) { this.object = value; } + @Override public String toString() { return "ValueExpression(" + this.object + ")"; } + @Override public Class getExpectedType() { return this.object == null ? null : this.object.getClass(); } @@ -247,6 +262,7 @@ public class UelUtil { * auto-vivify. */ protected static class ExtendedCompositeResolver extends CompositeELResolver { + @Override public void setValue(ELContext context, Object base, Object property, Object val) { super.setValue(context, base, property, val); if (!context.isPropertyResolved() && base == null) { @@ -271,6 +287,7 @@ public class UelUtil { super(isReadOnly); this.isReadOnly = isReadOnly; } + @Override @SuppressWarnings("unchecked") public void setValue(ELContext context, Object base, Object property, Object val) { if (context == null) { @@ -317,6 +334,7 @@ public class UelUtil { public ExtendedMapResolver(boolean isReadOnly) { super(isReadOnly); } + @Override @SuppressWarnings("unchecked") public Object getValue(ELContext context, Object base, Object property) { if (context == null) { diff --git a/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java b/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java index a55cbd4352..a891926f3b 100644 --- a/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java +++ b/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java @@ -584,9 +584,11 @@ public class FreeMarkerWorker { this.templateLocation = templateLocation; } + @Override public int hashCode() { return templateLocation.hashCode(); } + @Override public boolean equals(Object obj) { return obj instanceof FlexibleTemplateSource && obj.hashCode() == this.hashCode(); } diff --git a/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java b/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java index 7f96cc00a2..ee1afb8c2c 100644 --- a/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java +++ b/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java @@ -56,10 +56,12 @@ public class OfbizStore extends StoreBase implements Store { this.delegator = delegator; } + @Override public String getInfo() { return info; } + @Override public String getStoreName() { return storeName; } diff --git a/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java b/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java index 983631f926..c0b0831dc2 100644 --- a/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java +++ b/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java @@ -49,6 +49,7 @@ public class SSLImpl extends JSSEImplementation { Debug.log("SSLImpl loaded; using custom ServerSocketFactory", module); } + @Override public ServerSocketFactory getServerSocketFactory() { return ssFactory; } diff --git a/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java b/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java index 081825512e..37573f8777 100644 --- a/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java +++ b/framework/common/src/org/ofbiz/common/authentication/AuthHelper.java @@ -88,7 +88,6 @@ public class AuthHelper { } } - @SuppressWarnings("unchecked") private synchronized static void loadAuthenticators_internal(LocalDispatcher dispatcher) { if (!authenticatorsLoaded) { Iterator it = ServiceRegistry.lookupProviders(Authenticator.class, getContextClassLoader()); diff --git a/framework/entity/src/org/ofbiz/entity/GenericDelegator.java b/framework/entity/src/org/ofbiz/entity/GenericDelegator.java index 87d70a7d57..1a6ec808f7 100644 --- a/framework/entity/src/org/ofbiz/entity/GenericDelegator.java +++ b/framework/entity/src/org/ofbiz/entity/GenericDelegator.java @@ -1655,6 +1655,7 @@ public class GenericDelegator implements DelegatorInterface { *@return The GenericValue corresponding to the primaryKey *@deprecated Use findOne() instead */ + @Deprecated public GenericValue findByPrimaryKey(GenericPK primaryKey) throws GenericEntityException { return findOne(primaryKey.getEntityName(), primaryKey, false); } @@ -1665,6 +1666,7 @@ public class GenericDelegator implements DelegatorInterface { *@return The GenericValue corresponding to the primaryKey *@deprecated Use findOne() instead */ + @Deprecated public GenericValue findByPrimaryKeyCache(GenericPK primaryKey) throws GenericEntityException { return findOne(primaryKey.getEntityName(), primaryKey, true); } @@ -1676,6 +1678,7 @@ public class GenericDelegator implements DelegatorInterface { *@return The GenericValue corresponding to the primaryKey *@deprecated Use findOne() instead */ + @Deprecated public GenericValue findByPrimaryKey(String entityName, Object... fields) throws GenericEntityException { return findByPrimaryKey(entityName, UtilMisc.toMap(fields)); } @@ -1697,6 +1700,7 @@ public class GenericDelegator implements DelegatorInterface { *@return The GenericValue corresponding to the primaryKey *@deprecated Use findOne() instead */ + @Deprecated public GenericValue findByPrimaryKeySingle(String entityName, Object singlePkValue) throws GenericEntityException { return findOne(entityName, makePKSingle(entityName, singlePkValue), false); } @@ -1728,6 +1732,7 @@ public class GenericDelegator implements DelegatorInterface { *@return The GenericValue corresponding to the primaryKey *@deprecated Use findOne() instead */ + @Deprecated public GenericValue findByPrimaryKeyCacheSingle(String entityName, Object singlePkValue) throws GenericEntityException { return findOne(entityName, makePKSingle(entityName, singlePkValue), true); } @@ -1739,6 +1744,7 @@ public class GenericDelegator implements DelegatorInterface { *@return The GenericValue corresponding to the primaryKey *@deprecated Use findByPrimaryKeyPartial(GenericPK, Set) instead */ + @Deprecated public GenericValue findByPrimaryKeyPartial(GenericPK primaryKey, String... keys) throws GenericEntityException { return findByPrimaryKeyPartial(primaryKey, UtilMisc.makeSetWritable(Arrays.asList(keys))); } @@ -1799,6 +1805,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue objects corresponding to the passed primaryKey objects *@deprecated */ + @Deprecated public List findAllByPrimaryKeys(Collection primaryKeys) throws GenericEntityException { boolean beganTransaction = false; try { @@ -1861,6 +1868,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue objects corresponding to the passed primaryKey objects *@deprecated */ + @Deprecated public List findAllByPrimaryKeysCache(Collection primaryKeys) throws GenericEntityException { boolean beganTransaction = false; try { @@ -1930,6 +1938,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List containing all Generic entities *@deprecated Use findList() instead */ + @Deprecated public List findAll(String entityName) throws GenericEntityException { return this.findList(entityName, null, null, null, null, false); } @@ -1941,6 +1950,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List containing all Generic entities *@deprecated Use findList() instead */ + @Deprecated public List findAll(String entityName, String... orderBy) throws GenericEntityException { return findList(entityName, null, null, Arrays.asList(orderBy), null, false); } @@ -1952,6 +1962,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List containing all Generic entities *@deprecated Use findList() instead */ + @Deprecated public List findAll(String entityName, List orderBy) throws GenericEntityException { return this.findList(entityName, null, null, orderBy, null, false); } @@ -1962,6 +1973,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List containing all Generic entities *@deprecated Use findList() instead */ + @Deprecated public List findAllCache(String entityName) throws GenericEntityException { return this.findList(entityName, null, null, null, null, true); } @@ -1973,6 +1985,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List containing all Generic entities *@deprecated Use findList() instead */ + @Deprecated public List findAllCache(String entityName, String... orderBy) throws GenericEntityException { return findList(entityName, null, null, Arrays.asList(orderBy), null, true); } @@ -1984,6 +1997,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List containing all Generic entities *@deprecated Use findList() instead */ + @Deprecated public List findAllCache(String entityName, List orderBy) throws GenericEntityException { return this.findList(entityName, null, null, orderBy, null, true); } @@ -2016,6 +2030,7 @@ public class GenericDelegator implements DelegatorInterface { * @return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByOr(String entityName, Object... fields) throws GenericEntityException { EntityCondition ecl = EntityCondition.makeCondition(EntityOperator.OR, fields); return this.findList(entityName, ecl, null, null, null, false); @@ -2028,6 +2043,7 @@ public class GenericDelegator implements DelegatorInterface { * @return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByOr(String entityName, Map fields) throws GenericEntityException { EntityCondition ecl = EntityCondition.makeCondition(fields, EntityOperator.OR); return this.findList(entityName, ecl, null, null, null, false); @@ -2055,6 +2071,7 @@ public class GenericDelegator implements DelegatorInterface { * @return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByOr(String entityName, Map fields, List orderBy) throws GenericEntityException { EntityCondition ecl = EntityCondition.makeCondition(fields, EntityOperator.OR); return this.findList(entityName, ecl, null, orderBy, null, false); @@ -2067,6 +2084,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByAndCache(String entityName, Object... fields) throws GenericEntityException { return this.findByAndCache(entityName, UtilMisc.toMap(fields)); } @@ -2099,6 +2117,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByAnd(String entityName, T... expressions) throws GenericEntityException { EntityConditionList ecl = EntityCondition.makeCondition(EntityOperator.AND, expressions); return this.findList(entityName, ecl, null, null, null, false); @@ -2111,6 +2130,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByAnd(String entityName, List expressions) throws GenericEntityException { EntityConditionList ecl = EntityCondition.makeCondition(expressions, EntityOperator.AND); return this.findList(entityName, ecl, null, null, null, false); @@ -2124,6 +2144,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByAnd(String entityName, List expressions, List orderBy) throws GenericEntityException { EntityConditionList ecl = EntityCondition.makeCondition(expressions, EntityOperator.AND); return this.findList(entityName, ecl, null, orderBy, null, false); @@ -2136,6 +2157,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByOr(String entityName, T... expressions) throws GenericEntityException { return this.findList(entityName, EntityCondition.makeCondition(EntityOperator.AND, expressions), null, null, null, false); } @@ -2147,6 +2169,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByOr(String entityName, List expressions) throws GenericEntityException { EntityConditionList ecl = EntityCondition.makeCondition(expressions, EntityOperator.OR); return this.findList(entityName, ecl, null, null, null, false); @@ -2160,6 +2183,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue instances that match the query *@deprecated Use findList() instead */ + @Deprecated public List findByOr(String entityName, List expressions, List orderBy) throws GenericEntityException { EntityConditionList ecl = EntityCondition.makeCondition(expressions, EntityOperator.OR); return this.findList(entityName, ecl, null, orderBy, null, false); @@ -2169,6 +2193,7 @@ public class GenericDelegator implements DelegatorInterface { * NOTE 20080502: 0 references *@deprecated Use findList() instead */ + @Deprecated public List findByLike(String entityName, Object... fields) throws GenericEntityException { Map fieldMap = UtilMisc.toMap(fields); List likeExpressions = FastList.newInstance(); @@ -2185,6 +2210,7 @@ public class GenericDelegator implements DelegatorInterface { * NOTE 20080502: 1 references; all changed to findList *@deprecated Use findList() instead */ + @Deprecated public List findByLike(String entityName, Map fields) throws GenericEntityException { List likeExpressions = FastList.newInstance(); if (fields != null) { @@ -2200,6 +2226,7 @@ public class GenericDelegator implements DelegatorInterface { * NOTE 20080502: 1 references; all changed to findList *@deprecated Use findList() instead */ + @Deprecated public List findByLike(String entityName, Map fields, List orderBy) throws GenericEntityException { List likeExpressions = FastList.newInstance(); if (fields != null) { @@ -2220,6 +2247,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue objects representing the result *@deprecated Use findList() instead */ + @Deprecated public List findByCondition(String entityName, EntityCondition entityCondition, Collection fieldsToSelect, List orderBy) throws GenericEntityException { return this.findList(entityName, entityCondition, UtilMisc.toSet(fieldsToSelect), orderBy, null, false); } @@ -2235,6 +2263,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue objects representing the result *@deprecated Use findList() instead */ + @Deprecated public List findByCondition(String entityName, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, Collection fieldsToSelect, List orderBy, EntityFindOptions findOptions) throws GenericEntityException { @@ -2276,6 +2305,7 @@ public class GenericDelegator implements DelegatorInterface { *@return List of GenericValue objects representing the result *@deprecated Use findList() instead */ + @Deprecated public List findByConditionCache(String entityName, EntityCondition entityCondition, Collection fieldsToSelect, List orderBy) throws GenericEntityException { return this.findList(entityName, entityCondition, UtilMisc.collectionToSet(fieldsToSelect), orderBy, null, true); } @@ -2290,6 +2320,7 @@ public class GenericDelegator implements DelegatorInterface { * DONE WITH IT, AND DON'T LEAVE IT OPEN TOO LONG BEACUSE IT WILL MAINTAIN A DATABASE CONNECTION. *@deprecated Use find() instead */ + @Deprecated public EntityListIterator findListIteratorByCondition(String entityName, EntityCondition entityCondition, Collection fieldsToSelect, List orderBy) throws GenericEntityException { return this.find(entityName, entityCondition, null, UtilMisc.collectionToSet(fieldsToSelect), orderBy, null); @@ -2307,6 +2338,7 @@ public class GenericDelegator implements DelegatorInterface { * DONE WITH IT, AND DON'T LEAVE IT OPEN TOO LONG BEACUSE IT WILL MAINTAIN A DATABASE CONNECTION. *@deprecated Use find() instead */ + @Deprecated public EntityListIterator findListIteratorByCondition(String entityName, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition, Collection fieldsToSelect, List orderBy, EntityFindOptions findOptions) throws GenericEntityException { @@ -2462,6 +2494,7 @@ public class GenericDelegator implements DelegatorInterface { * NOTE 20080502: 3 references; all changed to findCoundByCondition *@deprecated Use findCountByCondition() instead */ + @Deprecated public long findCountByAnd(String entityName) throws GenericEntityException { return findCountByCondition(entityName, null, null, null); } @@ -2470,6 +2503,7 @@ public class GenericDelegator implements DelegatorInterface { * NOTE 20080502: 1 references; all changed to use findCountByCondition *@deprecated Use findCountByCondition() instead */ + @Deprecated public long findCountByAnd(String entityName, Object... fields) throws GenericEntityException { return findCountByCondition(entityName, EntityCondition.makeCondition(UtilMisc.toMap(fields), EntityOperator.AND), null, null); } @@ -2478,6 +2512,7 @@ public class GenericDelegator implements DelegatorInterface { * NOTE 20080502: 8 references; all changed to use findCountByCondition *@deprecated Use findCountByCondition() instead */ + @Deprecated public long findCountByAnd(String entityName, Map fields) throws GenericEntityException { return findCountByCondition(entityName, EntityCondition.makeCondition(fields, EntityOperator.AND), null, null); } @@ -2486,6 +2521,7 @@ public class GenericDelegator implements DelegatorInterface { * NOTE 20080502: 17 references; all changed to use remaining findCountByCondition *@deprecated Use findCountByCondition() instead */ + @Deprecated public long findCountByCondition(String entityName, EntityCondition whereEntityCondition, EntityCondition havingEntityCondition) throws GenericEntityException { return findCountByCondition(entityName, whereEntityCondition, havingEntityCondition, null); @@ -2600,6 +2636,7 @@ public class GenericDelegator implements DelegatorInterface { * @return List of GenericValue instances as specified in the relation definition *@deprecated Use getMultiRelation() instead */ + @Deprecated public List getMultiRelation(GenericValue value, String relationNameOne, String relationNameTwo) throws GenericEntityException { return getMultiRelation(value, relationNameOne, relationNameTwo, null); } @@ -2613,6 +2650,7 @@ public class GenericDelegator implements DelegatorInterface { * @return List of GenericValue instances as specified in the relation definition *@deprecated Use getRelated() instead */ + @Deprecated public List getRelated(String relationName, GenericValue value) throws GenericEntityException { return getRelated(relationName, null, null, value); } @@ -2627,6 +2665,7 @@ public class GenericDelegator implements DelegatorInterface { * @return List of GenericValue instances as specified in the relation definition *@deprecated Use getRelated() instead */ + @Deprecated public List getRelatedByAnd(String relationName, Map byAndFields, GenericValue value) throws GenericEntityException { return this.getRelated(relationName, byAndFields, null, value); } @@ -2642,6 +2681,7 @@ public class GenericDelegator implements DelegatorInterface { * @return List of GenericValue instances as specified in the relation definition *@deprecated Use getRelated() instead */ + @Deprecated public List getRelatedOrderBy(String relationName, List orderBy, GenericValue value) throws GenericEntityException { return this.getRelated(relationName, null, orderBy, value); } diff --git a/framework/entity/src/org/ofbiz/entity/GenericEntity.java b/framework/entity/src/org/ofbiz/entity/GenericEntity.java index 903d7621a6..7da769124b 100644 --- a/framework/entity/src/org/ofbiz/entity/GenericEntity.java +++ b/framework/entity/src/org/ofbiz/entity/GenericEntity.java @@ -1156,6 +1156,7 @@ public class GenericEntity extends Observable implements Map, Lo *@param obj The object (GenericEntity) to compare this two *@return boolean stating if the two objects are equal */ + @Override public boolean equals(Object obj) { if (!(obj instanceof GenericEntity)) return false; @@ -1170,6 +1171,7 @@ public class GenericEntity extends Observable implements Map, Lo /** Creates a hashCode for the entity, using the default String hashCode and Map hashCode, overrides the default hashCode *@return Hashcode corresponding to this entity */ + @Override public int hashCode() { // divide both by two (shift to right one bit) to maintain scale and add together if (generateHashCode) { @@ -1189,6 +1191,7 @@ public class GenericEntity extends Observable implements Map, Lo * *@return String corresponding to this entity */ + @Override public String toString() { StringBuilder theString = new StringBuilder(); theString.append("[GenericEntity:"); @@ -1297,6 +1300,7 @@ public class GenericEntity extends Observable implements Map, Lo /** Clones this GenericEntity, this is a shallow clone & uses the default shallow HashMap clone *@return Object that is a clone of this GenericEntity */ + @Override public Object clone() { GenericEntity newEntity = new GenericEntity(); newEntity.init(this); @@ -1374,9 +1378,11 @@ public class GenericEntity extends Observable implements Map, Lo public static class NullGenericEntity extends GenericEntity implements NULL { protected NullGenericEntity() { } + @Override public String getEntityName() { return "[null-entity]"; } + @Override public String toString() { return "[null-entity]"; } @@ -1385,6 +1391,7 @@ public class GenericEntity extends Observable implements Map, Lo public static class NullField implements NULL, Comparable { protected NullField() { } + @Override public String toString() { return "[null-field]"; } diff --git a/framework/entity/src/org/ofbiz/entity/GenericPK.java b/framework/entity/src/org/ofbiz/entity/GenericPK.java index 56c03feb89..cfd3479b76 100644 --- a/framework/entity/src/org/ofbiz/entity/GenericPK.java +++ b/framework/entity/src/org/ofbiz/entity/GenericPK.java @@ -31,6 +31,7 @@ import org.ofbiz.entity.model.ModelEntity; public class GenericPK extends GenericEntity { protected static final ObjectFactory genericPKFactory = new ObjectFactory() { + @Override protected GenericPK create() { return new GenericPK(); } @@ -69,6 +70,7 @@ public class GenericPK extends GenericEntity { /** Clones this GenericPK, this is a shallow clone & uses the default shallow HashMap clone *@return Object that is a clone of this GenericPK */ + @Override public Object clone() { GenericPK newEntity = GenericPK.create(this); newEntity.setDelegator(internalDelegator); diff --git a/framework/entity/src/org/ofbiz/entity/GenericValue.java b/framework/entity/src/org/ofbiz/entity/GenericValue.java index bafdca21df..8da8041fb1 100644 --- a/framework/entity/src/org/ofbiz/entity/GenericValue.java +++ b/framework/entity/src/org/ofbiz/entity/GenericValue.java @@ -49,6 +49,7 @@ public class GenericValue extends GenericEntity implements Reusable { public static final GenericValue NULL_VALUE = new NullGenericValue(); protected static final ObjectFactory genericValueFactory = new ObjectFactory() { + @Override protected GenericValue create() { return new GenericValue(); } @@ -103,6 +104,7 @@ public class GenericValue extends GenericEntity implements Reusable { return newValue; } + @Override public void reset() { // from GenericEntity super.reset(); @@ -113,6 +115,7 @@ public class GenericValue extends GenericEntity implements Reusable { this.originalDbValues = null; } + @Override public void synchronizedWithDatasource() { super.synchronizedWithDatasource(); this.copyOriginalDbValues(); @@ -490,6 +493,7 @@ public class GenericValue extends GenericEntity implements Reusable { /** Clones this GenericValue, this is a shallow clone & uses the default shallow HashMap clone *@return Object that is a clone of this GenericValue */ + @Override public Object clone() { GenericValue newEntity = GenericValue.create(this); newEntity.setDelegator(internalDelegator); @@ -497,9 +501,11 @@ public class GenericValue extends GenericEntity implements Reusable { } protected static class NullGenericValue extends GenericValue implements NULL { + @Override public String getEntityName() { return "[null-entity-value]"; } + @Override public String toString() { return "[null-entity-value]"; } diff --git a/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java b/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java index 3712caa57f..c55daaa364 100644 --- a/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java +++ b/framework/entity/src/org/ofbiz/entity/GenericValueHtmlWrapper.java @@ -40,6 +40,7 @@ import freemarker.template.TemplateModelException; @SuppressWarnings("serial") public class GenericValueHtmlWrapper extends GenericValue { protected static final ObjectFactory genericValueHtmlWrapperFactory = new ObjectFactory() { + @Override protected GenericValueHtmlWrapper create() { return new GenericValueHtmlWrapper(); } @@ -68,6 +69,7 @@ public class GenericValueHtmlWrapper extends GenericValue { } }*/ + @Override public Object get(Object name) { Object value = super.get(name); if (value instanceof String) { @@ -83,6 +85,7 @@ public class GenericValueHtmlWrapper extends GenericValue { super(gv, wrapper); } + @Override public TemplateModel get(String key) { TemplateModel tm = null; try { diff --git a/framework/entity/src/org/ofbiz/entity/cache/EntityObjectCache.java b/framework/entity/src/org/ofbiz/entity/cache/EntityObjectCache.java index 0d2d57ad6e..1cbee7fde8 100644 --- a/framework/entity/src/org/ofbiz/entity/cache/EntityObjectCache.java +++ b/framework/entity/src/org/ofbiz/entity/cache/EntityObjectCache.java @@ -29,14 +29,17 @@ public class EntityObjectCache extends AbstractEntityConditionCache { return null; } + @Override public void validateSql(ModelEntity entity, Object lhs, Object rhs) throws GenericModelException { if (lhs instanceof EntityConditionValue) { EntityConditionValue ecv = (EntityConditionValue) lhs; @@ -79,11 +79,13 @@ public class EntityComparisonOperator extends EntityOperator { } } + @Override public void visit(EntityConditionVisitor visitor, Object lhs, Object rhs) { visitor.accept(lhs); visitor.accept(rhs); } + @Override public void addSqlValue(StringBuilder sql, ModelEntity entity, List entityConditionParams, boolean compat, Object lhs, Object rhs, DatasourceInfo datasourceInfo) { //Debug.logInfo("EntityComparisonOperator.addSqlValue field=" + lhs + ", value=" + rhs + ", value type=" + (rhs == null ? "null object" : rhs.getClass().getName()), module); @@ -135,6 +137,7 @@ public class EntityComparisonOperator extends EntityOperator { return Boolean.valueOf(mapMatches(delegator, map, lhs, rhs)); } + @Override @SuppressWarnings("unchecked") public boolean mapMatches(GenericDelegator delegator, Map map, Object lhs, Object rhs) { Object leftValue; @@ -158,6 +161,7 @@ public class EntityComparisonOperator extends EntityOperator { return compare((Comparable) leftValue, rightValue); } + @Override public EntityCondition freeze(Object lhs, Object rhs) { return EntityCondition.makeCondition(freeze(lhs), this, freeze(rhs)); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java b/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java index 40f94c573e..27e14c26eb 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityCondition.java @@ -134,6 +134,7 @@ public abstract class EntityCondition extends EntityConditionBase implements Reu return ews; } + @Override public String toString() { return makeWhereString(null, FastList.newInstance(), null); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBase.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBase.java index 5b6ace55a6..94056c1609 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBase.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionBase.java @@ -101,10 +101,12 @@ public abstract class EntityConditionBase implements Serializable { SqlJdbcUtil.addValue(buffer, params == null ? null : field, value, params); } + @Override public boolean equals(Object obj) { throw new UnsupportedOperationException("equals:" + getClass().getName()); } + @Override public int hashCode() { throw new UnsupportedOperationException("hashCode: " + getClass().getName()); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java index b60c11f711..a03101f890 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java @@ -37,12 +37,15 @@ public abstract class EntityConditionFunction extends EntityCondition { public static class NOT extends EntityConditionFunction { public NOT(EntityCondition nested) { super(ID_NOT, "NOT", nested); } + @Override public boolean mapMatches(GenericDelegator delegator, Map map) { return !condition.mapMatches(delegator, map); } + @Override public EntityCondition freeze() { return new NOT(condition.freeze()); } + @Override public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { // nothing to do here... } @@ -79,20 +82,24 @@ public abstract class EntityConditionFunction extends EntityCondition { return idInt; } + @Override public void visit(EntityConditionVisitor visitor) { visitor.acceptEntityConditionFunction(this, condition); } + @Override public boolean equals(Object obj) { if (!(obj instanceof EntityConditionFunction)) return false; EntityConditionFunction otherFunc = (EntityConditionFunction) obj; return this.idInt == otherFunc.idInt && (this.condition != null ? condition.equals(otherFunc.condition) : otherFunc.condition != null); } + @Override public int hashCode() { return idInt.hashCode() ^ condition.hashCode(); } + @Override public String makeWhereString(ModelEntity modelEntity, List entityConditionParams, DatasourceInfo datasourceInfo) { StringBuilder sb = new StringBuilder(); sb.append(codeString).append('('); @@ -101,6 +108,7 @@ public abstract class EntityConditionFunction extends EntityCondition { return sb.toString(); } + @Override public void checkCondition(ModelEntity modelEntity) throws GenericModelException { condition.checkCondition(modelEntity); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java index 5fe7e78762..73d84299c4 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionList.java @@ -31,6 +31,7 @@ public class EntityConditionList extends EntityCondit public static final String module = EntityConditionList.class.getName(); protected static final ObjectFactory entityConditionListFactory = new ObjectFactory() { + @Override protected EntityConditionList create() { return new EntityConditionList(); } @@ -41,23 +42,28 @@ public class EntityConditionList extends EntityCondit } /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityConditionList(EntityJoinOperator operator, T... conditionList) { init(operator, conditionList); } /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityConditionList(List conditionList, EntityJoinOperator operator) { init(conditionList, operator); } + @Override public int getConditionListSize() { return super.getConditionListSize(); } + @Override public Iterator getConditionIterator() { return super.getConditionIterator(); } + @Override public void accept(EntityConditionVisitor visitor) { visitor.acceptEntityConditionList(this); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java index 54171c5b75..b2a79cdd4e 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionListBase.java @@ -79,10 +79,12 @@ public abstract class EntityConditionListBase extends return this.conditionList.iterator(); } + @Override public void visit(EntityConditionVisitor visitor) { visitor.acceptEntityJoinOperator(operator, conditionList); } + @Override public String makeWhereString(ModelEntity modelEntity, List entityConditionParams, DatasourceInfo datasourceInfo) { // if (Debug.verboseOn()) Debug.logVerbose("makeWhereString for entity " + modelEntity.getEntityName(), module); StringBuilder sql = new StringBuilder(); @@ -90,25 +92,30 @@ public abstract class EntityConditionListBase extends return sql.toString(); } + @Override public void checkCondition(ModelEntity modelEntity) throws GenericModelException { // if (Debug.verboseOn()) Debug.logVerbose("checkCondition for entity " + modelEntity.getEntityName(), module); operator.validateSql(modelEntity, conditionList); } + @Override public boolean mapMatches(GenericDelegator delegator, Map map) { return operator.mapMatches(delegator, map, conditionList); } + @Override public EntityCondition freeze() { return operator.freeze(conditionList); } + @Override public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { for (T cond: this.conditionList) { cond.encryptConditionFields(modelEntity, delegator); } } + @Override public boolean equals(Object obj) { if (!(obj instanceof EntityConditionListBase)) return false; EntityConditionListBase other = (EntityConditionListBase) obj; @@ -122,6 +129,7 @@ public abstract class EntityConditionListBase extends return isEqual; } + @Override public int hashCode() { return conditionList.hashCode() + operator.hashCode(); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java index d8113a83c6..f53f2feed0 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionParam.java @@ -48,6 +48,7 @@ public class EntityConditionParam implements Serializable { return fieldValue; } + @Override public String toString() { return modelField.getColName() + "=" + fieldValue.toString(); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java index bd7dee81cb..3550b39f7e 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java @@ -51,6 +51,7 @@ public class EntityConditionSubSelect extends EntityConditionValue { this.requireAll = requireAll; } + @Override public void addSqlValue(StringBuilder sql, Map tableAliases, ModelEntity parentModelEntity, List entityConditionParams, boolean includeTableNamePrefix, DatasourceInfo datasourceInfo) { if (localModelEntity instanceof ModelViewEntity && datasourceInfo == null) { @@ -105,24 +106,29 @@ public class EntityConditionSubSelect extends EntityConditionValue { } } + @Override public EntityConditionValue freeze() { return new EntityConditionSubSelect(localModelEntity, keyFieldName, (whereCond != null ? whereCond.freeze() : null), requireAll); } + @Override public ModelField getModelField(ModelEntity modelEntity) { // do nothing for now return null; } + @Override public Comparable getValue(GenericDelegator delegator, Map map) { // do nothing for now return null; } + @Override public void validateSql(ModelEntity modelEntity) throws GenericModelException { // do nothing for now } + @Override public void visit(EntityConditionVisitor visitor) { if (whereCond != null) whereCond.visit(visitor); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java index 0149f48329..a05989f628 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java @@ -68,6 +68,7 @@ public abstract class EntityConditionValue extends EntityConditionBase { addSqlValue(sb, null, new ArrayList(), false, null); } + @Override public String toString() { StringBuilder sql = new StringBuilder(); toString(sql); diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java b/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java index f14a9e5e5d..53a6cdf16a 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityDateFilterCondition.java @@ -33,6 +33,7 @@ import org.ofbiz.entity.model.ModelEntity; public class EntityDateFilterCondition extends EntityCondition { protected static final ObjectFactory entityDateFilterConditionFactory = new ObjectFactory() { + @Override protected EntityDateFilterCondition create() { return new EntityDateFilterCondition(); } @@ -44,6 +45,7 @@ public class EntityDateFilterCondition extends EntityCondition { protected EntityDateFilterCondition() {} /** @deprecated Use EntityCondition.makeConditionDate() instead */ + @Deprecated public EntityDateFilterCondition(String fromDateName, String thruDateName) { init(fromDateName, thruDateName); } @@ -58,43 +60,52 @@ public class EntityDateFilterCondition extends EntityCondition { this.thruDateName = null; } + @Override public String makeWhereString(ModelEntity modelEntity, List entityConditionParams, DatasourceInfo datasourceInfo) { EntityCondition condition = makeCondition(); return condition.makeWhereString(modelEntity, entityConditionParams, datasourceInfo); } + @Override public void checkCondition(ModelEntity modelEntity) throws GenericModelException { EntityCondition condition = makeCondition(); condition.checkCondition(modelEntity); } + @Override public boolean mapMatches(GenericDelegator delegator, Map map) { EntityCondition condition = makeCondition(); return condition.mapMatches(delegator, map); } + @Override public boolean equals(Object obj) { if (!(obj instanceof EntityDateFilterCondition)) return false; EntityDateFilterCondition other = (EntityDateFilterCondition) obj; return equals(fromDateName, other.fromDateName) && equals(thruDateName, other.thruDateName); } + @Override public int hashCode() { return hashCode(fromDateName) ^ hashCode(thruDateName); } + @Override public void visit(EntityConditionVisitor visitor) { visitor.acceptEntityDateFilterCondition(this); } + @Override public void accept(EntityConditionVisitor visitor) { visitor.acceptEntityDateFilterCondition(this); } + @Override public EntityCondition freeze() { return this; } + @Override public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { // nothing to do here... } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java b/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java index e1eb948779..cf85d44e2f 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java @@ -21,8 +21,6 @@ package org.ofbiz.entity.condition; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Set; - import javolution.context.ObjectFactory; import org.ofbiz.base.util.Debug; @@ -33,12 +31,10 @@ import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntity; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericModelException; -import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.config.DatasourceInfo; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelField; import org.ofbiz.entity.model.ModelFieldType; -import org.ofbiz.entity.model.ModelFieldTypeReader; /** * Encapsulates simple expressions used for specifying queries @@ -48,6 +44,7 @@ public class EntityExpr extends EntityCondition { public static final String module = EntityExpr.class.getName(); protected static final ObjectFactory entityExprFactory = new ObjectFactory() { + @Override protected EntityExpr create() { return new EntityExpr(); } @@ -60,21 +57,25 @@ public class EntityExpr extends EntityCondition { protected EntityExpr() {} /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityExpr(Object lhs, EntityComparisonOperator operator, Object rhs) { this.init(lhs, operator, rhs); } /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityExpr(String lhs, EntityComparisonOperator operator, Object rhs) { this.init(lhs, operator, rhs); } /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityExpr(String lhs, boolean leftUpper, EntityComparisonOperator operator, Object rhs, boolean rightUpper) { this.init(leftUpper ? EntityFunction.UPPER_FIELD(lhs) : lhs, operator, rightUpper ? EntityFunction.UPPER(rhs) : rhs); } /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityExpr(EntityCondition lhs, EntityJoinOperator operator, EntityCondition rhs) { this.init(lhs, operator, rhs); } @@ -133,20 +134,24 @@ public class EntityExpr extends EntityCondition { } /** @deprecated */ + @Deprecated public void setLUpper(boolean upper) { } /** @deprecated */ + @Deprecated public boolean isLUpper() { return lhs instanceof EntityFunction.UPPER; } /** @deprecated */ + @Deprecated public boolean isRUpper() { return rhs instanceof EntityFunction.UPPER; } /** @deprecated */ + @Deprecated public void setRUpper(boolean upper) { } @@ -162,6 +167,7 @@ public class EntityExpr extends EntityCondition { return rhs; } + @Override public String makeWhereString(ModelEntity modelEntity, List entityConditionParams, DatasourceInfo datasourceInfo) { // if (Debug.verboseOn()) Debug.logVerbose("makeWhereString for entity " + modelEntity.getEntityName(), module); @@ -172,10 +178,12 @@ public class EntityExpr extends EntityCondition { return sql.toString(); } + @Override public boolean mapMatches(GenericDelegator delegator, Map map) { return operator.mapMatches(delegator, map, lhs, rhs); } + @Override public void checkCondition(ModelEntity modelEntity) throws GenericModelException { // if (Debug.verboseOn()) Debug.logVerbose("checkCondition for entity " + modelEntity.getEntityName(), module); if (lhs instanceof EntityCondition) { @@ -184,6 +192,7 @@ public class EntityExpr extends EntityCondition { } } + @Override protected void addValue(StringBuilder buffer, ModelField field, Object value, List params) { if (rhs instanceof EntityFunction.UPPER) { if (value instanceof String) { @@ -193,10 +202,12 @@ public class EntityExpr extends EntityCondition { super.addValue(buffer, field, value, params); } + @Override public EntityCondition freeze() { return operator.freeze(lhs, rhs); } + @Override public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { if (this.lhs instanceof String) { ModelField modelField = modelEntity.getField((String) this.lhs); @@ -212,10 +223,12 @@ public class EntityExpr extends EntityCondition { } } + @Override public void visit(EntityConditionVisitor visitor) { visitor.acceptEntityOperator(operator, lhs, rhs); } + @Override public void accept(EntityConditionVisitor visitor) { visitor.acceptEntityExpr(this); } @@ -272,6 +285,7 @@ public class EntityExpr extends EntityCondition { } } + @Override public boolean equals(Object obj) { if (!(obj instanceof EntityExpr)) return false; EntityExpr other = (EntityExpr) obj; @@ -286,6 +300,7 @@ public class EntityExpr extends EntityCondition { return isEqual; } + @Override public int hashCode() { return hashCode(lhs) + hashCode(operator) + diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java b/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java index 09b7d679e2..8a63c5b811 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityFieldMap.java @@ -36,6 +36,7 @@ import org.ofbiz.entity.util.EntityUtil; public class EntityFieldMap extends EntityConditionListBase { protected static final ObjectFactory entityFieldMapFactory = new ObjectFactory() { + @Override protected EntityFieldMap create() { return new EntityFieldMap(); } @@ -62,21 +63,25 @@ public class EntityFieldMap extends EntityConditionListBase { /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityFieldMap(EntityComparisonOperator compOp, EntityJoinOperator joinOp, Object... keysValues) { this.init(compOp, joinOp, keysValues); } /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityFieldMap(Map fieldMap, EntityComparisonOperator compOp, EntityJoinOperator joinOp) { this.init(fieldMap, compOp, joinOp); } /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityFieldMap(EntityJoinOperator operator, Object... keysValues) { this.init(EntityOperator.EQUALS, operator, keysValues); } /** @deprecated Use EntityCondition.makeCondition() instead */ + @Deprecated public EntityFieldMap(Map fieldMap, EntityJoinOperator operator) { this.init(fieldMap, EntityOperator.EQUALS, operator); } @@ -95,6 +100,7 @@ public class EntityFieldMap extends EntityConditionListBase { this.operator = joinOp; } + @Override public void reset() { super.reset(); this.fieldMap = null; @@ -116,6 +122,7 @@ public class EntityFieldMap extends EntityConditionListBase { return Collections.unmodifiableMap(this.fieldMap).entrySet().iterator(); } + @Override public void accept(EntityConditionVisitor visitor) { visitor.acceptEntityFieldMap(this); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java b/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java index b64a83d4ba..c0af3cb1fd 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java @@ -39,6 +39,7 @@ import org.ofbiz.entity.model.ModelField; public class EntityFieldValue extends EntityConditionValue implements Reusable { protected static final ObjectFactory entityFieldValueFactory = new ObjectFactory() { + @Override protected EntityFieldValue create() { return new EntityFieldValue(); } @@ -55,6 +56,7 @@ public class EntityFieldValue extends EntityConditionValue implements Reusable { protected EntityFieldValue() {} /** @deprecated Use EntityFieldValue.makeFieldValue() instead */ + @Deprecated public EntityFieldValue(String fieldName) { this.init(fieldName); } @@ -71,24 +73,29 @@ public class EntityFieldValue extends EntityConditionValue implements Reusable { return fieldName; } + @Override public int hashCode() { return fieldName.hashCode(); } + @Override public boolean equals(Object obj) { if (!(obj instanceof EntityFieldValue)) return false; EntityFieldValue otherValue = (EntityFieldValue) obj; return fieldName.equals(otherValue.fieldName); } + @Override public ModelField getModelField(ModelEntity modelEntity) { return getField(modelEntity, fieldName); } + @Override public void addSqlValue(StringBuilder sql, Map tableAliases, ModelEntity modelEntity, List entityConditionParams, boolean includeTableNamePrefix, DatasourceInfo datasourceInfo) { sql.append(getColName(tableAliases, modelEntity, fieldName, includeTableNamePrefix, datasourceInfo)); } + @Override public void validateSql(ModelEntity modelEntity) throws GenericModelException { ModelField field = getModelField(modelEntity); if (field == null) { @@ -96,6 +103,7 @@ public class EntityFieldValue extends EntityConditionValue implements Reusable { } } + @Override public Object getValue(GenericDelegator delegator, Map map) { if (map == null) { return null; @@ -107,14 +115,17 @@ public class EntityFieldValue extends EntityConditionValue implements Reusable { } } + @Override public void visit(EntityConditionVisitor visitor) { visitor.acceptEntityFieldValue(this); } + @Override public void accept(EntityConditionVisitor visitor) { visitor.acceptEntityFieldValue(this); } + @Override public EntityConditionValue freeze() { return this; } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java b/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java index 7cf795897a..cea9eca80a 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java @@ -81,18 +81,22 @@ public abstract class EntityFunction extends EntityConditi public Integer getValue(Object value) { return value.toString().length(); } }; protected static final SQLFunctionFactory lengthFactory = new SQLFunctionFactory() { + @Override protected LENGTH create() { return new LENGTH(); } + @Override protected void init(LENGTH function, Object value) { function.init(value); } }; protected LENGTH() {} /** @deprecated Use EntityCondition.LENGTH() instead */ + @Deprecated public LENGTH(EntityConditionValue nested) { init(nested); } /** @deprecated Use EntityCondition.LENGTH() instead */ + @Deprecated public LENGTH(Object value) { init(value); } public void init(Object value) { super.init(FETCHER, SQLFunction.LENGTH, value); @@ -104,18 +108,22 @@ public abstract class EntityFunction extends EntityConditi public String getValue(Object value) { return value.toString().trim(); } }; protected static final SQLFunctionFactory trimFactory = new SQLFunctionFactory() { + @Override protected TRIM create() { return new TRIM(); } + @Override protected void init(TRIM function, Object value) { function.init(value); } }; protected TRIM() {} /** @deprecated Use EntityCondition.TRIM() instead */ + @Deprecated public TRIM(EntityConditionValue nested) { init(nested); } /** @deprecated Use EntityCondition.TRIM() instead */ + @Deprecated public TRIM(Object value) { init(value); } public void init(Object value) { super.init(FETCHER, SQLFunction.TRIM, value); @@ -127,18 +135,22 @@ public abstract class EntityFunction extends EntityConditi public String getValue(Object value) { return value.toString().toUpperCase(); } }; protected static final SQLFunctionFactory upperFactory = new SQLFunctionFactory() { + @Override protected UPPER create() { return new UPPER(); } + @Override protected void init(UPPER function, Object value) { function.init(value); } }; protected UPPER() {} /** @deprecated Use EntityCondition.UPPER() instead */ + @Deprecated public UPPER(EntityConditionValue nested) { init(nested); } /** @deprecated Use EntityCondition.UPPER() instead */ + @Deprecated public UPPER(Object value) { init(value); } public void init(Object value) { super.init(FETCHER, SQLFunction.UPPER, value); @@ -150,18 +162,22 @@ public abstract class EntityFunction extends EntityConditi public String getValue(Object value) { return value.toString().toLowerCase(); } }; protected static final SQLFunctionFactory lowerFactory = new SQLFunctionFactory() { + @Override protected LOWER create() { return new LOWER(); } + @Override protected void init(LOWER function, Object value) { function.init(value); } }; protected LOWER() {} /** @deprecated Use EntityCondition.LOWER() instead */ + @Deprecated public LOWER(EntityConditionValue nested) { init(nested); } /** @deprecated Use EntityCondition.LOWER() instead */ + @Deprecated public LOWER(Object value) { init(value); } public void init(Object value) { super.init(FETCHER, SQLFunction.LOWER, value); @@ -202,6 +218,7 @@ public abstract class EntityFunction extends EntityConditi this.fetcher = null; } + @Override public EntityConditionValue freeze() { if (nested != null) { return new EntityFunction(fetcher, function, nested.freeze()) {}; @@ -222,10 +239,12 @@ public abstract class EntityFunction extends EntityConditi return function.ordinal(); } + @Override public int hashCode() { return function.hashCode(); } + @Override public boolean equals(Object obj) { if (!(obj instanceof EntityFunction)) return false; EntityFunction otherFunc = (EntityFunction) obj; @@ -234,6 +253,7 @@ public abstract class EntityFunction extends EntityConditi (this.value != null ? value.equals(otherFunc.value) : otherFunc.value == null)); } + @Override public void addSqlValue(StringBuilder sql, Map tableAliases, ModelEntity modelEntity, List entityConditionParams, boolean includeTableNamePrefix, DatasourceInfo datasourceinfo) { sql.append(function.name()).append('('); if (nested != null) { @@ -244,6 +264,7 @@ public abstract class EntityFunction extends EntityConditi sql.append(')'); } + @Override public void visit(EntityConditionVisitor visitor) { if (nested != null) { visitor.acceptEntityConditionValue(nested); @@ -252,10 +273,12 @@ public abstract class EntityFunction extends EntityConditi } } + @Override public void accept(EntityConditionVisitor visitor) { visitor.acceptEntityFunction(this); } + @Override public ModelField getModelField(ModelEntity modelEntity) { if (nested != null) { return nested.getModelField(modelEntity); @@ -263,12 +286,14 @@ public abstract class EntityFunction extends EntityConditi return null; } + @Override public void validateSql(ModelEntity modelEntity) throws GenericModelException { if (nested != null) { nested.validateSql(modelEntity); } } + @Override public Object getValue(GenericDelegator delegator, Map map) { Object value = nested != null ? nested.getValue(delegator, map) : this.value; return value != null ? fetcher.getValue(value) : null; diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java b/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java index 551f07fc46..c5820eede2 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java @@ -44,6 +44,7 @@ public class EntityJoinOperator extends EntityOperator { this.shortCircuitValue = shortCircuitValue; } + @Override public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List entityConditionParams, boolean compat, Object lhs, Object rhs, DatasourceInfo datasourceInfo) { sql.append('('); sql.append(((EntityCondition) lhs).makeWhereString(modelEntity, entityConditionParams, datasourceInfo)); @@ -79,6 +80,7 @@ public class EntityJoinOperator extends EntityOperator { return ((EntityCondition) item).freeze(); } + @Override public EntityCondition freeze(Object lhs, Object rhs) { return EntityCondition.makeCondition(freeze(lhs), this, freeze(rhs)); } @@ -99,11 +101,13 @@ public class EntityJoinOperator extends EntityOperator { } } + @Override public void visit(EntityConditionVisitor visitor, Object lhs, Object rhs) { ((EntityCondition) lhs).visit(visitor); visitor.visit(rhs); } + @Override public boolean entityMatches(GenericEntity entity, Object lhs, Object rhs) { return entityMatches(entity, (EntityCondition) lhs, (EntityCondition) rhs); } @@ -126,6 +130,7 @@ public class EntityJoinOperator extends EntityOperator { return castBoolean(mapMatches(delegator, map, lhs, rhs)); } + @Override public boolean mapMatches(GenericDelegator delegator, Map map, Object lhs, Object rhs) { if (((EntityCondition) lhs).mapMatches(delegator, map)) return shortCircuitValue; if (((EntityCondition) rhs).mapMatches(delegator, map)) return shortCircuitValue; @@ -145,6 +150,7 @@ public class EntityJoinOperator extends EntityOperator { return !shortCircuitValue; } + @Override public void validateSql(ModelEntity modelEntity, Object lhs, Object rhs) throws GenericModelException { validateSql(modelEntity, (EntityCondition) lhs, (EntityCondition) rhs); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java b/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java index 53ec4e2cc3..bce9df501e 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java @@ -78,7 +78,9 @@ public abstract class EntityOperator extends EntityConditionBase { } public static final EntityComparisonOperator EQUALS = new EntityComparisonOperator(ID_EQUALS, "=") { + @Override public boolean compare(Comparable lhs, Object rhs) { return EntityComparisonOperator.compareEqual(lhs, rhs); } + @Override protected void makeRHSWhereString(ModelEntity entity, List entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { if (rhs == null || rhs == GenericEntity.NULL_FIELD) { //Debug.logInfo("makeRHSWhereString: field IS NULL: " + field.getName(), module); @@ -91,7 +93,9 @@ public abstract class EntityOperator extends EntityConditionBase { }; static { register( "equals", EQUALS ); } public static final EntityComparisonOperator NOT_EQUAL = new EntityComparisonOperator(ID_NOT_EQUAL, "<>") { + @Override public boolean compare(Comparable lhs, Object rhs) { return EntityComparisonOperator.compareNotEqual(lhs, rhs); } + @Override protected void makeRHSWhereString(ModelEntity entity, List entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { if (rhs == null || rhs == GenericEntity.NULL_FIELD) { sb.append(" IS NOT NULL"); @@ -104,36 +108,44 @@ public abstract class EntityOperator extends EntityConditionBase { static { register( "not-equals", NOT_EQUAL ); } static { register( "notEqual", NOT_EQUAL ); } public static final EntityComparisonOperator LESS_THAN = new EntityComparisonOperator(ID_LESS_THAN, "<") { + @Override public boolean compare(Comparable lhs, T rhs) { return EntityComparisonOperator.compareLessThan(lhs, rhs); } }; static { register( "less", LESS_THAN ); } static { register( "less-than", LESS_THAN ); } static { register( "lessThan", LESS_THAN ); } public static final EntityComparisonOperator GREATER_THAN = new EntityComparisonOperator(ID_GREATER_THAN, ">") { + @Override public boolean compare(Comparable lhs, T rhs) { return EntityComparisonOperator.compareGreaterThan(lhs, rhs); } }; static { register( "greater", GREATER_THAN ); } static { register( "greater-than", GREATER_THAN ); } static { register( "greaterThan", GREATER_THAN ); } public static final EntityComparisonOperator LESS_THAN_EQUAL_TO = new EntityComparisonOperator(ID_LESS_THAN_EQUAL_TO, "<=") { + @Override public boolean compare(Comparable lhs, T rhs) { return EntityComparisonOperator.compareLessThanEqualTo(lhs, rhs); } }; static { register( "less-equals", LESS_THAN_EQUAL_TO ); } static { register( "less-than-equal-to", LESS_THAN_EQUAL_TO ); } static { register( "lessThanEqualTo", LESS_THAN_EQUAL_TO ); } public static final EntityComparisonOperator GREATER_THAN_EQUAL_TO = new EntityComparisonOperator(ID_GREATER_THAN_EQUAL_TO, ">=") { + @Override public boolean compare(Comparable lhs, T rhs) { return EntityComparisonOperator.compareGreaterThanEqualTo(lhs, rhs); } }; static { register( "greater-equals", GREATER_THAN_EQUAL_TO ); } static { register( "greater-than-equal-to", GREATER_THAN_EQUAL_TO ); } static { register( "greaterThanEqualTo", GREATER_THAN_EQUAL_TO ); } public static final EntityComparisonOperator IN = new EntityComparisonOperator(ID_IN, "IN") { + @Override public boolean compare(Comparable lhs, T rhs) { return EntityComparisonOperator.compareIn(lhs, rhs); } + @Override protected void makeRHSWhereStringValue(ModelEntity entity, List entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSList(entityConditionParams, sb, field, rhs); } }; static { register( "in", IN ); } public static final EntityComparisonOperator BETWEEN = new EntityComparisonOperator(ID_BETWEEN, "BETWEEN") { + @Override public boolean compare(Comparable lhs, T rhs) { return EntityComparisonOperator.compareIn(lhs, rhs); } + @Override protected void makeRHSWhereStringValue(ModelEntity entity, List entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSBetweenList(entityConditionParams, sb, field, rhs); } }; static { register( "between", BETWEEN ); } @@ -144,15 +156,19 @@ public abstract class EntityOperator extends EntityConditionBase { public static final EntityJoinOperator OR = new EntityJoinOperator(ID_OR, "OR", true); static { register( "or", OR ); } public static final EntityComparisonOperator LIKE = new EntityComparisonOperator(ID_LIKE, "LIKE") { + @Override public boolean compare(Comparable lhs, Object rhs) { return EntityComparisonOperator.compareLike(lhs, rhs); } }; static { register( "like", LIKE ); } public static final EntityComparisonOperator NOT_LIKE = new EntityComparisonOperator(ID_NOT_LIKE, "NOT LIKE") { + @Override public boolean compare(Comparable lhs, T rhs) { return !EntityComparisonOperator.compareLike(lhs, rhs); } }; static { register( "not-like", NOT_LIKE); } public static final EntityComparisonOperator NOT_IN = new EntityComparisonOperator(ID_NOT_IN, "NOT IN") { + @Override public boolean compare(Comparable lhs, T rhs) { return !EntityComparisonOperator.compareIn(lhs, rhs); } + @Override protected void makeRHSWhereStringValue(ModelEntity entity, List entityConditionParams, StringBuilder sb, ModelField field, Object rhs, DatasourceInfo datasourceInfo) { appendRHSList(entityConditionParams, sb, field, rhs); } }; static { register( "not-in", NOT_IN ); } @@ -177,15 +193,18 @@ public abstract class EntityOperator extends EntityConditionBase { return idInt; } + @Override public String toString() { return codeString; } + @Override public int hashCode() { return this.codeString.hashCode(); } // FIXME: CCE + @Override public boolean equals(Object obj) { EntityOperator otherOper = (EntityOperator) obj; return this.idInt == otherOper.idInt; @@ -253,6 +272,7 @@ public abstract class EntityOperator extends EntityConditionBase { return 0; } + @Override public String toString() { return "(WILDCARD)"; } diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java b/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java index d601877dc1..4f3897049d 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java +++ b/framework/entity/src/org/ofbiz/entity/condition/EntityWhereString.java @@ -43,6 +43,7 @@ import org.ofbiz.entity.model.ModelEntity; public class EntityWhereString extends EntityCondition { protected static final ObjectFactory entityWhereStringFactory = new ObjectFactory() { + @Override protected EntityWhereString create() { return new EntityWhereString(); } @@ -53,6 +54,7 @@ public class EntityWhereString extends EntityCondition { protected EntityWhereString() {} /** @deprecated Use EntityCondition.makeConditionWhere() instead */ + @Deprecated public EntityWhereString(String sqlString) { init(sqlString); } @@ -65,17 +67,21 @@ public class EntityWhereString extends EntityCondition { this.sqlString = null; } + @Override public String makeWhereString(ModelEntity modelEntity, List entityConditionParams, DatasourceInfo datasourceInfo) { return sqlString; } + @Override public void checkCondition(ModelEntity modelEntity) throws GenericModelException {// no nothing, this is always assumed to be fine... could do funky SQL syntax checking, but hey this is a HACK anyway } + @Override public boolean entityMatches(GenericEntity entity) { throw new UnsupportedOperationException("Cannot do entityMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString); } + @Override public boolean mapMatches(GenericDelegator delegator, Map map) { throw new UnsupportedOperationException("Cannot do mapMatches on a WhereString, ie no SQL evaluation in EE; Where String is: " + sqlString); } @@ -84,24 +90,29 @@ public class EntityWhereString extends EntityCondition { return sqlString; } + @Override public EntityCondition freeze() { return this; } + @Override public void encryptConditionFields(ModelEntity modelEntity, GenericDelegator delegator) { // nothing to do here... } + @Override public void visit(EntityConditionVisitor visitor) { visitor.acceptEntityWhereString(this); } + @Override public boolean equals(Object obj) { if (!(obj instanceof EntityWhereString)) return false; EntityWhereString other = (EntityWhereString) obj; return equals(sqlString, other.sqlString); } + @Override public int hashCode() { return hashCode(sqlString); } diff --git a/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java b/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java index 964ce6b6f6..6e4d136465 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java +++ b/framework/entity/src/org/ofbiz/entity/condition/OrderByItem.java @@ -156,6 +156,7 @@ public class OrderByItem implements Comparator { sb.append(descending ? " DESC" : " ASC"); } + @Override public boolean equals(java.lang.Object obj) { if (!(obj instanceof OrderByItem)) return false; OrderByItem that = (OrderByItem) obj; @@ -163,6 +164,7 @@ public class OrderByItem implements Comparator { return getValue().equals(that.getValue()) && getDescending() == that.getDescending(); } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append(getValue()); diff --git a/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java b/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java index bcd24296f3..3fe9a0fcc2 100644 --- a/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java +++ b/framework/entity/src/org/ofbiz/entity/condition/OrderByList.java @@ -104,12 +104,14 @@ public class OrderByList implements Comparator { return result; } + @Override public boolean equals(java.lang.Object obj) { if (!(obj instanceof OrderByList)) return false; OrderByList that = (OrderByList) obj; return orderByList.equals(that.orderByList); } + @Override public String toString() { return makeOrderByString(null, false, null); } diff --git a/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java b/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java index 9691700899..36eac73b3d 100644 --- a/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java +++ b/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java @@ -114,6 +114,7 @@ public abstract class ListFinder extends Finder { } } + @Override public void runFind(Map context, GenericDelegator delegator) throws GeneralException { String entityName = this.entityNameExdr.expandString(context); String useCacheStr = this.useCacheStrExdr.expandString(context); diff --git a/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java b/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java index 33d18510ef..73bb48285b 100644 --- a/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java +++ b/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java @@ -65,6 +65,7 @@ public class PrimaryKeyFinder extends Finder { selectFieldExpanderList = EntityFinderUtil.makeSelectFieldExpanderList(entityOneElement); } + @Override public void runFind(Map context, GenericDelegator delegator) throws GeneralException { String entityName = this.entityNameExdr.expandString(context); diff --git a/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java b/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java index b95ce1f2ed..6336fd6ad5 100644 --- a/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java +++ b/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java @@ -3324,6 +3324,7 @@ public class DatabaseUtil { /** Comma separated list of column names in the primary tables foreign keys */ public String fkColumnName; + @Override public String toString() { return "FK Reference from table " + fkTableName + " called " + fkName + " to PK in table " + pkTableName; } diff --git a/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java b/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java index a5f8ef457d..62a40b957c 100644 --- a/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java +++ b/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java @@ -824,6 +824,7 @@ public class SQLProcessor { _ind++; } + @Override protected void finalize() throws Throwable { try { this.close(); diff --git a/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java b/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java index 211519a15c..70e663f976 100644 --- a/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java +++ b/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java @@ -470,6 +470,7 @@ public class ModelEntity extends ModelInfo implements Comparable, S /** * @deprecated */ + @Deprecated public ModelField getPk(int index) { return this.pks.get(index); } @@ -489,6 +490,7 @@ public class ModelEntity extends ModelInfo implements Comparable, S /** * @deprecated Use getPkFieldsUnmodifiable instead. */ + @Deprecated public List getPksCopy() { List newList = FastList.newInstance(); newList.addAll(this.pks); @@ -515,6 +517,7 @@ public class ModelEntity extends ModelInfo implements Comparable, S /** * @deprecated */ + @Deprecated public ModelField getNopk(int index) { return this.nopks.get(index); } @@ -536,6 +539,7 @@ public class ModelEntity extends ModelInfo implements Comparable, S /** * @deprecated */ + @Deprecated public ModelField getField(int index) { return this.fields.get(index); } @@ -547,6 +551,7 @@ public class ModelEntity extends ModelInfo implements Comparable, S /** * @deprecated Use getFieldsUnmodifiable instead. */ + @Deprecated public List getFieldsCopy() { List newList = FastList.newInstance(); newList.addAll(this.fields); @@ -1340,6 +1345,7 @@ public class ModelEntity extends ModelInfo implements Comparable, S this.noAutoStamp = noAutoStamp; } + @Override public String toString() { return "ModelEntity[" + getEntityName() + "]"; } diff --git a/framework/entity/src/org/ofbiz/entity/model/ModelField.java b/framework/entity/src/org/ofbiz/entity/model/ModelField.java index b8b6ebbdf1..f055bce19e 100644 --- a/framework/entity/src/org/ofbiz/entity/model/ModelField.java +++ b/framework/entity/src/org/ofbiz/entity/model/ModelField.java @@ -181,16 +181,19 @@ public class ModelField extends ModelChild { return this.validators.remove(index); } + @Override public boolean equals(Object obj) { if (obj.getClass() != getClass()) return false; ModelField other = (ModelField) obj; return other.getName().equals(getName()) && other.getModelEntity() == getModelEntity(); } + @Override public int hashCode() { return getModelEntity().hashCode() ^ getName().hashCode(); } + @Override public String toString() { return getModelEntity() + "@" + getName(); } diff --git a/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java b/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java index c94e6d5f87..ff4725ed49 100644 --- a/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java +++ b/framework/entity/src/org/ofbiz/entity/model/ModelIndex.java @@ -90,11 +90,13 @@ public class ModelIndex extends ModelChild { /** @deprecated * the main entity of this relation */ + @Deprecated public ModelEntity getMainEntity() { return getModelEntity(); } /** @deprecated */ + @Deprecated public void setMainEntity(ModelEntity mainEntity) { setModelEntity(mainEntity); } diff --git a/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java b/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java index 9127da93e7..bc13f7f493 100644 --- a/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java +++ b/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java @@ -57,10 +57,15 @@ public class ModelInfo { } public static final ModelInfo DEFAULT = new ModelInfo() { + @Override public String getTitle() { return "None"; } + @Override public String getAuthor() { return "None"; } + @Override public String getCopyright() { return "Copyright 2001-2009 The Apache Software Foundation"; } + @Override public String getVersion() { return "1.0"; } + @Override public String getDescription() { return "None"; } }; diff --git a/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java b/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java index 675cd46d55..700498aac5 100644 --- a/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java +++ b/framework/entity/src/org/ofbiz/entity/model/ModelKeyMap.java @@ -87,10 +87,12 @@ public class ModelKeyMap implements java.io.Serializable { return UtilMisc.toList(new ModelKeyMap(fieldName1, relFieldName1), new ModelKeyMap(fieldName2, relFieldName2), new ModelKeyMap(fieldName3, relFieldName3)); } + @Override public int hashCode() { return this.fieldName.hashCode() + this.relFieldName.hashCode(); } + @Override public boolean equals(Object other) { if (!(other instanceof ModelKeyMap)) return false; ModelKeyMap otherKeyMap = (ModelKeyMap) other; diff --git a/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java b/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java index 1b2aba53fd..a7453a8e2a 100644 --- a/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java +++ b/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java @@ -149,11 +149,13 @@ public class ModelRelation extends ModelChild { /** @deprecated * the main entity of this relation */ + @Deprecated public ModelEntity getMainEntity() { return getModelEntity(); } /** @deprecated */ + @Deprecated public void setMainEntity(ModelEntity mainEntity) { setModelEntity(mainEntity); } @@ -275,6 +277,7 @@ public class ModelRelation extends ModelChild { } // FIXME: CCE + @Override public boolean equals(Object other) { ModelRelation otherRel = (ModelRelation) other; diff --git a/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java b/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java index 69007f1a22..5e71109a6c 100644 --- a/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java +++ b/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java @@ -196,6 +196,7 @@ public class ModelViewEntity extends ModelEntity { } /** The col-name of the Field, the alias of the field if this is on a view-entity */ + @Override public String getColNameOrAlias(String fieldName) { ModelField modelField = this.getField(fieldName); String fieldString = modelField.getColName(); @@ -281,10 +282,12 @@ public class ModelViewEntity extends ModelEntity { return this.byConditionFinder; } + @Override public String colNameString(String separator, String afterLast, boolean alias, ModelField... flds) { return colNameString(Arrays.asList(flds), separator, afterLast, alias); } + @Override public String colNameString(List flds, String separator, String afterLast, boolean alias) { StringBuilder returnString = new StringBuilder(); @@ -659,6 +662,7 @@ public class ModelViewEntity extends ModelEntity { } } + @Override public String toString() { return "ModelViewEntity[" + getEntityName() + "]"; } @@ -1031,10 +1035,12 @@ public class ModelViewEntity extends ModelEntity { } } + @Override public int hashCode() { return fromModelEntity.hashCode(); } + @Override public boolean equals(Object obj) { if (!(obj instanceof ModelConversion)) return false; ModelConversion other = (ModelConversion) obj; @@ -1046,6 +1052,7 @@ public class ModelViewEntity extends ModelEntity { fieldMap.put(fromFieldName, toFieldName); } + @Override public String toString() { //return fromModelEntity.getEntityName() + ":" + fieldMap + ":" + wildcards; return aliasName + "(" + fromModelEntity.getEntityName() + ")"; diff --git a/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java b/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java index f2e4a067d0..9c7867bbed 100644 --- a/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java +++ b/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java @@ -36,16 +36,19 @@ public class DebugXaResource extends GenericXaResource { this.ex = new Exception(); } + @Override public void commit(Xid xid, boolean onePhase) throws XAException { TransactionUtil.debugResMap.remove(xid); if (Debug.verboseOn()) Debug.logVerbose("Xid : " + xid.toString() + " cleared [commit]", module); } + @Override public void rollback(Xid xid) throws XAException { TransactionUtil.debugResMap.remove(xid); if (Debug.verboseOn()) Debug.logVerbose("Xid : " + xid.toString() + " cleared [rollback]", module); } + @Override public void enlist() throws XAException { super.enlist(); TransactionUtil.debugResMap.put(xid, this); diff --git a/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java b/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java index 089758e4a5..33924ea8f3 100644 --- a/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java +++ b/framework/entity/src/org/ofbiz/entity/transaction/GenericXaResource.java @@ -198,6 +198,7 @@ public abstract class GenericXaResource extends Thread implements XAResource { } // thread run method + @Override public void run() { try { if (timeout != null) { diff --git a/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java b/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java index 783b0fe8b0..d512fe881a 100644 --- a/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java +++ b/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java @@ -252,6 +252,7 @@ public class TransactionUtil implements Status { } /** @deprecated */ + @Deprecated public static void rollback(boolean beganTransaction) throws GenericTransactionException { Debug.logWarning("WARNING: called rollback without debug/error info; it is recommended to always pass this to make otherwise tricky bugs much easier to track down.", module); rollback(beganTransaction, null, null); @@ -757,6 +758,7 @@ public class TransactionUtil implements Status { * Maintain the suspended transactions together with their timestamps */ private static ThreadLocal> suspendedTxStartStamps = new ThreadLocal>() { + @Override public Map initialValue() { return UtilGenerics.checkMap(new ListOrderedMap()); } diff --git a/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java b/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java index fe2a8038b2..699b50c99d 100644 --- a/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java +++ b/framework/entity/src/org/ofbiz/entity/util/ByteWrapper.java @@ -27,6 +27,7 @@ import java.io.Serializable; * * A very simple class to wrap a byte array for persistence. */ +@Deprecated public class ByteWrapper implements Serializable { protected byte[] bytes; diff --git a/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java b/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java index 0470b9356c..d05c64eb2d 100644 --- a/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java +++ b/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java @@ -510,6 +510,7 @@ public class EntityListIterator implements ListIterator { throw new GeneralRuntimeException("CursorListIterator currently only supports read-only access"); } + @Override protected void finalize() throws Throwable { try { if (!closed) { diff --git a/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java b/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java index 81341b6ddd..79f4f83b12 100644 --- a/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java +++ b/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaCondition.java @@ -100,6 +100,7 @@ public class EntityEcaCondition implements java.io.Serializable { } } + @Override public String toString() { StringBuilder buf = new StringBuilder(); buf.append("[").append(lhsValueName).append("]"); diff --git a/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java b/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java index e299cb63d8..544e4c03d0 100644 --- a/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java +++ b/framework/entityext/src/org/ofbiz/entityext/synchronization/EntitySyncContext.java @@ -1117,6 +1117,7 @@ public class EntitySyncContext { public SyncOtherErrorException(String str, Throwable nested) { super(str, nested); } public SyncOtherErrorException(Throwable nested) { super(nested); } public SyncOtherErrorException(String str, List errorMsgList, Map errorMsgMap, Map nestedServiceResult, Throwable nested) { super(str, errorMsgList, errorMsgMap, nestedServiceResult, nested); } + @Override public void saveSyncErrorInfo(EntitySyncContext esc) { if (esc != null) { List errorList = FastList.newInstance(); @@ -1133,6 +1134,7 @@ public class EntitySyncContext { public SyncDataErrorException(String str, Throwable nested) { super(str, nested); } public SyncDataErrorException(Throwable nested) { super(nested); } public SyncDataErrorException(String str, List errorMsgList, Map errorMsgMap, Map nestedServiceResult, Throwable nested) { super(str, errorMsgList, errorMsgMap, nestedServiceResult, nested); } + @Override public void saveSyncErrorInfo(EntitySyncContext esc) { if (esc != null) { List errorList = FastList.newInstance(); @@ -1149,6 +1151,7 @@ public class EntitySyncContext { public SyncServiceErrorException(String str, Throwable nested) { super(str, nested); } public SyncServiceErrorException(Throwable nested) { super(nested); } public SyncServiceErrorException(String str, List errorMsgList, Map errorMsgMap, Map nestedServiceResult, Throwable nested) { super(str, errorMsgList, errorMsgMap, nestedServiceResult, nested); } + @Override public void saveSyncErrorInfo(EntitySyncContext esc) { if (esc != null) { List errorList = FastList.newInstance(); diff --git a/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java b/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java index 68b292c6ac..e9a564f8f9 100644 --- a/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java +++ b/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java @@ -45,6 +45,7 @@ public class SimpleMethodBsfEngine extends BSFEngineImpl { protected Map context = FastMap.newInstance(); + @Override public void initialize(BSFManager mgr, String lang, Vector declaredBeans) throws BSFException { super.initialize(mgr, lang, declaredBeans); @@ -77,6 +78,7 @@ public class SimpleMethodBsfEngine extends BSFEngineImpl { * It exectutes the funcBody text in an "anonymous" method call with * arguments. */ + @Override public Object apply(String source, int lineNo, int columnNo, Object funcBody, Vector namesVec, Vector argsVec) throws BSFException { //if (namesVec.size() != argsVec.size()) throw new BSFException("number of params/names mismatch"); //if (!(funcBody instanceof String)) throw new BSFException("apply: function body must be a string"); @@ -107,6 +109,7 @@ public class SimpleMethodBsfEngine extends BSFEngineImpl { } + @Override public void exec(String source, int lineNo, int columnNo, Object script) throws BSFException { eval(source, lineNo, columnNo, script); } @@ -124,14 +127,17 @@ public class SimpleMethodBsfEngine extends BSFEngineImpl { Object script, CodeBuffer cb) throws BSFException; */ + @Override public void declareBean(BSFDeclaredBean bean) throws BSFException { context.put(bean.name, bean.bean); } + @Override public void undeclareBean(BSFDeclaredBean bean) throws BSFException { context.remove(bean.name); } + @Override public void terminate() { } private String sourceInfo(String source, int lineNo, int columnNo) { diff --git a/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java b/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java index e0a07a2332..32cb8e6d01 100644 --- a/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java +++ b/framework/minilang/src/org/ofbiz/minilang/SimpleServiceEngine.java @@ -39,6 +39,7 @@ public final class SimpleServiceEngine extends GenericAsyncEngine { /** Run the service synchronously and IGNORE the result * @param context Map of name, value pairs composing the context */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { Map result = runSync(localName, modelService, context); } @@ -47,6 +48,7 @@ public final class SimpleServiceEngine extends GenericAsyncEngine { * @param context Map of name, value pairs composing the context * @return Map of name, value pairs composing the result */ + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { Map result = serviceInvoker(localName, modelService, context); if (result == null) diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java b/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java index ecb9dcd5d5..a529abd4fa 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ContextAccessor.java @@ -95,11 +95,13 @@ public class ContextAccessor { } /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key */ + @Override public int hashCode() { return this.name.hashCode(); } /** The equals and hashCode methods are imnplemented just case this object is ever accidently used as a Map key */ + @Override public boolean equals(Object obj) { if (obj instanceof ContextAccessor) { ContextAccessor contextAccessor = (ContextAccessor) obj; @@ -117,6 +119,7 @@ public class ContextAccessor { } /** To be used for a string representation of the accessor, returns the original name. */ + @Override public String toString() { return this.name; } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java b/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java index 247afd9774..bd03c1b31e 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/FieldObject.java @@ -48,10 +48,12 @@ public class FieldObject extends MethodObject { } /** Get the name for the type of the object */ + @Override public String getTypeName() { return type; } + @Override public Class getTypeClass(ClassLoader loader) { try { return UtilGenerics.cast(ObjectType.loadClass(type, loader)); @@ -61,6 +63,7 @@ public class FieldObject extends MethodObject { } } + @Override public T getObject(MethodContext methodContext) { T fieldVal = null; diff --git a/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java b/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java index d36374e74b..4c8ebf2274 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/FieldString.java @@ -40,6 +40,7 @@ public class FieldString extends MethodString { mapAcsr = new ContextAccessor>(element.getAttribute("map-name")); } + @Override public String getString(MethodContext methodContext) { Object fieldVal = null; if (!mapAcsr.isEmpty()) { diff --git a/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java b/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java index 3ca296bfc9..97139fba74 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/StringObject.java @@ -38,14 +38,17 @@ public class StringObject extends MethodObject { } /** Get the name for the type of the object */ + @Override public String getTypeName() { return "java.lang.String"; } + @Override public Class getTypeClass(ClassLoader loader) { return java.lang.String.class; } + @Override public String getObject(MethodContext methodContext) { String value = methodContext.expandString(this.value); String cdataValue = methodContext.expandString(this.cdataValue); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/StringString.java b/framework/minilang/src/org/ofbiz/minilang/method/StringString.java index 92b6b3d8dd..db2872e0ec 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/StringString.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/StringString.java @@ -36,6 +36,7 @@ public class StringString extends MethodString { cdataValue = UtilXml.elementValue(element); } + @Override public String getString(MethodContext methodContext) { String value = methodContext.expandString(this.value); String cdataValue = methodContext.expandString(this.cdataValue); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java index 47eba843e9..bc16ce35ab 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java @@ -63,6 +63,7 @@ public class AddError extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { List messages = errorListAcsr.get(methodContext); @@ -98,10 +99,12 @@ public class AddError extends MethodOperation { } } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java index 80dbd845c4..72a98fcd1b 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallBsh.java @@ -62,6 +62,7 @@ public class CallBsh extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { List messages = errorListAcsr.get(methodContext); @@ -128,10 +129,12 @@ public class CallBsh extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java index 98b865e824..352d5ed4a1 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallClassMethod.java @@ -82,6 +82,7 @@ public class CallClassMethod extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { String className = methodContext.expandString(this.className); String methodName = methodContext.expandString(this.methodName); @@ -100,10 +101,12 @@ public class CallClassMethod extends MethodOperation { return CallObjectMethod.callMethod(simpleMethod, methodContext, parameters, methodClass, null, methodName, retFieldAcsr, retMapAcsr); } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java index a02c5d05b9..357f98ff05 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallObjectMethod.java @@ -88,6 +88,7 @@ public class CallObjectMethod extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { String methodName = methodContext.expandString(this.methodName); @@ -195,10 +196,12 @@ public class CallObjectMethod extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java index 297c1352e7..df0017c29d 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallService.java @@ -179,6 +179,7 @@ public class CallService extends MethodOperation { return this.serviceName; } + @Override public boolean exec(MethodContext methodContext) { boolean includeUserLogin = !"false".equals(methodContext.expandString(includeUserLoginStr)); boolean breakOnError = !"false".equals(methodContext.expandString(breakOnErrorStr)); @@ -357,10 +358,12 @@ public class CallService extends MethodOperation { } } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java index 50d2250626..0b24766286 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallServiceAsynch.java @@ -59,6 +59,7 @@ public class CallServiceAsynch extends MethodOperation { includeUserLoginStr = element.getAttribute("include-user-login"); } + @Override public boolean exec(MethodContext methodContext) { String serviceName = methodContext.expandString(this.serviceName); boolean includeUserLogin = !"false".equals(methodContext.expandString(includeUserLoginStr)); @@ -113,10 +114,12 @@ public class CallServiceAsynch extends MethodOperation { return this.serviceName; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java index 421b1f16c4..e3759bfda9 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMapProcessor.java @@ -65,6 +65,7 @@ public class CallSimpleMapProcessor extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { List messages = errorListAcsr.get(methodContext); if (messages == null) { @@ -108,10 +109,12 @@ public class CallSimpleMapProcessor extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java index 01692e39fa..809e89cd1f 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CallSimpleMethod.java @@ -60,6 +60,7 @@ public class CallSimpleMethod extends MethodOperation { return this.methodName; } + @Override public boolean exec(MethodContext methodContext) { if (this.methodName != null && this.methodName.length() > 0) { String methodName = methodContext.expandString(this.methodName); @@ -129,9 +130,11 @@ public class CallSimpleMethod extends MethodOperation { return simpleMethodToCall; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java index fa58415e79..799473ba4a 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CheckErrors.java @@ -63,6 +63,7 @@ public class CheckErrors extends MethodOperation { messageSuffix = new FlexibleMessage(UtilXml.firstChildElement(element, "message-suffix"), "check.message.suffix"); } + @Override public boolean exec(MethodContext methodContext) { List messages = errorListAcsr.get(methodContext); @@ -92,10 +93,12 @@ public class CheckErrors extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java index 0f825b8b6c..5b39eab87e 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/CreateObject.java @@ -81,6 +81,7 @@ public class CreateObject extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { String className = methodContext.expandString(this.className); @@ -180,10 +181,12 @@ public class CreateObject extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java index 99d0fc162c..4504122d69 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/Return.java @@ -46,6 +46,7 @@ public class Return extends MethodOperation { responseCode = "success"; } + @Override public boolean exec(MethodContext methodContext) { String responseCode = methodContext.expandString(this.responseCode); @@ -60,10 +61,12 @@ public class Return extends MethodOperation { } } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java b/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java index 9346341efe..85d81bfe66 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/callops/SetServiceFields.java @@ -69,6 +69,7 @@ public class SetServiceFields extends MethodOperation { errorListAcsr = new ContextAccessor>(element.getAttribute("error-list-name"), "error_list"); } + @Override public boolean exec(MethodContext methodContext) { List messages = errorListAcsr.get(methodContext); if (messages == null) { @@ -127,10 +128,12 @@ public class SetServiceFields extends MethodOperation { return this.serviceName; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java index 34969f78fe..2da2a05cac 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/Assert.java @@ -65,6 +65,7 @@ public class Assert extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { List messages = errorListAcsr.get(methodContext); if (messages == null) { @@ -96,10 +97,12 @@ public class Assert extends MethodOperation { return true; } + @Override public String rawString() { return expandedString(null); } + @Override public String expandedString(MethodContext methodContext) { String title = this.titleExdr.expandString(methodContext.getEnvMap()); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java index 90558c568d..5b47886916 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/CombinedCondition.java @@ -30,40 +30,48 @@ import org.ofbiz.minilang.method.*; */ public class CombinedCondition implements Conditional { public static final class OrConditionFactory extends ConditionalFactory { + @Override public CombinedCondition createCondition(Element element, SimpleMethod simpleMethod) { return new CombinedCondition(element, OR, simpleMethod); } + @Override public String getName() { return "or"; } } public static final class XorConditionFactory extends ConditionalFactory { + @Override public CombinedCondition createCondition(Element element, SimpleMethod simpleMethod) { return new CombinedCondition(element, XOR, simpleMethod); } + @Override public String getName() { return "xor"; } } public static final class AndConditionFactory extends ConditionalFactory { + @Override public CombinedCondition createCondition(Element element, SimpleMethod simpleMethod) { return new CombinedCondition(element, AND, simpleMethod); } + @Override public String getName() { return "and"; } } public static final class NotConditionFactory extends ConditionalFactory { + @Override public CombinedCondition createCondition(Element element, SimpleMethod simpleMethod) { return new CombinedCondition(element, NOT, simpleMethod); } + @Override public String getName() { return "not"; } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java index 7d15cc61e6..8b02d9a100 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareCondition.java @@ -32,10 +32,12 @@ import org.ofbiz.minilang.operation.*; */ public class CompareCondition implements Conditional { public static final class CompareConditionFactory extends ConditionalFactory { + @Override public CompareCondition createCondition(Element element, SimpleMethod simpleMethod) { return new CompareCondition(element, simpleMethod); } + @Override public String getName() { return "if-compare"; } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java index d6a37a55f4..9ee9013102 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/CompareFieldCondition.java @@ -31,10 +31,12 @@ import org.ofbiz.minilang.operation.*; */ public class CompareFieldCondition implements Conditional { public static final class CompareFieldConditionFactory extends ConditionalFactory { + @Override public CompareFieldCondition createCondition(Element element, SimpleMethod simpleMethod) { return new CompareFieldCondition(element, simpleMethod); } + @Override public String getName() { return "if-compare-field"; } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java index 5d78f95667..48e1c170e1 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/EmptyCondition.java @@ -29,10 +29,12 @@ import org.ofbiz.minilang.method.*; */ public class EmptyCondition implements Conditional { public static final class EmptyConditionFactory extends ConditionalFactory { + @Override public EmptyCondition createCondition(Element element, SimpleMethod simpleMethod) { return new EmptyCondition(element, simpleMethod); } + @Override public String getName() { return "if-empty"; } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java index 4ad6c2cc9e..f5e3d4f8af 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/HasPermissionCondition.java @@ -31,10 +31,12 @@ import org.w3c.dom.Element; */ public class HasPermissionCondition implements Conditional { public static final class HasPermissionConditionFactory extends ConditionalFactory { + @Override public HasPermissionCondition createCondition(Element element, SimpleMethod simpleMethod) { return new HasPermissionCondition(element, simpleMethod); } + @Override public String getName() { return "if-has-permission"; } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java index 5dd57c2433..29077000f0 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/MasterIf.java @@ -73,6 +73,7 @@ public class MasterIf extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -114,10 +115,12 @@ public class MasterIf extends MethodOperation { return allSubOps; } + @Override public String rawString() { return expandedString(null); } + @Override public String expandedString(MethodContext methodContext) { // TODO: fill in missing details, if needed StringBuilder messageBuf = new StringBuilder(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java index c1b3e0f5f8..af649e7ffe 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/RegexpCondition.java @@ -44,10 +44,12 @@ import org.w3c.dom.Element; */ public class RegexpCondition implements Conditional { public static final class RegexpConditionFactory extends ConditionalFactory { + @Override public RegexpCondition createCondition(Element element, SimpleMethod simpleMethod) { return new RegexpCondition(element, simpleMethod); } + @Override public String getName() { return "if-regexp"; } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java index 0807fcd220..0ac5a442a4 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/ValidateMethodCondition.java @@ -30,10 +30,12 @@ import org.ofbiz.minilang.method.*; */ public class ValidateMethodCondition implements Conditional { public static final class ValidateMethodConditionFactory extends ConditionalFactory { + @Override public ValidateMethodCondition createCondition(Element element, SimpleMethod simpleMethod) { return new ValidateMethodCondition(element); } + @Override public String getName() { return "if-validate-method"; } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java b/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java index bf994f7de4..0bd112529e 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/conditional/While.java @@ -58,6 +58,7 @@ public class While extends MethodOperation { SimpleMethod.readOperations(thenElement, thenSubOps, simpleMethod); } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; // if a sub-op returns false return false and stop, otherwise drop though loop and return true @@ -74,10 +75,12 @@ public class While extends MethodOperation { return this.thenSubOps; } + @Override public String rawString() { return expandedString(null); } + @Override public String expandedString(MethodContext methodContext) { // TODO: fill in missing details, if needed StringBuilder messageBuf = new StringBuilder(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java index 17d01b9c3f..6a6a72f269 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java @@ -51,6 +51,7 @@ public class ClearCacheLine extends MethodOperation { mapAcsr = new ContextAccessor>(element.getAttribute("map"), element.getAttribute("map-name")); } + @Override public boolean exec(MethodContext methodContext) { String entityName = methodContext.expandString(this.entityName); @@ -67,10 +68,12 @@ public class ClearCacheLine extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java index 098f0a4f7a..df81519925 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java @@ -41,15 +41,18 @@ public class ClearEntityCaches extends MethodOperation { super(element, simpleMethod); } + @Override public boolean exec(MethodContext methodContext) { methodContext.getDelegator().clearAllCaches(); return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java index 96c9a266e8..beb9855708 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/CloneValue.java @@ -51,6 +51,7 @@ public class CloneValue extends MethodOperation { newValueAcsr = new ContextAccessor(element.getAttribute("new-value-field"), element.getAttribute("new-value-name")); } + @Override public boolean exec(MethodContext methodContext) { GenericValue value = valueAcsr.get(methodContext); if (value == null) { @@ -62,10 +63,12 @@ public class CloneValue extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java index 618443cac9..22dc296175 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java @@ -55,6 +55,7 @@ public class CreateValue extends MethodOperation { createOrStore = "true".equals(element.getAttribute("or-store")); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -93,10 +94,12 @@ public class CreateValue extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java index 986827f5bf..a6e6d4d4be 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java @@ -50,6 +50,7 @@ public class EntityAnd extends MethodOperation { this.finder = new ByAndFinder(element); } + @Override public boolean exec(MethodContext methodContext) { try { GenericDelegator delegator = methodContext.getDelegator(); @@ -74,10 +75,12 @@ public class EntityAnd extends MethodOperation { return this.finder.getEntityName(); } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java index daf111662b..6911428042 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java @@ -50,6 +50,7 @@ public class EntityCondition extends MethodOperation { this.finder = new ByConditionFinder(element); } + @Override public boolean exec(MethodContext methodContext) { try { GenericDelegator delegator = methodContext.getDelegator(); @@ -74,10 +75,12 @@ public class EntityCondition extends MethodOperation { return this.finder.getEntityName(); } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java index 9bd5d44dae..5cf3029160 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java @@ -92,6 +92,7 @@ public class EntityCount extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { try { Map context = methodContext.getEnvMap(); @@ -143,10 +144,12 @@ public class EntityCount extends MethodOperation { return entName; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java index 3f44e4e397..12560fdee7 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java @@ -73,6 +73,7 @@ public class EntityData extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { List messages = errorListAcsr.get(methodContext); if (messages == null) { @@ -136,10 +137,12 @@ public class EntityData extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java index 76e89a8596..8a97ec264f 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java @@ -50,6 +50,7 @@ public class EntityOne extends MethodOperation { this.finder = new PrimaryKeyFinder(element); } + @Override public boolean exec(MethodContext methodContext) { try { GenericDelegator delegator = methodContext.getDelegator(); @@ -74,10 +75,12 @@ public class EntityOne extends MethodOperation { return this.finder.getEntityName(); } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java index 3ff50d80da..a541c0cb82 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByAnd.java @@ -57,6 +57,7 @@ public class FilterListByAnd extends MethodOperation { mapAcsr = new ContextAccessor>(element.getAttribute("map"), element.getAttribute("map-name")); } + @Override public boolean exec(MethodContext methodContext) { Map theMap = null; @@ -67,10 +68,12 @@ public class FilterListByAnd extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java index 7f89f8a2da..32bc521ea7 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java @@ -69,6 +69,7 @@ public class FilterListByDate extends MethodOperation { allSameStr = element.getAttribute("all-same"); } + @Override public boolean exec(MethodContext methodContext) { if (!validDateAcsr.isEmpty()) { @@ -79,10 +80,12 @@ public class FilterListByDate extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java index 41329e4622..36f2083f09 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java @@ -70,6 +70,7 @@ public class FindByAnd extends MethodOperation { useIteratorStr = element.getAttribute("use-iterator"); } + @Override public boolean exec(MethodContext methodContext) { String entityName = methodContext.expandString(this.entityName); String delegatorName = methodContext.expandString(this.delegatorName); @@ -123,10 +124,12 @@ public class FindByAnd extends MethodOperation { return this.entityName; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java index bc013169da..12fc9f63b5 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java @@ -68,6 +68,7 @@ public class FindByPrimaryKey extends MethodOperation { useCacheStr = element.getAttribute("use-cache"); } + @Override public boolean exec(MethodContext methodContext) { String entityName = methodContext.expandString(this.entityName); String delegatorName = methodContext.expandString(this.delegatorName); @@ -110,10 +111,12 @@ public class FindByPrimaryKey extends MethodOperation { return this.entityName; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java index e9d5ebdbab..ae71a3ccd4 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelated.java @@ -64,6 +64,7 @@ public class GetRelated extends MethodOperation { useCacheStr = element.getAttribute("use-cache"); } + @Override public boolean exec(MethodContext methodContext) { String relationName = methodContext.expandString(this.relationName); String useCacheStr = methodContext.expandString(this.useCacheStr); @@ -101,10 +102,12 @@ public class GetRelated extends MethodOperation { public String getRelationName() { return this.relationName; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java index c28c100b23..8d0d6c9fbf 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java @@ -56,6 +56,7 @@ public class GetRelatedOne extends MethodOperation { useCacheStr = element.getAttribute("use-cache"); } + @Override public boolean exec(MethodContext methodContext) { String relationName = methodContext.expandString(this.relationName); String useCacheStr = methodContext.expandString(this.useCacheStr); @@ -91,10 +92,12 @@ public class GetRelatedOne extends MethodOperation { public String getRelationName() { return this.relationName; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java index add2b90c81..7d39a4ef90 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java @@ -57,6 +57,7 @@ public class MakeNextSeqId extends MethodOperation { incrementByStr = element.getAttribute("increment-by"); } + @Override public boolean exec(MethodContext methodContext) { String seqFieldName = methodContext.expandString(this.seqFieldName); String numericPaddingStr = methodContext.expandString(this.numericPaddingStr); @@ -84,10 +85,12 @@ public class MakeNextSeqId extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java index 5f1a5a1d56..49302c34e6 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java @@ -50,6 +50,7 @@ public class MakeValue extends MethodOperation { mapAcsr = new ContextAccessor>(element.getAttribute("map"), element.getAttribute("map-name")); } + @Override public boolean exec(MethodContext methodContext) { String entityName = methodContext.expandString(this.entityName); Map ctxMap = (mapAcsr.isEmpty() ? null : mapAcsr.get(methodContext)); @@ -61,10 +62,12 @@ public class MakeValue extends MethodOperation { return this.entityName; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java index 0116b020bb..e2159d8bcc 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowDateToEnv.java @@ -53,15 +53,18 @@ public class NowDateToEnv extends MethodOperation { envAcsr = new ContextAccessor(element.getAttribute("field"), element.getAttribute("env-name")); } + @Override public boolean exec(MethodContext methodContext) { envAcsr.put(methodContext, new java.sql.Date(System.currentTimeMillis())); return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java index 9e4b659de6..de80fc2192 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/NowTimestampToEnv.java @@ -53,15 +53,18 @@ public class NowTimestampToEnv extends MethodOperation { envAcsr = new ContextAccessor(element.getAttribute("field"), element.getAttribute("env-name")); } + @Override public boolean exec(MethodContext methodContext) { envAcsr.put(methodContext, new java.sql.Timestamp(System.currentTimeMillis())); return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java index 24607ae6da..7ce58d7daa 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/OrderValueList.java @@ -56,6 +56,7 @@ public class OrderValueList extends MethodOperation { orderByListAcsr = new ContextAccessor>(element.getAttribute("order-by-list-name")); } + @Override public boolean exec(MethodContext methodContext) { List orderByList = null; @@ -66,10 +67,12 @@ public class OrderValueList extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java index 364f523b5e..d758e77db9 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java @@ -52,6 +52,7 @@ public class RefreshValue extends MethodOperation { doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -74,10 +75,12 @@ public class RefreshValue extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java index e94dd21274..9fde2b68da 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java @@ -55,6 +55,7 @@ public class RemoveByAnd extends MethodOperation { doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(doCacheClearStr); String entityName = methodContext.expandString(this.entityName); @@ -77,10 +78,12 @@ public class RemoveByAnd extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java index 54dc705bba..daf5c8d653 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java @@ -54,6 +54,7 @@ public class RemoveList extends MethodOperation { doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(doCacheClearStr); @@ -90,10 +91,12 @@ public class RemoveList extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java index 2dacc411a0..e1474651ff 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java @@ -54,6 +54,7 @@ public class RemoveRelated extends MethodOperation { doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(doCacheClearStr); String relationName = methodContext.expandString(this.relationName); @@ -91,10 +92,12 @@ public class RemoveRelated extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java index 633d4c567b..58a86f127e 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java @@ -52,6 +52,7 @@ public class RemoveValue extends MethodOperation { doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -74,10 +75,12 @@ public class RemoveValue extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java index bbbbf38bee..aa8f6a4899 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java @@ -73,6 +73,7 @@ public class SequencedIdToEnv extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { String seqName = methodContext.expandString(this.seqName); if (getLongOnly) { @@ -83,10 +84,12 @@ public class SequencedIdToEnv extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java index a7c0d2d084..8c5449f18e 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetCurrentUserLogin.java @@ -49,6 +49,7 @@ public class SetCurrentUserLogin extends MethodOperation { valueAcsr = new ContextAccessor(element.getAttribute("value-field"), element.getAttribute("value-name")); } + @Override public boolean exec(MethodContext methodContext) { GenericValue userLogin = valueAcsr.get(methodContext); if (userLogin == null) { @@ -60,10 +61,12 @@ public class SetCurrentUserLogin extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java index 26595f705e..735850aeb7 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetNonpkFields.java @@ -55,6 +55,7 @@ public class SetNonpkFields extends MethodOperation { setIfNullStr = element.getAttribute("set-if-null"); } + @Override public boolean exec(MethodContext methodContext) { // if anything but false it will be true boolean setIfNull = !"false".equals(methodContext.expandString(setIfNullStr)); @@ -82,10 +83,12 @@ public class SetNonpkFields extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java index cfe31c14ef..ae1c9a8e75 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/SetPkFields.java @@ -55,6 +55,7 @@ public class SetPkFields extends MethodOperation { setIfNullStr = element.getAttribute("set-if-null"); } + @Override public boolean exec(MethodContext methodContext) { // if anything but false it will be true boolean setIfNull = !"false".equals(methodContext.expandString(setIfNullStr)); @@ -83,10 +84,12 @@ public class SetPkFields extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java index 68de505d44..a646714f7d 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java @@ -54,6 +54,7 @@ public class StoreList extends MethodOperation { doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -81,10 +82,12 @@ public class StoreList extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java index 9b97041a69..99dc0017e8 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java @@ -52,6 +52,7 @@ public class StoreValue extends MethodOperation { doCacheClearStr = element.getAttribute("do-cache-clear"); } + @Override public boolean exec(MethodContext methodContext) { boolean doCacheClear = !"false".equals(methodContext.expandString(doCacheClearStr)); @@ -88,10 +89,12 @@ public class StoreValue extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java index 9c1627d9f1..f8d1c344f2 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionBegin.java @@ -50,6 +50,7 @@ public class TransactionBegin extends MethodOperation { beganTransactionAcsr = new ContextAccessor(element.getAttribute("began-transaction-name"), "beganTransaction"); } + @Override public boolean exec(MethodContext methodContext) { boolean beganTransaction = false; try { @@ -66,10 +67,12 @@ public class TransactionBegin extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java index 97cc0dcea5..b7544ce04f 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionCommit.java @@ -50,6 +50,7 @@ public class TransactionCommit extends MethodOperation { beganTransactionAcsr = new ContextAccessor(element.getAttribute("began-transaction-name"), "beganTransaction"); } + @Override public boolean exec(MethodContext methodContext) { boolean beganTransaction = false; @@ -72,10 +73,12 @@ public class TransactionCommit extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java b/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java index 58ab7e0771..3e6be6209b 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/entityops/TransactionRollback.java @@ -50,6 +50,7 @@ public class TransactionRollback extends MethodOperation { beganTransactionAcsr = new ContextAccessor(element.getAttribute("began-transaction-name"), "beganTransaction"); } + @Override public boolean exec(MethodContext methodContext) { boolean beganTransaction = false; @@ -72,10 +73,12 @@ public class TransactionRollback extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java index 4d6b39c809..91b406bbe3 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/ClearField.java @@ -55,6 +55,7 @@ public class ClearField extends MethodOperation { mapAcsr = new ContextAccessor>(element.getAttribute("map-name")); } + @Override public boolean exec(MethodContext methodContext) { if (!mapAcsr.isEmpty()) { Map toMap = mapAcsr.get(methodContext); @@ -75,9 +76,11 @@ public class ClearField extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java index 9dc2d9e019..91a984a16f 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToEnv.java @@ -51,14 +51,17 @@ public class EnvToEnv extends MethodOperation { toEnvAcsr = new ContextAccessor(element.getAttribute("to-env-name")); } + @Override public boolean exec(MethodContext methodContext) { toEnvAcsr.put(methodContext, envAcsr.get(methodContext)); return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java index 1e967eb49e..eb06acd117 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/EnvToField.java @@ -61,6 +61,7 @@ public class EnvToField extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { Object envVar = envAcsr.get(methodContext); @@ -85,9 +86,11 @@ public class EnvToField extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java index 3a2211b8d9..27d683f8ef 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToEnv.java @@ -63,6 +63,7 @@ public class FieldToEnv extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { Object fieldVal = null; @@ -89,9 +90,11 @@ public class FieldToEnv extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java index a627a5d92e..a49c511389 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToField.java @@ -66,6 +66,7 @@ public class FieldToField extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { Object fieldVal = null; @@ -109,9 +110,11 @@ public class FieldToField extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java index b6b171ff7a..74628b0de1 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/FieldToList.java @@ -55,6 +55,7 @@ public class FieldToList extends MethodOperation { listAcsr = new ContextAccessor>(element.getAttribute("list"), element.getAttribute("list-name")); } + @Override public boolean exec(MethodContext methodContext) { Object fieldVal = null; @@ -89,9 +90,11 @@ public class FieldToList extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java index 2ec91314f3..60ffa75979 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java @@ -50,6 +50,7 @@ public class FirstFromList extends MethodOperation { this.listAcsr = new ContextAccessor>(element.getAttribute("list"), element.getAttribute("list-name")); } + @Override public boolean exec(MethodContext methodContext) { if (listAcsr.isEmpty()) { Debug.logWarning("No list-name specified in iterate tag, doing nothing", module); @@ -67,9 +68,11 @@ public class FirstFromList extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java index 5685b0ecaa..46defc77fc 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java @@ -64,6 +64,7 @@ public class Iterate extends MethodOperation { SimpleMethod.readOperations(element, subOps, simpleMethod); } + @Override public boolean exec(MethodContext methodContext) { if (listAcsr.isEmpty()) { @@ -130,10 +131,12 @@ public class Iterate extends MethodOperation { return this.subOps; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java index f18d1352ad..9a4918ee3f 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java @@ -62,6 +62,7 @@ public class IterateMap extends MethodOperation { SimpleMethod.readOperations(element, subOps, simpleMethod); } + @Override public boolean exec(MethodContext methodContext) { @@ -106,9 +107,11 @@ public class IterateMap extends MethodOperation { return this.subOps; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java index 13a41b545c..d8db09fead 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java @@ -52,6 +52,7 @@ public class ListToList extends MethodOperation { toListAcsr = new ContextAccessor>(element.getAttribute("to-list"), element.getAttribute("to-list-name")); } + @Override public boolean exec(MethodContext methodContext) { List fromList = listAcsr.get(methodContext); List toList = toListAcsr.get(methodContext); @@ -71,10 +72,12 @@ public class ListToList extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java index 67c824ff8d..08dbe0c559 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/Loop.java @@ -58,6 +58,7 @@ public class Loop extends MethodOperation { SimpleMethod.readOperations(element, subOps, simpleMethod); } + @Override public boolean exec(MethodContext methodContext) { String countStrExp = methodContext.expandString(this.countStr); int count = 0; @@ -91,10 +92,12 @@ public class Loop extends MethodOperation { return this.subOps; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { return this.rawString(); } diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java index c95ab9f11e..4ff00e477b 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/MapToMap.java @@ -52,6 +52,7 @@ public class MapToMap extends MethodOperation { toMapAcsr = new ContextAccessor>(element.getAttribute("to-map"), element.getAttribute("to-map-name")); } + @Override public boolean exec(MethodContext methodContext) { Map fromMap = null; if (!mapAcsr.isEmpty()) { @@ -79,10 +80,12 @@ public class MapToMap extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java index b46e941d8e..aa07243fd4 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java @@ -62,6 +62,7 @@ public class OrderMapList extends MethodOperation { this.mc = new MapComparator(this.orderByAcsrList); } + @Override public boolean exec(MethodContext methodContext) { List> orderList = listAcsr.get(methodContext); @@ -76,9 +77,11 @@ public class OrderMapList extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java index fbcaf3e3a3..b505668ca0 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/SetCalendar.java @@ -93,6 +93,7 @@ public class SetCalendar extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { Object newValue = null; if (!this.fromField.isEmpty()) { @@ -198,6 +199,7 @@ public class SetCalendar extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java index ed6556c50f..4bc5641692 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/SetOperation.java @@ -75,6 +75,7 @@ public class SetOperation extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { Object newValue = null; if (!this.fromField.isEmpty()) { @@ -120,6 +121,7 @@ public class SetOperation extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java index 70e6d320e4..200a19994a 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/StringAppend.java @@ -65,6 +65,7 @@ public class StringAppend extends MethodOperation { argListAcsr = new ContextAccessor>(element.getAttribute("arg-list"), element.getAttribute("arg-list-name")); } + @Override public boolean exec(MethodContext methodContext) { if (!mapAcsr.isEmpty()) { Map toMap = mapAcsr.get(methodContext); @@ -116,10 +117,12 @@ public class StringAppend extends MethodOperation { return newValue.toString(); } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java index 2940e3b16c..af17c8c0ee 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToField.java @@ -62,6 +62,7 @@ public class StringToField extends MethodOperation { messageFieldName = element.getAttribute("message-field-name"); } + @Override public boolean exec(MethodContext methodContext) { String valueStr = methodContext.expandString(string); @@ -95,10 +96,12 @@ public class StringToField extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java index 41645ca1c5..5f89af9ea7 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/StringToList.java @@ -58,6 +58,7 @@ public class StringToList extends MethodOperation { messageFieldName = UtilValidate.isNotEmpty(element.getAttribute("message-field")) ? element.getAttribute("message-field") : element.getAttribute("message-field-name"); } + @Override public boolean exec(MethodContext methodContext) { String valueStr = methodContext.expandString(string); if (!argListAcsr.isEmpty()) { @@ -85,10 +86,12 @@ public class StringToList extends MethodOperation { return true; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java b/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java index 3042c2c419..be0459d902 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/envops/ToString.java @@ -68,6 +68,7 @@ public class ToString extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { if (!mapAcsr.isEmpty()) { Map toMap = mapAcsr.get(methodContext); @@ -114,10 +115,12 @@ public class ToString extends MethodOperation { return outStr; } + @Override public String rawString() { // TODO: something more than the empty tag return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java b/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java index 06567d9049..333dfe3afc 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToRequest.java @@ -56,6 +56,7 @@ public class FieldToRequest extends MethodOperation { requestAcsr = new FlexibleServletAccessor(element.getAttribute("request-name"), fieldAcsr.toString()); } + @Override public boolean exec(MethodContext methodContext) { // only run this if it is in an EVENT context if (methodContext.getMethodType() == MethodContext.EVENT) { @@ -82,10 +83,12 @@ public class FieldToRequest extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java b/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java index 384b6b65ba..fc1cd61889 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/eventops/FieldToSession.java @@ -56,6 +56,7 @@ public class FieldToSession extends MethodOperation { sessionAcsr = new FlexibleServletAccessor(element.getAttribute("session-name"), fieldAcsr.toString()); } + @Override public boolean exec(MethodContext methodContext) { // only run this if it is in an EVENT context if (methodContext.getMethodType() == MethodContext.EVENT) { @@ -82,10 +83,12 @@ public class FieldToSession extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java b/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java index 4812641e01..6915d5e1c3 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestParametersToList.java @@ -51,6 +51,7 @@ public class RequestParametersToList extends MethodOperation { listAcsr = new ContextAccessor>(element.getAttribute("list-name"), requestName); } + @Override public boolean exec(MethodContext methodContext) { List listVal = null; // only run this if it is in an EVENT context @@ -80,9 +81,11 @@ public class RequestParametersToList extends MethodOperation { return true; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java b/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java index db678fcf45..3709be56a2 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/eventops/RequestToField.java @@ -60,6 +60,7 @@ public class RequestToField extends MethodOperation { defaultVal = element.getAttribute("default"); } + @Override public boolean exec(MethodContext methodContext) { String defaultVal = methodContext.expandString(this.defaultVal); @@ -99,10 +100,12 @@ public class RequestToField extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java b/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java index f788a1f8e6..84a03e9d6d 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/eventops/SessionToField.java @@ -61,6 +61,7 @@ public class SessionToField extends MethodOperation { defaultVal = element.getAttribute("default"); } + @Override public boolean exec(MethodContext methodContext) { String defaultVal = methodContext.expandString(this.defaultVal); @@ -100,10 +101,12 @@ public class SessionToField extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java b/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java index 6458a54f30..2c14c10962 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/eventops/WebappPropertyToField.java @@ -61,6 +61,7 @@ public class WebappPropertyToField extends MethodOperation { mapAcsr = new ContextAccessor>(element.getAttribute("map-name")); } + @Override public boolean exec(MethodContext methodContext) { String resource = methodContext.expandString(this.resource); String property = methodContext.expandString(this.property); @@ -110,10 +111,12 @@ public class WebappPropertyToField extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java index f83ca124e4..6d0448979c 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java @@ -72,6 +72,7 @@ public class CheckId extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { boolean isValid = true; @@ -129,10 +130,12 @@ public class CheckId extends MethodOperation { } } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java index 450033423b..ad9db0fa5d 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java @@ -91,6 +91,7 @@ public class CheckPermission extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { boolean hasPermission = false; @@ -187,10 +188,12 @@ public class CheckPermission extends MethodOperation { } } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java index e2ba4dfd4d..bb79ff0f36 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompare.java @@ -79,6 +79,7 @@ public class IfCompare extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -145,10 +146,12 @@ public class IfCompare extends MethodOperation { return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java index 6cc431c79f..fb706b3014 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfCompareField.java @@ -92,6 +92,7 @@ public class IfCompareField extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -167,10 +168,12 @@ public class IfCompareField extends MethodOperation { return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java index d2e3bc6f88..da925b9afa 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfEmpty.java @@ -68,6 +68,7 @@ public class IfEmpty extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -109,9 +110,11 @@ public class IfEmpty extends MethodOperation { return allSubOps; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java index 9276ed9640..1dc638f7d9 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfHasPermission.java @@ -67,6 +67,7 @@ public class IfHasPermission extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -114,9 +115,11 @@ public class IfHasPermission extends MethodOperation { return allSubOps; } + @Override public String rawString() { return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java index e72e4a6b16..acd51d5bca 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfInstanceOf.java @@ -69,6 +69,7 @@ public class IfInstanceOf extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // only run subOps if element is instanceOf boolean runSubOps = false; @@ -106,10 +107,12 @@ public class IfInstanceOf extends MethodOperation { return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java index 886797c0f7..83493da302 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfNotEmpty.java @@ -69,6 +69,7 @@ public class IfNotEmpty extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -116,10 +117,12 @@ public class IfNotEmpty extends MethodOperation { return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java index c49deb16fe..a264574034 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfRegexp.java @@ -75,6 +75,7 @@ public class IfRegexp extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -129,10 +130,12 @@ public class IfRegexp extends MethodOperation { return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java index fcbd7c2b57..d837ad4f42 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/ifops/IfValidateMethod.java @@ -70,6 +70,7 @@ public class IfValidateMethod extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { // if conditions fails, always return true; if a sub-op returns false // return false and stop, otherwise return true @@ -147,10 +148,12 @@ public class IfValidateMethod extends MethodOperation { return allSubOps; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java b/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java index 8f7c22a2c6..73b0ce327e 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/otherops/Calculate.java @@ -98,6 +98,7 @@ public class Calculate extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { String typeString = methodContext.expandString(this.typeString); int type; @@ -220,10 +221,12 @@ public class Calculate extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java b/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java index 494ab69aea..d7c9eb7c7b 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java @@ -68,6 +68,7 @@ public class Log extends MethodOperation { } } + @Override public boolean exec(MethodContext methodContext) { String levelStr = methodContext.expandString(this.levelStr); String message = methodContext.expandString(this.message); @@ -112,10 +113,12 @@ public class Log extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java b/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java index 2b6a2840d1..387af5ef21 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/otherops/PropertyToField.java @@ -64,6 +64,7 @@ public class PropertyToField extends MethodOperation { argListAcsr = new ContextAccessor>(element.getAttribute("arg-list-name")); } + @Override public boolean exec(MethodContext methodContext) { String resource = methodContext.expandString(this.resource); String property = methodContext.expandString(this.property); @@ -106,10 +107,12 @@ public class PropertyToField extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java b/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java index c0903a825f..286d400d60 100644 --- a/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java +++ b/framework/minilang/src/org/ofbiz/minilang/method/serviceops/FieldToResult.java @@ -53,6 +53,7 @@ public class FieldToResult extends MethodOperation { resultAcsr = new ContextAccessor(element.getAttribute("result-name"), fieldAcsr.toString()); } + @Override public boolean exec(MethodContext methodContext) { // only run this if it is in an SERVICE context if (methodContext.getMethodType() == MethodContext.SERVICE) { @@ -82,10 +83,12 @@ public class FieldToResult extends MethodOperation { return true; } + @Override public String rawString() { // TODO: add all attributes and other info return ""; } + @Override public String expandedString(MethodContext methodContext) { // TODO: something more than a stub/dummy return this.rawString(); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java b/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java index fc8d292379..95c2dea60d 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/BaseCompare.java @@ -58,6 +58,7 @@ public abstract class BaseCompare extends SimpleMapOperation { } } + @Override public void exec(Map inMap, Map results, List messages, Locale locale, ClassLoader loader) {} public static Boolean doRealCompare(Object value1, Object value2, String operator, String type, String format, diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java b/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java index 24b0c33ca6..ff49388eb4 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/Compare.java @@ -33,6 +33,7 @@ public class Compare extends BaseCompare { this.value = element.getAttribute("value"); } + @Override public void exec(Map inMap, Map results, List messages, Locale locale, ClassLoader loader) { Object fieldValue = inMap.get(fieldName); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java b/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java index a1d1814339..2b4d670889 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/CompareField.java @@ -33,6 +33,7 @@ public class CompareField extends BaseCompare { this.compareName = element.getAttribute("field"); } + @Override public void exec(Map inMap, Map results, List messages, Locale locale, ClassLoader loader) { Object compareValue = inMap.get(compareName); Object fieldValue = inMap.get(fieldName); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java b/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java index 46d3b586b8..4397f059b0 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/ConstantOper.java @@ -35,6 +35,7 @@ public class ConstantOper extends MakeInStringOperation { constant = UtilXml.elementValue(element); } + @Override public String exec(Map inMap, List messages, Locale locale, ClassLoader loader) { return constant; } diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java b/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java index 035b66acfb..5e088b5c12 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/Convert.java @@ -55,6 +55,7 @@ public class Convert extends SimpleMapOperation { format = element.getAttribute("format"); } + @Override public void exec(Map inMap, Map results, List messages, Locale locale, ClassLoader loader) { Object fieldObject = inMap.get(fieldName); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java b/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java index faf5ab3b8b..08d37a3bf2 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/Copy.java @@ -43,6 +43,7 @@ public class Copy extends SimpleMapOperation { setIfNull = !"false".equals(element.getAttribute("set-if-null")); } + @Override public void exec(Map inMap, Map results, List messages, Locale locale, ClassLoader loader) { Object fieldValue = inMap.get(fieldName); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java b/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java index cd13b87a76..2c72626831 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/InFieldOper.java @@ -37,6 +37,7 @@ public class InFieldOper extends MakeInStringOperation { fieldName = element.getAttribute("field"); } + @Override public String exec(Map inMap, List messages, Locale locale, ClassLoader loader) { Object obj = inMap.get(fieldName); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java b/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java index b2edefee38..26d65d3d51 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/NotEmpty.java @@ -32,6 +32,7 @@ public class NotEmpty extends SimpleMapOperation { super(element, simpleMapProcess); } + @Override public void exec(Map inMap, Map results, List messages, Locale locale, ClassLoader loader) { Object obj = inMap.get(fieldName); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java b/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java index 0c08d72f74..de98742572 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/PropertyOper.java @@ -39,6 +39,7 @@ public class PropertyOper extends MakeInStringOperation { property = element.getAttribute("property"); } + @Override public String exec(Map inMap, List messages, Locale locale, ClassLoader loader) { String propStr = UtilProperties.getPropertyValue(UtilURL.fromResource(resource, loader), property); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java b/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java index a76b36561c..177c8bba6b 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/Regexp.java @@ -47,6 +47,7 @@ public class Regexp extends SimpleMapOperation { } } + @Override public void exec(Map inMap, Map results, List messages, Locale locale, ClassLoader loader) { Object obj = inMap.get(fieldName); diff --git a/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java b/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java index c1ec679483..e30fb2926e 100644 --- a/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java +++ b/framework/minilang/src/org/ofbiz/minilang/operation/ValidateMethod.java @@ -41,6 +41,7 @@ public class ValidateMethod extends SimpleMapOperation { this.className = element.getAttribute("class"); } + @Override public void exec(Map inMap, Map results, List messages, Locale locale, ClassLoader loader) { Object obj = inMap.get(fieldName); diff --git a/framework/security/src/org/ofbiz/security/OFBizSecurity.java b/framework/security/src/org/ofbiz/security/OFBizSecurity.java index 6f767d8780..f121f64220 100644 --- a/framework/security/src/org/ofbiz/security/OFBizSecurity.java +++ b/framework/security/src/org/ofbiz/security/OFBizSecurity.java @@ -60,10 +60,12 @@ public class OFBizSecurity extends org.ofbiz.security.Security { this.delegator = delegator; } + @Override public GenericDelegator getDelegator() { return delegator; } + @Override public void setDelegator(GenericDelegator delegator) { this.delegator = delegator; } @@ -71,6 +73,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#findUserLoginSecurityGroupByUserLoginId(java.lang.String) */ + @Override public Iterator findUserLoginSecurityGroupByUserLoginId(String userLoginId) { List collection = userLoginSecurityGroupByUserLoginId.get(userLoginId); @@ -92,6 +95,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#securityGroupPermissionExists(java.lang.String, java.lang.String) */ + @Override public boolean securityGroupPermissionExists(String groupId, String permission) { GenericValue securityGroupPermissionValue = delegator.makeValue("SecurityGroupPermission", UtilMisc.toMap("groupId", groupId, "permissionId", permission)); @@ -116,6 +120,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#hasPermission(java.lang.String, javax.servlet.http.HttpSession) */ + @Override public boolean hasPermission(String permission, HttpSession session) { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); @@ -127,6 +132,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#hasPermission(java.lang.String, org.ofbiz.entity.GenericValue) */ + @Override public boolean hasPermission(String permission, GenericValue userLogin) { if (userLogin == null) return false; @@ -144,6 +150,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#hasEntityPermission(java.lang.String, java.lang.String, javax.servlet.http.HttpSession) */ + @Override public boolean hasEntityPermission(String entity, String action, HttpSession session) { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); @@ -154,6 +161,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#hasEntityPermission(java.lang.String, java.lang.String, org.ofbiz.entity.GenericValue) */ + @Override public boolean hasEntityPermission(String entity, String action, GenericValue userLogin) { if (userLogin == null) return false; @@ -179,6 +187,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#hasRolePermission(java.lang.String, java.lang.String, java.lang.String, java.lang.String, javax.servlet.http.HttpSession) */ + @Override public boolean hasRolePermission(String application, String action, String primaryKey, String role, HttpSession session) { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); return hasRolePermission(application, action, primaryKey, role, userLogin); @@ -187,6 +196,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#hasRolePermission(java.lang.String, java.lang.String, java.lang.String, java.lang.String, org.ofbiz.entity.GenericValue) */ + @Override public boolean hasRolePermission(String application, String action, String primaryKey, String role, GenericValue userLogin) { List roles = null; if (role != null && !role.equals("")) @@ -197,6 +207,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#hasRolePermission(java.lang.String, java.lang.String, java.lang.String, java.util.List, javax.servlet.http.HttpSession) */ + @Override public boolean hasRolePermission(String application, String action, String primaryKey, List roles, HttpSession session) { GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); return hasRolePermission(application, action, primaryKey, roles, userLogin); @@ -205,6 +216,7 @@ public class OFBizSecurity extends org.ofbiz.security.Security { /** * @see org.ofbiz.security.Security#hasRolePermission(java.lang.String, java.lang.String, java.lang.String, java.util.List, org.ofbiz.entity.GenericValue) */ + @Override public boolean hasRolePermission(String application, String action, String primaryKey, List roles, GenericValue userLogin) { String entityName = null; EntityCondition condition = null; diff --git a/framework/service/src/org/ofbiz/service/LocalDispatcher.java b/framework/service/src/org/ofbiz/service/LocalDispatcher.java index 52b77b35ec..dc9e5b53c8 100644 --- a/framework/service/src/org/ofbiz/service/LocalDispatcher.java +++ b/framework/service/src/org/ofbiz/service/LocalDispatcher.java @@ -329,7 +329,6 @@ public interface LocalDispatcher { * Gets the Security object associated with this dispatcher * @return Security object associated with this dispatcher */ - @Deprecated public Security getSecurity(); /** diff --git a/framework/service/src/org/ofbiz/service/ModelParam.java b/framework/service/src/org/ofbiz/service/ModelParam.java index 6cfc8a1af0..3c5f5d8714 100644 --- a/framework/service/src/org/ofbiz/service/ModelParam.java +++ b/framework/service/src/org/ofbiz/service/ModelParam.java @@ -181,6 +181,7 @@ public class ModelParam implements Serializable { return model.name.equals(this.name); } + @Override public String toString() { StringBuilder buf = new StringBuilder(); buf.append(name).append("::"); @@ -279,6 +280,7 @@ public class ModelParam implements Serializable { return null; } + @Override public String toString() { return className + "::" + methodName + "::" + failMessage + "::" + failResource + "::" + failProperty; } diff --git a/framework/service/src/org/ofbiz/service/ModelService.java b/framework/service/src/org/ofbiz/service/ModelService.java index 845ead75f4..7f95bf5b28 100644 --- a/framework/service/src/org/ofbiz/service/ModelService.java +++ b/framework/service/src/org/ofbiz/service/ModelService.java @@ -229,6 +229,7 @@ public class ModelService extends AbstractMap implements Seriali } } + @Override public Object get(Object name) { Field field = MODEL_SERVICE_FIELD_MAP.get(name.toString()); if (field != null) { @@ -264,10 +265,12 @@ public class ModelService extends AbstractMap implements Seriali throw new UnsupportedOperationException(); } + @Override public int hashCode() { return field.hashCode() ^ System.identityHashCode(ModelService.this); } + @Override public boolean equals(Object o) { if (!(o instanceof ModelServiceMapEntry)) return false; ModelServiceMapEntry other = (ModelServiceMapEntry) o; @@ -279,12 +282,15 @@ public class ModelService extends AbstractMap implements Seriali } } + @Override public Set> entrySet() { return new AbstractSet>() { + @Override public int size() { return MODEL_SERVICE_FIELDS.length; } + @Override public Iterator> iterator() { return new Iterator>() { private int i = 0; @@ -305,10 +311,12 @@ public class ModelService extends AbstractMap implements Seriali }; } + @Override public Object put(String o1, Object o2) { return null; } + @Override public String toString() { StringBuilder buf = new StringBuilder(); buf.append(name).append("::"); diff --git a/framework/service/src/org/ofbiz/service/ModelServiceIface.java b/framework/service/src/org/ofbiz/service/ModelServiceIface.java index ff7bd87017..5dbf87b2a7 100644 --- a/framework/service/src/org/ofbiz/service/ModelServiceIface.java +++ b/framework/service/src/org/ofbiz/service/ModelServiceIface.java @@ -48,6 +48,7 @@ public class ModelServiceIface { this.optional = optional; } + @Override public String toString() { return "[" + service + ":" + optional + "]"; } diff --git a/framework/service/src/org/ofbiz/service/RunningService.java b/framework/service/src/org/ofbiz/service/RunningService.java index 78929d4502..92696a348e 100644 --- a/framework/service/src/org/ofbiz/service/RunningService.java +++ b/framework/service/src/org/ofbiz/service/RunningService.java @@ -67,6 +67,7 @@ public class RunningService { this.endStamp = UtilDateTime.nowTimestamp(); } + @Override public boolean equals(Object o) { if (o != null && o instanceof RunningService) { RunningService x = (RunningService) o; diff --git a/framework/service/src/org/ofbiz/service/ServiceValidationException.java b/framework/service/src/org/ofbiz/service/ServiceValidationException.java index 2644921e80..d39ef206da 100644 --- a/framework/service/src/org/ofbiz/service/ServiceValidationException.java +++ b/framework/service/src/org/ofbiz/service/ServiceValidationException.java @@ -105,6 +105,7 @@ public class ServiceValidationException extends GenericServiceException { return missingFields; } + @Override public List getMessageList() { if (this.messages == null || this.messages.size() == 0) { return null; @@ -128,6 +129,7 @@ public class ServiceValidationException extends GenericServiceException { } } + @Override public String getMessage() { String msg = super.getMessage(); if (UtilValidate.isNotEmpty(this.messages)) { diff --git a/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java b/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java index 6ada76f188..517baf1c5b 100644 --- a/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java +++ b/framework/service/src/org/ofbiz/service/ServiceXaWrapper.java @@ -144,6 +144,7 @@ public class ServiceXaWrapper extends GenericXaResource { return this.rollbackContext; } + @Override public void enlist() throws XAException { super.enlist(); if (Debug.verboseOn()) Debug.logVerbose("Enlisted in transaction : " + this.toString(), module); @@ -153,6 +154,7 @@ public class ServiceXaWrapper extends GenericXaResource { /** * @see javax.transaction.xa.XAResource#commit(javax.transaction.xa.Xid xid, boolean onePhase) */ + @Override public void commit(Xid xid, boolean onePhase) throws XAException { if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#commit() : " + onePhase + " / " + xid.toString(), module); // the commit listener @@ -169,6 +171,7 @@ public class ServiceXaWrapper extends GenericXaResource { final boolean async = commitAsync; Thread thread = new Thread() { + @Override public void run() { try { runService(service, context, persist, (async ? MODE_ASYNC : MODE_SYNC), TYPE_COMMIT); @@ -186,6 +189,7 @@ public class ServiceXaWrapper extends GenericXaResource { /** * @see javax.transaction.xa.XAResource#rollback(javax.transaction.xa.Xid xid) */ + @Override public void rollback(Xid xid) throws XAException { if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#rollback() : " + xid.toString(), module); // the rollback listener @@ -202,6 +206,7 @@ public class ServiceXaWrapper extends GenericXaResource { final boolean async = rollbackAsync; Thread thread = new Thread() { + @Override public void run() { try { runService(service, context, persist, (async ? MODE_ASYNC : MODE_SYNC), TYPE_ROLLBACK); @@ -216,6 +221,7 @@ public class ServiceXaWrapper extends GenericXaResource { this.active = false; } + @Override public int prepare(Xid xid) throws XAException { // overriding to log two phase commits if (Debug.verboseOn()) Debug.logVerbose("ServiceXaWrapper#prepare() : " + xid.toString(), module); diff --git a/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java b/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java index 4aaa7248e9..0ce5655ee9 100644 --- a/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java +++ b/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java @@ -350,6 +350,7 @@ public class RecurrenceInfo { public RecurrenceWrapper(RecurrenceInfo info) { this.info = info; } + @Override public Calendar first(Calendar cal) { long result = this.info.first(); if (result == 0) { @@ -359,9 +360,11 @@ public class RecurrenceInfo { first.setTimeInMillis(result); return first; } + @Override public boolean includesDate(Calendar cal) { return this.info.isValidCurrent(cal.getTimeInMillis()); } + @Override public Calendar next(Calendar cal) { long result = this.info.next(cal.getTimeInMillis()); if (result == 0) { @@ -371,6 +374,7 @@ public class RecurrenceInfo { next.setTimeInMillis(result); return next; } + @Override public void accept(TemporalExpressionVisitor visitor) {} } } diff --git a/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java b/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java index 0af9b7f114..39a3e412a0 100644 --- a/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java +++ b/framework/service/src/org/ofbiz/service/calendar/TemporalExpressions.java @@ -38,15 +38,19 @@ public class TemporalExpressions implements Serializable { /** This class represents a null expression. */ public static class Null extends TemporalExpression { + @Override public Calendar first(Calendar cal) { return null; } + @Override public boolean includesDate(Calendar cal) { return false; } + @Override public Calendar next(Calendar cal) { return null; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -77,6 +81,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -87,10 +92,12 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", size = " + this.expressionSet.size(); } + @Override public boolean includesDate(Calendar cal) { for (TemporalExpression expression : this.expressionSet) { if (expression.includesDate(cal)) { @@ -100,6 +107,7 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public Calendar first(Calendar cal) { for (TemporalExpression expression : this.expressionSet) { Calendar first = expression.first(cal); @@ -110,6 +118,7 @@ public class TemporalExpressions implements Serializable { return null; } + @Override public Calendar next(Calendar cal) { for (TemporalExpression expression : this.expressionSet) { Calendar next = expression.next(cal); @@ -120,10 +129,12 @@ public class TemporalExpressions implements Serializable { return null; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } + @Override public Set getRange(org.ofbiz.base.util.DateRange range, Calendar cal) { Set rawSet = new TreeSet(); Set finalSet = new TreeSet(); @@ -148,6 +159,7 @@ public class TemporalExpressions implements Serializable { return Collections.unmodifiableSet(this.expressionSet); } + @Override protected boolean containsExpression(TemporalExpression expression) { for (TemporalExpression setItem : this.expressionSet) { if (setItem.containsExpression(expression)) { @@ -183,6 +195,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -193,10 +206,12 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", size = " + this.expressionSet.size(); } + @Override public boolean includesDate(Calendar cal) { for (TemporalExpression expression : this.expressionSet) { if (!expression.includesDate(cal)) { @@ -206,6 +221,7 @@ public class TemporalExpressions implements Serializable { return true; } + @Override public Calendar first(Calendar cal) { Calendar first = (Calendar) cal.clone(); for (TemporalExpression expression : this.expressionSet) { @@ -221,6 +237,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public Calendar next(Calendar cal) { Calendar next = (Calendar) cal.clone(); for (TemporalExpression expression : this.expressionSet) { @@ -236,10 +253,12 @@ public class TemporalExpressions implements Serializable { } } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } + @Override public Set getRange(org.ofbiz.base.util.DateRange range, Calendar cal) { Set finalSet = new TreeSet(); Set rawSet = new TreeSet(); @@ -271,6 +290,7 @@ public class TemporalExpressions implements Serializable { return Collections.unmodifiableSet(this.expressionSet); } + @Override protected boolean containsExpression(TemporalExpression expression) { for (TemporalExpression setItem : this.expressionSet) { if (setItem.containsExpression(expression)) { @@ -304,6 +324,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -315,14 +336,17 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", included = " + this.included + ", excluded = " + this.excluded; } + @Override public boolean includesDate(Calendar cal) { return this.included.includesDate(cal) && !this.excluded.includesDate(cal); } + @Override public Calendar first(Calendar cal) { Calendar first = this.included.first(cal); while (first != null && this.excluded.includesDate(first)) { @@ -331,6 +355,7 @@ public class TemporalExpressions implements Serializable { return first; } + @Override public Calendar next(Calendar cal) { Calendar next = this.included.next(cal); while (next != null && this.excluded.includesDate(next)) { @@ -339,10 +364,12 @@ public class TemporalExpressions implements Serializable { return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } + @Override public Set getRange(org.ofbiz.base.util.DateRange range, Calendar cal) { Set finalSet = new TreeSet(); Set rawSet = this.included.getRange(range, cal); @@ -370,6 +397,7 @@ public class TemporalExpressions implements Serializable { return this.included; } + @Override protected boolean containsExpression(TemporalExpression expression) { return this.included.containsExpression(expression) || this.excluded.containsExpression(expression); } @@ -387,6 +415,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -397,22 +426,27 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", start = " + this.range.start() + ", end = " + this.range.end(); } + @Override public boolean includesDate(Calendar cal) { return this.range.includesDate(cal.getTime()); } + @Override public Calendar first(Calendar cal) { return includesDate(cal) ? cal : null; } + @Override public Calendar next(Calendar cal) { return includesDate(cal) ? cal : null; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -489,6 +523,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -500,11 +535,13 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", start = " + this.startStr + ", end = " + this.endStr + ", interval = " + this.interval + ", count = " + this.count; } + @Override public boolean includesDate(Calendar cal) { long millis = cal.getTimeInMillis(); Calendar startCal = setStart(cal); @@ -517,6 +554,7 @@ public class TemporalExpressions implements Serializable { return millis >= startMillis && millis <= endMillis; } + @Override public Calendar first(Calendar cal) { if (includesDate(cal)) { return cal; @@ -524,6 +562,7 @@ public class TemporalExpressions implements Serializable { return next(cal); } + @Override public Calendar next(Calendar cal) { Calendar next = (Calendar) cal.clone(); next.add(this.interval, this.count); @@ -569,6 +608,7 @@ public class TemporalExpressions implements Serializable { return this.startSecs; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -618,6 +658,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -629,10 +670,12 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", start = " + this.start + ", end = " + this.end; } + @Override public boolean includesDate(Calendar cal) { int dow = cal.get(Calendar.DAY_OF_WEEK); if (dow == this.start || dow == this.end) { @@ -651,6 +694,7 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public Calendar first(Calendar cal) { Calendar first = (Calendar) cal.clone(); while (!includesDate(first)) { @@ -659,6 +703,7 @@ public class TemporalExpressions implements Serializable { return setStartOfDay(first); } + @Override public Calendar next(Calendar cal) { Calendar next = (Calendar) cal.clone(); next.add(Calendar.DAY_OF_MONTH, 1); @@ -668,6 +713,7 @@ public class TemporalExpressions implements Serializable { return setStartOfDay(next); } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -714,6 +760,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -725,10 +772,12 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", start = " + this.start + ", end = " + this.end; } + @Override public boolean includesDate(Calendar cal) { int month = cal.get(Calendar.MONTH); if (month == this.start || month == this.end) { @@ -747,6 +796,7 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public Calendar first(Calendar cal) { Calendar first = (Calendar) cal.clone(); first.set(Calendar.DAY_OF_MONTH, 1); @@ -756,6 +806,7 @@ public class TemporalExpressions implements Serializable { return first; } + @Override public Calendar next(Calendar cal) { Calendar next = (Calendar) cal.clone(); next.set(Calendar.DAY_OF_MONTH, 1); @@ -766,6 +817,7 @@ public class TemporalExpressions implements Serializable { return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -810,6 +862,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -821,15 +874,18 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", start = " + this.start + ", end = " + this.end; } + @Override public boolean includesDate(Calendar cal) { int dom = cal.get(Calendar.DAY_OF_MONTH); return dom >= this.start && dom <= this.end; } + @Override public Calendar first(Calendar cal) { Calendar first = setStartOfDay((Calendar) cal.clone()); while (!includesDate(first)) { @@ -838,6 +894,7 @@ public class TemporalExpressions implements Serializable { return first; } + @Override public Calendar next(Calendar cal) { Calendar next = setStartOfDay((Calendar) cal.clone()); next.add(Calendar.DAY_OF_MONTH, 1); @@ -847,6 +904,7 @@ public class TemporalExpressions implements Serializable { return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -892,6 +950,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -903,10 +962,12 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", dayOfWeek = " + this.dayOfWeek + ", occurrence = " + this.occurrence; } + @Override public boolean includesDate(Calendar cal) { if (cal.get(Calendar.DAY_OF_WEEK) != this.dayOfWeek) { return false; @@ -918,6 +979,7 @@ public class TemporalExpressions implements Serializable { return dom == next.get(Calendar.DAY_OF_MONTH) && next.get(Calendar.MONTH) == month; } + @Override public Calendar first(Calendar cal) { int month = cal.get(Calendar.MONTH); Calendar first = setStartOfDay(alignDayOfWeek((Calendar) cal.clone())); @@ -931,6 +993,7 @@ public class TemporalExpressions implements Serializable { return first; } + @Override public Calendar next(Calendar cal) { int month = cal.get(Calendar.MONTH); Calendar next = setStartOfDay(alignDayOfWeek((Calendar) cal.clone())); @@ -944,6 +1007,7 @@ public class TemporalExpressions implements Serializable { return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } @@ -1017,6 +1081,7 @@ public class TemporalExpressions implements Serializable { } } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -1028,15 +1093,18 @@ public class TemporalExpressions implements Serializable { return false; } + @Override public String toString() { return super.toString() + ", start = " + this.start + ", freqType = " + this.freqType + ", freqCount = " + this.freqCount; } + @Override public boolean includesDate(Calendar cal) { Calendar next = first(cal); return next.equals(cal); } + @Override public Calendar first(Calendar cal) { Calendar first = prepareCal(cal); while (first.before(cal)) { @@ -1045,6 +1113,7 @@ public class TemporalExpressions implements Serializable { return first; } + @Override public Calendar next(Calendar cal) { Calendar next = first(cal); if (next.equals(cal)) { @@ -1053,6 +1122,7 @@ public class TemporalExpressions implements Serializable { return next; } + @Override public void accept(TemporalExpressionVisitor visitor) { visitor.visit(this); } diff --git a/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java b/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java index 2b3b63b217..fce0eb3141 100644 --- a/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java +++ b/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java @@ -239,6 +239,7 @@ public class ServiceEcaAction implements java.io.Serializable { return success; } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaAction) { ServiceEcaAction other = (ServiceEcaAction) obj; diff --git a/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java b/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java index a24debc826..0dac06c3ae 100644 --- a/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java +++ b/framework/service/src/org/ofbiz/service/eca/ServiceEcaCondition.java @@ -197,6 +197,7 @@ public class ServiceEcaCondition implements java.io.Serializable { } } + @Override public String toString() { StringBuilder buf = new StringBuilder(); @@ -212,6 +213,7 @@ public class ServiceEcaCondition implements java.io.Serializable { return buf.toString(); } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaCondition) { ServiceEcaCondition other = (ServiceEcaCondition) obj; diff --git a/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java b/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java index 148673b90f..5aff0a4c09 100644 --- a/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java +++ b/framework/service/src/org/ofbiz/service/eca/ServiceEcaRule.java @@ -171,6 +171,7 @@ public class ServiceEcaRule implements java.io.Serializable { return this.enabled; } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaRule) { ServiceEcaRule other = (ServiceEcaRule) obj; @@ -189,6 +190,7 @@ public class ServiceEcaRule implements java.io.Serializable { } } + @Override public String toString() { return "ServiceEcaRule:" + this.serviceName + ":" + this.eventName + ":runOnError=" + this.runOnError + ":runOnFailure=" + this.runOnFailure + ":enabled=" + this.enabled + ":conditions=" + this.conditions + ":actionsAndSets=" + this.actionsAndSets; } diff --git a/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java b/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java index 420b615553..c764883bbd 100644 --- a/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java +++ b/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java @@ -141,6 +141,7 @@ public class ServiceEcaSetField { return s; } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaSetField) { ServiceEcaSetField other = (ServiceEcaSetField) obj; diff --git a/framework/service/src/org/ofbiz/service/engine/BSFEngine.java b/framework/service/src/org/ofbiz/service/engine/BSFEngine.java index 12bc3728a9..26a9d42b20 100644 --- a/framework/service/src/org/ofbiz/service/engine/BSFEngine.java +++ b/framework/service/src/org/ofbiz/service/engine/BSFEngine.java @@ -49,6 +49,7 @@ public class BSFEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -56,6 +57,7 @@ public class BSFEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { Object result = serviceInvoker(localName, modelService, context); diff --git a/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java b/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java index de0541cf6f..d111bf93ff 100644 --- a/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java +++ b/framework/service/src/org/ofbiz/service/engine/BeanShellEngine.java @@ -45,6 +45,7 @@ public final class BeanShellEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -52,6 +53,7 @@ public final class BeanShellEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { return serviceInvoker(localName, modelService, context); } diff --git a/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java b/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java index 3975592316..8179c3a991 100644 --- a/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java +++ b/framework/service/src/org/ofbiz/service/engine/EntityAutoEngine.java @@ -54,6 +54,7 @@ public final class EntityAutoEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -61,6 +62,7 @@ public final class EntityAutoEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map runSync(String localName, ModelService modelService, Map parameters) throws GenericServiceException { // static java service methods should be: public Map methodName(DispatchContext dctx, Map context) DispatchContext dctx = dispatcher.getLocalContext(localName); diff --git a/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java b/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java index bd7645c78e..1b44958f1b 100644 --- a/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java +++ b/framework/service/src/org/ofbiz/service/engine/GenericAsyncEngine.java @@ -153,6 +153,7 @@ public abstract class GenericAsyncEngine extends AbstractEngine { } } + @Override protected boolean allowCallbacks(ModelService model, Map context, int mode) throws GenericServiceException { return mode == GenericEngine.SYNC_MODE; } diff --git a/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java b/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java index 99b2d233c7..c9217ab773 100644 --- a/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java +++ b/framework/service/src/org/ofbiz/service/engine/GroovyEngine.java @@ -41,6 +41,7 @@ public final class GroovyEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -48,6 +49,7 @@ public final class GroovyEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { return serviceInvoker(localName, modelService, context); } diff --git a/framework/service/src/org/ofbiz/service/engine/HttpEngine.java b/framework/service/src/org/ofbiz/service/engine/HttpEngine.java index 50a69e74b0..4c800dc52a 100644 --- a/framework/service/src/org/ofbiz/service/engine/HttpEngine.java +++ b/framework/service/src/org/ofbiz/service/engine/HttpEngine.java @@ -54,6 +54,7 @@ public class HttpEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { DispatchContext dctx = dispatcher.getLocalContext(localName); String xmlContext = null; @@ -95,6 +96,7 @@ public class HttpEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { Map result = runSync(localName, modelService, context); } diff --git a/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java b/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java index b2602be67d..e73b476a26 100644 --- a/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java +++ b/framework/service/src/org/ofbiz/service/engine/SOAPClientEngine.java @@ -59,6 +59,7 @@ public final class SOAPClientEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { runSync(localName, modelService, context); } @@ -66,6 +67,7 @@ public final class SOAPClientEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { Map result = serviceInvoker(modelService, context); diff --git a/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java b/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java index bc6c11e33f..bf5353bd4e 100644 --- a/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java +++ b/framework/service/src/org/ofbiz/service/engine/StandardJavaEngine.java @@ -43,6 +43,7 @@ public final class StandardJavaEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { Map result = runSync(localName, modelService, context); } @@ -50,6 +51,7 @@ public final class StandardJavaEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { Object result = serviceInvoker(localName, modelService, context); diff --git a/framework/service/src/org/ofbiz/service/group/GroupModel.java b/framework/service/src/org/ofbiz/service/group/GroupModel.java index 5e3bb450d9..923ef8b733 100644 --- a/framework/service/src/org/ofbiz/service/group/GroupModel.java +++ b/framework/service/src/org/ofbiz/service/group/GroupModel.java @@ -140,6 +140,7 @@ public class GroupModel { /** * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuilder str = new StringBuilder(); str.append(getGroupName()); diff --git a/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java b/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java index 9050d15fd4..282c11e3d4 100644 --- a/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java +++ b/framework/service/src/org/ofbiz/service/group/GroupServiceModel.java @@ -127,6 +127,7 @@ public class GroupServiceModel { /** * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuilder str = new StringBuilder(); str.append(getName()); diff --git a/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java b/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java index 100238fbea..0dfed3f2e4 100644 --- a/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java +++ b/framework/service/src/org/ofbiz/service/group/ServiceGroupEngine.java @@ -41,6 +41,7 @@ public class ServiceGroupEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { GroupModel groupModel = modelService.internalGroup; if (groupModel == null) { @@ -56,6 +57,7 @@ public class ServiceGroupEngine extends GenericAsyncEngine { /** * @see org.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.ofbiz.service.ModelService, java.util.Map) */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { runSync(localName, modelService, context); } diff --git a/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java b/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java index 7f111ea8d5..b4546eb649 100644 --- a/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java +++ b/framework/service/src/org/ofbiz/service/job/GenericServiceJob.java @@ -59,6 +59,7 @@ public class GenericServiceJob extends AbstractJob { /** * Invokes the service. */ + @Override public void exec() throws InvalidJobException { init(); diff --git a/framework/service/src/org/ofbiz/service/job/JobManager.java b/framework/service/src/org/ofbiz/service/job/JobManager.java index 71d14e1e58..ef9e332a9c 100644 --- a/framework/service/src/org/ofbiz/service/job/JobManager.java +++ b/framework/service/src/org/ofbiz/service/job/JobManager.java @@ -456,6 +456,7 @@ public class JobManager { } } + @Override public void finalize() throws Throwable { this.shutdown(); super.finalize(); diff --git a/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java b/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java index 7d12a3382a..0ca0f00536 100644 --- a/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java +++ b/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java @@ -79,6 +79,7 @@ public class PersistedServiceJob extends GenericServiceJob { this.maxRetry = jobValue.get("maxRetry") != null ? jobValue.getLong("maxRetry").longValue() : -1; } + @Override public void queue() throws InvalidJobException { super.queue(); @@ -119,6 +120,7 @@ public class PersistedServiceJob extends GenericServiceJob { /** * @see org.ofbiz.service.job.GenericServiceJob#init() */ + @Override protected void init() throws InvalidJobException { super.init(); @@ -201,6 +203,7 @@ public class PersistedServiceJob extends GenericServiceJob { /** * @see org.ofbiz.service.job.GenericServiceJob#finish() */ + @Override protected void finish() throws InvalidJobException { super.finish(); @@ -221,6 +224,7 @@ public class PersistedServiceJob extends GenericServiceJob { /** * @see org.ofbiz.service.job.GenericServiceJob#failed(Throwable) */ + @Override protected void failed(Throwable t) throws InvalidJobException { super.failed(t); @@ -256,6 +260,7 @@ public class PersistedServiceJob extends GenericServiceJob { /** * @see org.ofbiz.service.job.GenericServiceJob#getServiceName() */ + @Override protected String getServiceName() throws InvalidJobException { GenericValue jobObj = getJob(); if (jobObj == null || jobObj.get("serviceName") == null) { @@ -267,6 +272,7 @@ public class PersistedServiceJob extends GenericServiceJob { /** * @see org.ofbiz.service.job.GenericServiceJob#getContext() */ + @Override protected Map getContext() throws InvalidJobException { Map context = null; try { diff --git a/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java b/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java index e9aa88cc4d..4a0d4aec6d 100644 --- a/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java +++ b/framework/service/src/org/ofbiz/service/mail/JavaMailContainer.java @@ -245,6 +245,7 @@ public class JavaMailContainer implements Container { this.userLogin = userLogin; } + @Override public void run() { if (UtilValidate.isNotEmpty(stores)) { for (Map.Entry entry: stores.entrySet()) { diff --git a/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java b/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java index fd5aa7f8f3..2be622930a 100644 --- a/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java +++ b/framework/service/src/org/ofbiz/service/rmi/RmiServiceEngine.java @@ -37,10 +37,12 @@ public class RmiServiceEngine extends GenericAsyncEngine { super(dispatcher); } + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { return run(modelService, context); } + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { run(modelService, context); } diff --git a/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java b/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java index 594e339979..594060ff90 100644 --- a/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java +++ b/framework/service/src/org/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java @@ -56,7 +56,6 @@ public class SSLServerSocketFactory implements RMIServerSocketFactory, Serializa this.keystore = location; this.ksType = type; this.ksPass = password; - this.alias = alias; } public void setKeyStoreAlias(String alias) { diff --git a/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java b/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java index 8da08a42a9..69d85472cc 100644 --- a/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java +++ b/framework/service/src/org/ofbiz/service/test/ServiceEngineTests.java @@ -30,9 +30,11 @@ public class ServiceEngineTests extends OFBizTestCase { super(name); } + @Override protected void setUp() throws Exception { } + @Override protected void tearDown() throws Exception { } diff --git a/framework/start/src/org/ofbiz/base/start/Classpath.java b/framework/start/src/org/ofbiz/base/start/Classpath.java index 260bc44caa..3f7e915797 100644 --- a/framework/start/src/org/ofbiz/base/start/Classpath.java +++ b/framework/start/src/org/ofbiz/base/start/Classpath.java @@ -89,6 +89,7 @@ public class Classpath { } + @Override public String toString() { StringBuilder cp = new StringBuilder(1024); int cnt = _elements.size(); diff --git a/framework/start/src/org/ofbiz/base/start/Start.java b/framework/start/src/org/ofbiz/base/start/Start.java index 2d7b86dd32..50f527f839 100644 --- a/framework/start/src/org/ofbiz/base/start/Start.java +++ b/framework/start/src/org/ofbiz/base/start/Start.java @@ -146,6 +146,7 @@ public class Start implements Runnable { if (command.equals(Start.SHUTDOWN_COMMAND)) { if (serverStopping) return "IN-PROGRESS"; Thread t = new Thread() { + @Override public void run() { shutdownServer(); } @@ -281,6 +282,7 @@ public class Start implements Runnable { try { Method shutdownHook = java.lang.Runtime.class.getMethod("addShutdownHook", new Class[]{java.lang.Thread.class}); Thread hook = new Thread() { + @Override public void run() { setName("OFBiz_Shutdown_Hook"); shutdownServer(); diff --git a/framework/start/src/org/ofbiz/base/start/StartupException.java b/framework/start/src/org/ofbiz/base/start/StartupException.java index 5e186bd6ab..e95ed7065c 100644 --- a/framework/start/src/org/ofbiz/base/start/StartupException.java +++ b/framework/start/src/org/ofbiz/base/start/StartupException.java @@ -64,6 +64,7 @@ public class StartupException extends Exception { } /** Returns the detail message, including the message from the nested exception if there is one. */ + @Override public String getMessage() { if (nested != null) { return super.getMessage() + " (" + nested.getMessage() + ")"; @@ -86,6 +87,7 @@ public class StartupException extends Exception { } /** Prints the composite message to System.err. */ + @Override public void printStackTrace() { super.printStackTrace(); if (nested != null) { @@ -94,6 +96,7 @@ public class StartupException extends Exception { } /** Prints the composite message and the embedded stack trace to the specified stream ps. */ + @Override public void printStackTrace(PrintStream ps) { super.printStackTrace(ps); if (nested != null) { @@ -102,6 +105,7 @@ public class StartupException extends Exception { } /** Prints the composite message and the embedded stack trace to the specified print writer pw. */ + @Override public void printStackTrace(PrintWriter pw) { super.printStackTrace(pw); if (nested != null) { diff --git a/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java b/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java index 417b111074..cce57a7d65 100644 --- a/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java +++ b/framework/testtools/src/org/ofbiz/testtools/EntityXmlAssertTest.java @@ -55,6 +55,7 @@ public class EntityXmlAssertTest extends OFBizTestCase { if (UtilValidate.isEmpty(this.action)) this.action = "assert"; } + @Override public int countTestCases() { int testCaseCount = 0; try { @@ -67,6 +68,7 @@ public class EntityXmlAssertTest extends OFBizTestCase { return testCaseCount; } + @Override public void run(TestResult result) { result.startTest(this); diff --git a/framework/testtools/src/org/ofbiz/testtools/JythonTest.java b/framework/testtools/src/org/ofbiz/testtools/JythonTest.java index 15fd895cd6..8c9006c309 100644 --- a/framework/testtools/src/org/ofbiz/testtools/JythonTest.java +++ b/framework/testtools/src/org/ofbiz/testtools/JythonTest.java @@ -37,10 +37,12 @@ public class JythonTest extends OFBizTestCase { this.scriptLocation = mainElement.getAttribute("script-location"); } + @Override public int countTestCases() { return 1; } + @Override public void run(TestResult result) { // TODO Auto-generated method stub result.startTest(this); diff --git a/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java b/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java index bc25fe32f2..8f973a99a4 100644 --- a/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java +++ b/framework/testtools/src/org/ofbiz/testtools/ServiceTest.java @@ -49,10 +49,12 @@ public class ServiceTest extends OFBizTestCase { this.serviceName = mainElement.getAttribute("service-name"); } + @Override public int countTestCases() { return 1; } + @Override public void run(TestResult result) { result.startTest(this); diff --git a/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java b/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java index dd07ec562c..b619ad9a14 100644 --- a/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java +++ b/framework/testtools/src/org/ofbiz/testtools/SimpleMethodTest.java @@ -52,10 +52,12 @@ public class SimpleMethodTest extends OFBizTestCase { this.methodName = mainElement.getAttribute("name"); } + @Override public int countTestCases() { return 1; } + @Override public void run(TestResult result) { result.startTest(this); diff --git a/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java b/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java index f8945a9b15..7ad3a12275 100644 --- a/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java +++ b/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java @@ -190,11 +190,13 @@ public class TestRunContainer implements Container { this.setOutput(out); } + @Override public void startTestSuite(JUnitTest suite) { startTimes.put(suite.getName(), System.currentTimeMillis()); super.startTestSuite(suite); } + @Override public void endTestSuite(JUnitTest suite) throws BuildException { long startTime = startTimes.get(suite.getName()); suite.setRunTime((System.currentTimeMillis() - startTime)); diff --git a/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java b/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java index 77fb326140..1f6f0fea46 100644 --- a/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java +++ b/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java @@ -279,7 +279,7 @@ public class ConfigXMLReader { for (File controllerFile: controllerFiles) { URL controllerUrl = null; try { - controllerUrl = controllerFile.toURL(); + controllerUrl = controllerFile.toURI().toURL(); } catch (MalformedURLException mue) { throw new GeneralException(mue); } diff --git a/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java b/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java index 03bad80bab..6677e73417 100644 --- a/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java +++ b/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java @@ -61,6 +61,7 @@ public class ControlServlet extends HttpServlet { /** * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig) */ + @Override public void init(ServletConfig config) throws ServletException { super.init(config); if (Debug.infoOn()) Debug.logInfo("LOADING WEBAPP [" + config.getServletContext().getContextPath().substring(1) + "] " + config.getServletContext().getServletContextName() + ", located at " + config.getServletContext().getRealPath("/"), module); @@ -74,6 +75,7 @@ public class ControlServlet extends HttpServlet { /** * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { doGet(request, response); } @@ -81,6 +83,7 @@ public class ControlServlet extends HttpServlet { /** * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) */ + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { long requestStartTime = System.currentTimeMillis(); RequestHandler requestHandler = this.getRequestHandler(); @@ -316,6 +319,7 @@ public class ControlServlet extends HttpServlet { /** * @see javax.servlet.Servlet#destroy() */ + @Override public void destroy() { super.destroy(); } diff --git a/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java b/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java index 1b2cb8b73d..d6356801c2 100644 --- a/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java +++ b/framework/webapp/src/org/ofbiz/webapp/event/JSONSimpleEventHandler.java @@ -25,6 +25,7 @@ import javax.servlet.ServletContext; public class JSONSimpleEventHandler extends AbstractJSONEventHandler{ + @Override public void init(ServletContext context) throws EventHandlerException { this.service = new SimpleEventHandler(); this.service.init(context); diff --git a/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java b/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java index c88e422d3f..158164bc45 100644 --- a/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java +++ b/framework/webapp/src/org/ofbiz/webapp/event/XmlRpcEventHandler.java @@ -135,6 +135,7 @@ public class XmlRpcEventHandler extends XmlRpcHttpServer implements EventHandler return null; } + @Override protected void setResponseHeader(ServerStreamConnection con, String header, String value) { ((HttpStreamConnection) con).getResponse().setHeader(header, value); } @@ -205,6 +206,7 @@ public class XmlRpcEventHandler extends XmlRpcHttpServer implements EventHandler this.setAuthenticationHandler(new OfbizRpcAuthHandler()); } + @Override public XmlRpcHandler getHandler(String method) throws XmlRpcNoSuchHandlerException, XmlRpcException { ModelService model = null; try { diff --git a/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java b/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java index f1a86283c3..7f4b4de873 100644 --- a/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java +++ b/framework/webapp/src/org/ofbiz/webapp/ftl/LoopWriter.java @@ -41,12 +41,15 @@ public class LoopWriter extends Writer implements TransformControl { throw t; } + @Override public void close() throws IOException { } + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { } diff --git a/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java b/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java index f253d5a305..41fa442369 100644 --- a/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java +++ b/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizAmountTransform.java @@ -99,14 +99,17 @@ public class OfbizAmountTransform implements TemplateTransformModel { final String format = OfbizAmountTransform.getArg(args, "format"); return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { if (Debug.verboseOn()) Debug.logVerbose("parms: " + amount + " " + format + " " + locale, module); diff --git a/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java b/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java index 2969ce419f..b369995888 100644 --- a/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java +++ b/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java @@ -24,10 +24,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; -import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.StringUtil; import org.ofbiz.webapp.taglib.ContentUrlTag; -import org.owasp.esapi.errors.EncodingException; import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; @@ -44,14 +41,17 @@ public class OfbizContentTransform implements TemplateTransformModel { public Writer getWriter(final Writer out, Map args) { final StringBuilder buf = new StringBuilder(); return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { Environment env = Environment.getCurrentEnvironment(); diff --git a/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java b/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java index 6e10cf731a..b32f9e9dec 100644 --- a/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java +++ b/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCurrencyTransform.java @@ -125,14 +125,17 @@ public class OfbizCurrencyTransform implements TemplateTransformModel { final int rounding = roundingNumber; return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { if (Debug.verboseOn()) Debug.logVerbose("parms: " + amount + " " + isoCode + " " + locale, module); diff --git a/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java b/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java index c2a01bdd20..6d2dda335e 100644 --- a/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java +++ b/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java @@ -65,14 +65,17 @@ public class OfbizUrlTransform implements TemplateTransformModel { final boolean encode = checkArg(args, "encode", true); return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { try { Environment env = Environment.getCurrentEnvironment(); diff --git a/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java b/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java index 2ca2732ace..f41afbf15d 100644 --- a/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java +++ b/framework/webapp/src/org/ofbiz/webapp/ftl/RenderWrappedTextTransform.java @@ -44,13 +44,16 @@ public class RenderWrappedTextTransform implements TemplateTransformModel { return new Writer(out) { + @Override public void write(char cbuf[], int off, int len) { } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { if (UtilValidate.isNotEmpty(wrappedFTL)) { out.write(wrappedFTL); diff --git a/framework/webapp/src/org/ofbiz/webapp/region/Content.java b/framework/webapp/src/org/ofbiz/webapp/region/Content.java index b5a7003288..efe02454d7 100644 --- a/framework/webapp/src/org/ofbiz/webapp/region/Content.java +++ b/framework/webapp/src/org/ofbiz/webapp/region/Content.java @@ -58,6 +58,7 @@ public abstract class Content implements java.io.Serializable { return type; } + @Override public String toString() { return "Content: " + content + ", type: " + type; } diff --git a/framework/webapp/src/org/ofbiz/webapp/region/Region.java b/framework/webapp/src/org/ofbiz/webapp/region/Region.java index 1aabca8705..1d9b8b770d 100644 --- a/framework/webapp/src/org/ofbiz/webapp/region/Region.java +++ b/framework/webapp/src/org/ofbiz/webapp/region/Region.java @@ -75,6 +75,7 @@ public class Region extends Content { return sections; } + @Override public void render(PageContext pageContext) throws JspException { if (Debug.verboseOn()) Debug.logVerbose("Rendering " + this.toString(), module); @@ -98,6 +99,7 @@ public class Region extends Content { } } + @Override public void render(HttpServletRequest request, HttpServletResponse response) throws java.io.IOException, ServletException { if (Debug.verboseOn()) Debug.logVerbose("Rendering " + this.toString(), module); @@ -114,6 +116,7 @@ public class Region extends Content { rd.include(request, response); } + @Override public String toString() { String s = "Region: " + content + ", type=" + type; diff --git a/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java b/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java index 83d7bafd18..054f79afb0 100644 --- a/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/region/RegionTag.java @@ -77,6 +77,7 @@ public class RegionTag extends TagSupport { regionObj.put(section); } + @Override public void release() { super.release(); regionObj = null; diff --git a/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java b/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java index 036d7fe479..54f6d4be0f 100644 --- a/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/region/RenderTag.java @@ -59,6 +59,7 @@ public class RenderTag extends RegionTag { return sectionName != null; } + @Override public int doStartTag() throws JspException { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); @@ -75,6 +76,7 @@ public class RenderTag extends RegionTag { return EVAL_BODY_INCLUDE; } + @Override public int doEndTag() throws JspException { Region regionEnd = null; @@ -107,6 +109,7 @@ public class RenderTag extends RegionTag { return EVAL_PAGE; } + @Override public void release() { super.release(); sectionName = role = null; diff --git a/framework/webapp/src/org/ofbiz/webapp/region/Section.java b/framework/webapp/src/org/ofbiz/webapp/region/Section.java index 844be0e554..1e641ddbc9 100644 --- a/framework/webapp/src/org/ofbiz/webapp/region/Section.java +++ b/framework/webapp/src/org/ofbiz/webapp/region/Section.java @@ -59,6 +59,7 @@ public class Section extends Content { return name; } + @Override public void render(PageContext pageContext) throws JspException { try { if (UtilJ2eeCompat.doFlushOnRender(pageContext.getServletContext())) { @@ -82,6 +83,7 @@ public class Section extends Content { } } + @Override public void render(HttpServletRequest request, HttpServletResponse response) throws java.io.IOException, ServletException { ServletContext context = (ServletContext) request.getAttribute("servletContext"); boolean verboseOn = Debug.verboseOn(); @@ -175,6 +177,7 @@ public class Section extends Content { } */ + @Override public String toString() { return "Section: " + name + ", info=" + info + ", content=" + content + ", type=" + type; } diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java index b51ca3f2ba..968e55f5e5 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/AbstractParameterTag.java @@ -58,11 +58,13 @@ public abstract class AbstractParameterTag extends TagSupport { return this.outParameters; } + @Override public int doStartTag() throws JspTagException { inParameters = FastMap.newInstance(); return EVAL_BODY_INCLUDE; } + @Override public abstract int doEndTag() throws JspTagException; } diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java index d06c0dd631..ad01240c1e 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java @@ -93,6 +93,7 @@ public class ContentUrlTag extends BodyTagSupport { return buf.toString(); } + @Override public int doEndTag() throws JspException { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java index bc4b3fbc5d..54c5ed9beb 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/EntityFieldTag.java @@ -89,6 +89,7 @@ public class EntityFieldTag extends TagSupport { this.defaultObj = defaultObj; } + @Override public int doStartTag() throws JspException { try { EntityField.run(attribute, field, prefix, suffix, defaultObj.toString(), type, pageContext); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java index 3cd4a59502..5828e7607d 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/FormatTag.java @@ -53,6 +53,7 @@ public class FormatTag extends BodyTagSupport { this.defaultStr = defaultStr; } + @Override public int doAfterBody() throws JspException { NumberFormat nf = null; DateFormat df = null; diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java index 88683d9ec0..7c154d2393 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/I18nBundleTag.java @@ -56,6 +56,7 @@ public class I18nBundleTag extends TagSupport { return this.bundle; } + @Override public int doStartTag() throws JspException { try { this.bundle = UtilProperties.getResourceBundle(this.baseName, UtilHttp.getLocale((HttpServletRequest) pageContext.getRequest())); @@ -75,6 +76,7 @@ public class I18nBundleTag extends TagSupport { return EVAL_BODY_INCLUDE; } + @Override public int doEndTag() throws JspException { return EVAL_PAGE; } diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java index 28862dfac3..eb643b402f 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/I18nMessageTag.java @@ -70,6 +70,7 @@ public class I18nMessageTag extends BodyTagSupport { this.arguments.add(argument); } + @Override public int doStartTag() throws JspException { try { if (this.bundle == null) { @@ -97,6 +98,7 @@ public class I18nMessageTag extends BodyTagSupport { return EVAL_BODY_AGAIN; } + @Override public int doEndTag() throws JspException { try { if (this.value != null && UtilValidate.isNotEmpty(this.arguments)) { diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java index 1245eb614f..741f4694f9 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/IfTag.java @@ -74,6 +74,7 @@ public class IfTag extends BodyTagSupport { return size.toString(); } + @Override public int doStartTag() throws JspTagException { Object object = null; @@ -220,10 +221,12 @@ public class IfTag extends BodyTagSupport { return SKIP_BODY; } + @Override public int doAfterBody() { return SKIP_BODY; } + @Override public int doEndTag() { try { BodyContent body = getBodyContent(); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java index 1d0631f0e4..283f9b848e 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/InputValueTag.java @@ -91,6 +91,7 @@ public class InputValueTag extends TagSupport { this.fullattrsStr = fullattrsStr; } + @Override public int doStartTag() throws JspException { try { InputValue.run(field, param, entityAttr, tryEntityAttr, defaultStr, fullattrsStr, pageContext); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java b/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java index 3adf990805..f75249d1e7 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTEI.java @@ -28,6 +28,7 @@ public class IterateNextTEI extends TagExtraInfo { super(); } + @Override public VariableInfo[] getVariableInfo(TagData data) { String name = null; String className = null; @@ -47,6 +48,7 @@ public class IterateNextTEI extends TagExtraInfo { return result; } + @Override public boolean isValid(TagData data) { return true; } diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java index 3f68343a90..bbc0a751dc 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/IterateNextTag.java @@ -62,6 +62,7 @@ public class IterateNextTag extends BodyTagSupport { return element; } + @Override public int doStartTag() throws JspTagException { IteratorTag iteratorTag = (IteratorTag) findAncestorWithClass(this, IteratorTag.class); @@ -102,10 +103,12 @@ public class IterateNextTag extends BodyTagSupport { return EVAL_BODY_AGAIN; } + @Override public int doAfterBody() { return SKIP_BODY; } + @Override public int doEndTag() { try { BodyContent body = getBodyContent(); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java index 339e184a4e..67db4578c1 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorHasNextTag.java @@ -31,6 +31,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport; */ public class IteratorHasNextTag extends BodyTagSupport { + @Override public int doStartTag() throws JspTagException { IteratorTag iteratorTag = (IteratorTag) findAncestorWithClass(this, IteratorTag.class); @@ -46,10 +47,12 @@ public class IteratorHasNextTag extends BodyTagSupport { return EVAL_BODY_AGAIN; } + @Override public int doAfterBody() { return SKIP_BODY; } + @Override public int doEndTag() { try { BodyContent body = getBodyContent(); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java b/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java index 0b02386afd..c430dcc23f 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTEI.java @@ -31,6 +31,7 @@ public class IteratorTEI extends TagExtraInfo { super(); } + @Override public VariableInfo[] getVariableInfo(TagData data) { String name = null; String className = null; @@ -47,6 +48,7 @@ public class IteratorTEI extends TagExtraInfo { return result; } + @Override public boolean isValid(TagData data) { return true; } diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java index ab62b13bda..8e6ba537ba 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/IteratorTag.java @@ -112,6 +112,7 @@ public class IteratorTag extends BodyTagSupport { return expandMap ? "true" : "false"; } + @Override public int doStartTag() throws JspTagException { Debug.logVerbose("Starting Iterator Tag...", module); @@ -126,6 +127,7 @@ public class IteratorTag extends BodyTagSupport { return SKIP_BODY; } + @Override public int doAfterBody() { if (defineElement()) { return EVAL_BODY_AGAIN; @@ -134,6 +136,7 @@ public class IteratorTag extends BodyTagSupport { } } + @Override public int doEndTag() { try { BodyContent body = getBodyContent(); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java b/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java index 5fc639fb6d..c59bc66bab 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTEI.java @@ -31,6 +31,7 @@ public class ObjectTEI extends TagExtraInfo { super(); } + @Override public VariableInfo[] getVariableInfo(TagData data) { String name = null; String className = null; @@ -47,6 +48,7 @@ public class ObjectTEI extends TagExtraInfo { return result; } + @Override public boolean isValid(TagData data) { return true; } diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java index 2aa57c0263..a00eb25f6c 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/ObjectTag.java @@ -65,6 +65,7 @@ public class ObjectTag extends TagSupport { return type.getName(); } + @Override public int doStartTag() throws JspTagException { String realAttrName = property; @@ -80,6 +81,7 @@ public class ObjectTag extends TagSupport { return EVAL_BODY_INCLUDE; } + @Override public int doEndTag() { return EVAL_PAGE; } diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java index 7101859bd1..226d54fb85 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/ParamTag.java @@ -82,6 +82,7 @@ public class ParamTag extends TagSupport { return this.alias; } + @Override public int doStartTag() throws JspTagException { AbstractParameterTag sTag = (AbstractParameterTag) findAncestorWithClass(this, AbstractParameterTag.class); @@ -122,6 +123,7 @@ public class ParamTag extends TagSupport { return SKIP_BODY; } + @Override public int doEndTag() { return EVAL_PAGE; } diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java index f8dc605239..333251675c 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/PrintTag.java @@ -52,6 +52,7 @@ public class PrintTag extends TagSupport { this.defaultStr = defaultStr; } + @Override public int doStartTag() throws JspException { if (attribute == null) return SKIP_BODY; diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java index dc68c10208..ba70fdd5c1 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/ServiceTag.java @@ -63,6 +63,7 @@ public class ServiceTag extends AbstractParameterTag { return resultScope; } + @Override public int doEndTag() throws JspTagException { LocalDispatcher dispatcher = (LocalDispatcher) pageContext.getRequest().getAttribute("dispatcher"); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java index 8cca364ee9..d280201f06 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/UnlessTag.java @@ -25,6 +25,7 @@ import javax.servlet.jsp.JspTagException; */ public class UnlessTag extends IfTag { + @Override public int doStartTag() throws JspTagException { // do the opposite of what IfTag does. EVAL_BODY_AGAIN -> SKIP_BODY, vice-versa return (EVAL_BODY_AGAIN + SKIP_BODY) - super.doStartTag(); diff --git a/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java b/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java index bb4f2db5e9..057bc66ea4 100644 --- a/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java +++ b/framework/webapp/src/org/ofbiz/webapp/taglib/UrlTag.java @@ -37,6 +37,7 @@ public class UrlTag extends BodyTagSupport { public static final String module = UrlTag.class.getName(); + @Override public int doEndTag() throws JspException { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); diff --git a/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java b/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java index f6fce3a507..a8e995c8d1 100644 --- a/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java +++ b/framework/webapp/src/org/ofbiz/webapp/view/ApacheFopFactory.java @@ -33,6 +33,7 @@ public class ApacheFopFactory { public static final String module = ApacheFopFactory.class.getName(); /** @deprecated use ApacheFopWorker.getFactoryInstance() */ + @Deprecated public static FopFactory instance() { return ApacheFopWorker.getFactoryInstance(); } diff --git a/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java b/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java index bc5081fbe9..1708d2ab55 100644 --- a/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java +++ b/framework/webapp/src/org/ofbiz/webapp/webdav/WebDavServlet.java @@ -91,6 +91,7 @@ public class WebDavServlet extends GenericServlet { } } + @Override public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { request.setAttribute("delegator", this.delegator); request.setAttribute("dispatcher", this.dispatcher); diff --git a/framework/webapp/src/org/ofbiz/webapp/xmlrpc/AliasSupportedTransportFactory.java b/framework/webapp/src/org/ofbiz/webapp/xmlrpc/AliasSupportedTransportFactory.java index 34924bd2d6..95be2507a1 100644 --- a/framework/webapp/src/org/ofbiz/webapp/xmlrpc/AliasSupportedTransportFactory.java +++ b/framework/webapp/src/org/ofbiz/webapp/xmlrpc/AliasSupportedTransportFactory.java @@ -68,6 +68,7 @@ public class AliasSupportedTransportFactory extends XmlRpcTransportFactoryImpl { this.ks = ks; } + @Override public Object sendRequest(XmlRpcRequest req) throws XmlRpcException { XmlRpcHttpClientConfig config = (XmlRpcHttpClientConfig) req.getConfig(); URL serverUrl = config.getServerURL(); @@ -103,20 +104,24 @@ public class AliasSupportedTransportFactory extends XmlRpcTransportFactoryImpl { return con; } + @Override protected void setRequestHeader(String header, String value) { con.setRequestProperty(header, value); } + @Override protected void close() throws XmlRpcClientException { if (con instanceof HttpURLConnection) { ((HttpURLConnection) con).disconnect(); } } + @Override protected boolean isResponseGzipCompressed(XmlRpcStreamRequestConfig config) { return HttpUtil.isUsingGzipEncoding(con.getHeaderField("Content-Encoding")); } + @Override protected InputStream getInputStream() throws XmlRpcException { try { return con.getInputStream(); @@ -125,6 +130,7 @@ public class AliasSupportedTransportFactory extends XmlRpcTransportFactoryImpl { } } + @Override protected void writeRequest(ReqWriter pWriter) throws IOException, XmlRpcException, SAXException { pWriter.write(con.getOutputStream()); } diff --git a/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java b/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java index 991a21e4f5..b853e5ef35 100644 --- a/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java +++ b/framework/webslinger/src/org/ofbiz/webslinger/StatsUpdater.java @@ -113,6 +113,7 @@ public class StatsUpdater { super(owner, field, label, HARD); } + @Override protected Map createValue(GenericPK pk) throws Exception { return new HashMap(); } diff --git a/framework/webslinger/src/org/ofbiz/webslinger/WebslingerBSFServiceEngine.java b/framework/webslinger/src/org/ofbiz/webslinger/WebslingerBSFServiceEngine.java index dbe2b03b29..2b144e28fc 100644 --- a/framework/webslinger/src/org/ofbiz/webslinger/WebslingerBSFServiceEngine.java +++ b/framework/webslinger/src/org/ofbiz/webslinger/WebslingerBSFServiceEngine.java @@ -43,10 +43,12 @@ public class WebslingerBSFServiceEngine extends GenericAsyncEngine { super(dispatcher); } + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { runSync(localName, modelService, context); } + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { Object[] params = new Object[] { dispatcher.getLocalContext(localName), context }; try { diff --git a/framework/webslinger/src/org/ofbiz/webslinger/WebslingerCatalinaContainer.java b/framework/webslinger/src/org/ofbiz/webslinger/WebslingerCatalinaContainer.java index 9303b25212..8ccda2dc4d 100644 --- a/framework/webslinger/src/org/ofbiz/webslinger/WebslingerCatalinaContainer.java +++ b/framework/webslinger/src/org/ofbiz/webslinger/WebslingerCatalinaContainer.java @@ -31,6 +31,7 @@ import org.ofbiz.catalina.container.CatalinaContainer; import org.webslinger.catalina.WebslingerAccessLogValve; public class WebslingerCatalinaContainer extends CatalinaContainer { + @Override protected Engine createEngine(ContainerConfig.Container.Property engineConfig) throws ContainerException { Engine engine = super.createEngine(engineConfig); String logDir = ContainerConfig.getPropertyValue(engineConfig, "access-log-dir", null); diff --git a/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java b/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java index a126cc26aa..315c9114f8 100644 --- a/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java +++ b/framework/webslinger/src/org/ofbiz/webslinger/WebslingerContextMapper.java @@ -70,6 +70,7 @@ public class WebslingerContextMapper extends AbstractMappingWebslingerServletCon super.init(config, UtilProperties.getPropertyValue("webslinger.properties", "moduleBase")); } + @Override protected Layout[] getStartLayouts() throws Exception { ArrayList layouts = new ArrayList(); try { @@ -81,6 +82,7 @@ public class WebslingerContextMapper extends AbstractMappingWebslingerServletCon return layouts.toArray(new Layout[layouts.size()]); } + @Override public void initializeRequest(WebslingerServletContext context, HttpServletRequest request) { request.setAttribute("servletContext", context); Object delegator = context.getAttribute("delegator"); @@ -98,6 +100,7 @@ public class WebslingerContextMapper extends AbstractMappingWebslingerServletCon servletContext.setAttribute("security", security); } + @Override protected void initializeContext(WebslingerServletContext context, Layout layout) throws Exception { OfbizLayout ofbizLayout = (OfbizLayout) layout; GenericDelegator delegator = GenericDelegator.getGenericDelegator(ofbizLayout.delegatorName); @@ -131,6 +134,7 @@ public class WebslingerContextMapper extends AbstractMappingWebslingerServletCon } } + @Override protected Set getSuffixes() throws Exception { Cache cache = delegator.getCache(); Set suffixes; @@ -147,6 +151,7 @@ public class WebslingerContextMapper extends AbstractMappingWebslingerServletCon return suffixes; } + @Override protected Layout lookupLayout(String hostName, String contextPath) throws Exception { GenericValue layout = EntityUtil.getOnly(delegator.findByAndCache("WebslingerLayout", UtilMisc.toMap("hostName", hostName, "contextPath", contextPath))); if (layout == null) return null; @@ -193,10 +198,12 @@ public class WebslingerContextMapper extends AbstractMappingWebslingerServletCon return bases; } + @Override public int hashCode() { return hashCode; } + @Override public boolean equals(Object o) { if (!(o instanceof OfbizLayout)) return false; OfbizLayout other = (OfbizLayout) o; diff --git a/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java b/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java index 6bf8a01bf8..bcc6375278 100644 --- a/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java +++ b/framework/webslinger/src/org/ofbiz/webslinger/WebslingerServerEngine.java @@ -41,10 +41,12 @@ public class WebslingerServerEngine extends GenericAsyncEngine { super(dispatcher); } + @Override public void runSyncIgnore(String localName, ModelService modelService, Map context) throws GenericServiceException { runSync(localName, modelService, context); } + @Override public Map runSync(String localName, ModelService modelService, Map context) throws GenericServiceException { GenericDelegator delegator = dispatcher.getDelegator(); try { diff --git a/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml b/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml index 0e12a6d0cd..cadf7e909d 100644 --- a/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml +++ b/framework/webslinger/websites/webslinger/www/WEB-INF/web.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + A unique ID used to look up the WebSite entity webSiteId WEBTOOLS - A unique ID used to look up the WebSite entity org.ofbiz.webapp.control.ControlEventListener org.ofbiz.webapp.control.LoginEventListener @@ -22,9 +22,9 @@ 3 - ControlServlet - ControlServlet Main Control Servlet + ControlServlet + ControlServlet org.ofbiz.webapp.control.ControlServlet 1 diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java index 6c1ac315d4..e3dc1dfaf5 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java @@ -33,6 +33,7 @@ public abstract class ArtifactInfoBase implements Comparable { this.aif = aif; } + @Override public boolean equals(Object obj) { if (obj instanceof ArtifactInfoBase) { return this.equals(obj); diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java index 16cbbec0a9..525ac8cf21 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java @@ -207,7 +207,7 @@ public class ArtifactInfoFactory { for (File controllerFile: controllerFiles) { URL controllerUrl = null; try { - controllerUrl = controllerFile.toURL(); + controllerUrl = controllerFile.toURI().toURL(); } catch (MalformedURLException mue) { throw new GeneralException(mue.getMessage()); } diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java index ab16f477db..50cebc97c9 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerRequestArtifactInfo.java @@ -129,6 +129,7 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase { return this.requestUri; } + @Override public String getDisplayName() { String location = UtilURL.getOfbizHomeRelativeLocation(this.controllerXmlUrl); if (location.endsWith("/WEB-INF/controller.xml")) { @@ -137,22 +138,27 @@ public class ControllerRequestArtifactInfo extends ArtifactInfoBase { return this.requestUri + " (" + location + ")"; } + @Override public String getDisplayType() { return "Controller Request"; } + @Override public String getType() { return ArtifactInfoFactory.ControllerRequestInfoTypeId; } + @Override public String getUniqueId() { return this.controllerXmlUrl.toExternalForm() + "#" + this.requestUri; } + @Override public URL getLocationURL() throws MalformedURLException { return this.controllerXmlUrl; } + @Override public boolean equals(Object obj) { if (obj instanceof ControllerRequestArtifactInfo) { ControllerRequestArtifactInfo that = (ControllerRequestArtifactInfo) obj; diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java index fc2d8898bb..9386d05279 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ControllerViewArtifactInfo.java @@ -84,6 +84,7 @@ public class ControllerViewArtifactInfo extends ArtifactInfoBase { return this.viewUri; } + @Override public String getDisplayName() { String location = UtilURL.getOfbizHomeRelativeLocation(this.controllerXmlUrl); if (location.endsWith("/WEB-INF/controller.xml")) { @@ -92,22 +93,27 @@ public class ControllerViewArtifactInfo extends ArtifactInfoBase { return this.viewUri + " (" + location + ")"; } + @Override public String getDisplayType() { return "Controller View"; } + @Override public String getType() { return ArtifactInfoFactory.ControllerViewInfoTypeId; } + @Override public String getUniqueId() { return this.controllerXmlUrl.toExternalForm() + "#" + this.viewUri; } + @Override public URL getLocationURL() throws MalformedURLException { return this.controllerXmlUrl; } + @Override public boolean equals(Object obj) { if (obj instanceof ControllerViewArtifactInfo) { ControllerViewArtifactInfo that = (ControllerViewArtifactInfo) obj; diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java index 10b6906b99..f244ac45db 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java @@ -63,26 +63,32 @@ public class EntityArtifactInfo extends ArtifactInfoBase { return this.modelEntity; } + @Override public String getDisplayName() { return this.getUniqueId(); } + @Override public String getDisplayType() { return "Entity"; } + @Override public String getType() { return ArtifactInfoFactory.EntityInfoTypeId; } + @Override public String getUniqueId() { return this.modelEntity.getEntityName(); } + @Override public URL getLocationURL() throws MalformedURLException { return FlexibleLocation.resolveLocation(this.modelEntity.getLocation(), null); } + @Override public boolean equals(Object obj) { if (obj instanceof EntityArtifactInfo) { return this.modelEntity.getEntityName().equals(((EntityArtifactInfo) obj).modelEntity.getEntityName()); diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java index 488b425d62..feef66672b 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java @@ -182,27 +182,33 @@ public class FormWidgetArtifactInfo extends ArtifactInfoBase { } } + @Override public String getDisplayName() { // remove the component:// from the location return this.formName + " (" + this.formLocation.substring(12) + ")"; } + @Override public String getDisplayType() { return "Form Widget"; } + @Override public String getType() { return ArtifactInfoFactory.FormWidgetInfoTypeId; } + @Override public String getUniqueId() { return this.formLocation + "#" + this.formName; } + @Override public URL getLocationURL() throws MalformedURLException { return FlexibleLocation.resolveLocation(this.formLocation, null); } + @Override public boolean equals(Object obj) { if (obj instanceof FormWidgetArtifactInfo) { return (this.modelForm.getName().equals(((FormWidgetArtifactInfo) obj).modelForm.getName()) && diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java index fd2bc31e1e..bb98939008 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java @@ -168,27 +168,33 @@ public class ScreenWidgetArtifactInfo extends ArtifactInfoBase { } } + @Override public String getDisplayName() { // remove the component:// from the location return this.screenName + " (" + this.screenLocation.substring(12) + ")"; } + @Override public String getDisplayType() { return "Screen Widget"; } + @Override public String getType() { return ArtifactInfoFactory.ScreenWidgetInfoTypeId; } + @Override public String getUniqueId() { return this.screenLocation + "#" + this.screenName; } + @Override public URL getLocationURL() throws MalformedURLException { return FlexibleLocation.resolveLocation(this.screenLocation, null); } + @Override public boolean equals(Object obj) { if (obj instanceof ScreenWidgetArtifactInfo) { return (this.modelScreen.getName().equals(((ScreenWidgetArtifactInfo) obj).modelScreen.getName()) && diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java index cd53574ca7..8ddbe4942d 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java @@ -234,6 +234,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase { this.displayPrefix = displayPrefix; } + @Override public String getDisplayName() { return this.getDisplayPrefixedName(); } @@ -241,18 +242,22 @@ public class ServiceArtifactInfo extends ArtifactInfoBase { return (this.displayPrefix != null ? this.displayPrefix : "") + this.modelService.name; } + @Override public String getDisplayType() { return "Service"; } + @Override public String getType() { return ArtifactInfoFactory.ServiceInfoTypeId; } + @Override public String getUniqueId() { return this.modelService.name; } + @Override public URL getLocationURL() throws MalformedURLException { return FlexibleLocation.resolveLocation(this.modelService.definitionLocation, null); } @@ -553,6 +558,7 @@ public class ServiceArtifactInfo extends ArtifactInfoBase { return topLevelMap; } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceArtifactInfo) { return this.modelService.name.equals(((ServiceArtifactInfo) obj).modelService.name); diff --git a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java index 0fe340691f..27795a5e40 100644 --- a/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java +++ b/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java @@ -64,22 +64,27 @@ public class ServiceEcaArtifactInfo extends ArtifactInfoBase { } } + @Override public String getDisplayName() { return this.getDisplayPrefixedName(); } + @Override public String getDisplayType() { return "Service ECA"; } + @Override public String getType() { return ArtifactInfoFactory.ServiceEcaInfoTypeId; } + @Override public String getUniqueId() { return this.serviceEcaRule.toString(); } + @Override public URL getLocationURL() throws MalformedURLException { return FlexibleLocation.resolveLocation(this.serviceEcaRule.getDefinitionLocation(), null); } @@ -179,6 +184,7 @@ public class ServiceEcaArtifactInfo extends ArtifactInfoBase { return topLevelMap; } + @Override public boolean equals(Object obj) { if (obj instanceof ServiceEcaArtifactInfo) { ServiceEcaArtifactInfo that = (ServiceEcaArtifactInfo) obj; diff --git a/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java b/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java index f5f8950862..ce30ef349d 100644 --- a/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java +++ b/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java @@ -120,7 +120,7 @@ public class LabelManagerFactory { if (UtilValidate.isNotEmpty(fileName) && !fileName.equals(fileInfo.getFileName())) { continue; } - Document resourceDocument = UtilXml.readXmlDocument(fileInfo.file.toURL(), false); + Document resourceDocument = UtilXml.readXmlDocument(fileInfo.file.toURI().toURL(), false); Element resourceElem = resourceDocument.getDocumentElement(); String labelKeyComment = ""; for (Node propertyNode : UtilXml.childNodeList(resourceElem.getFirstChild())) { diff --git a/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java b/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java index 40d06aa3d3..10c0c15309 100644 --- a/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java +++ b/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java @@ -245,7 +245,7 @@ public class LabelReferences { private void getLabelsFromFormWidgets(String inFile, File file) throws MalformedURLException, SAXException, ParserConfigurationException, IOException, GenericServiceException { Set fieldNames = FastSet.newInstance(); findUiLabelMapInFile(inFile, file.getPath()); - Document formDocument = UtilXml.readXmlDocument(file.toURL()); + Document formDocument = UtilXml.readXmlDocument(file.toURI().toURL()); Element rootElem = formDocument.getDocumentElement(); for (Element formElement : UtilXml.childElementList(rootElem, "form")) { for (Element elem : UtilXml.childElementList(formElement, "auto-fields-service")) { @@ -267,7 +267,7 @@ public class LabelReferences { List componentsFiles = FileUtil.findXmlFiles(null, null, "ofbiz-component", "http://ofbiz.apache.org/dtds/ofbiz-component.xsd"); for (File componentFile : componentsFiles) { String filePath = componentFile.getPath(); - Document menuDocument = UtilXml.readXmlDocument(componentFile.toURL()); + Document menuDocument = UtilXml.readXmlDocument(componentFile.toURI().toURL()); Element rootElem = menuDocument.getDocumentElement(); for (Element elem1 : UtilXml.childElementList(rootElem)) { checkOfbizComponentTag(elem1, filePath); diff --git a/framework/webtools/webapp/webtools/entity/tablesMySql.jsp b/framework/webtools/webapp/webtools/entity/tablesMySql.jsp index c82372d0ec..4c66764b95 100644 --- a/framework/webtools/webapp/webtools/entity/tablesMySql.jsp +++ b/framework/webtools/webapp/webtools/entity/tablesMySql.jsp @@ -19,14 +19,14 @@ under the License. <%@ page contentType="text/plain" %><%@ page import="java.util.*" %><%@ page import="org.ofbiz.entity.*" %><%@ page import="org.ofbiz.entity.model.*" %><% if(security.hasPermission("ENTITY_MAINT", session)) { ModelReader reader = delegator.getModelReader(); - Collection ec = reader.getEntityNames(); - TreeSet entities = new TreeSet(ec); - Iterator classNamesIterator = entities.iterator(); + Collection ec = reader.getEntityNames(); + TreeSet entities = new TreeSet(ec); + Iterator classNamesIterator = entities.iterator(); while(classNamesIterator != null && classNamesIterator.hasNext()) { ModelEntity entity = reader.getModelEntity((String)classNamesIterator.next());%> -CREATE TABLE <%=entity.getPlainTableName()%> (<%for(int i=0;i<%if(field.isPk){%> - <%=field.colName%> <%=type.sqlType%> NOT NULL,<%}else{%> - <%=field.colName%> <%=type.sqlType%>,<%}%><%}%> - CONSTRAINT PK_<%=entity.getPlainTableName()%> PRIMARY KEY (<%=entity.colNameString(entity.pks)%>)); +CREATE TABLE <%=entity.getPlainTableName()%> (<%for (String fieldName : entity.getAllFieldNames()){ModelField field=entity.getField(fieldName); ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());%><%if(field.getIsPk()){%> + <%=field.getColName()%> <%=type.getSqlType()%> NOT NULL,<%}else{%> + <%=field.getColName()%> <%=type.getSqlType()%>,<%}%><%}%> + CONSTRAINT PK_<%=entity.getPlainTableName()%> PRIMARY KEY (<%=entity.colNameString(entity.getPkFieldsUnmodifiable())%>)); <%}%> <% } diff --git a/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java b/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java index 5266aa4b58..80d119b152 100644 --- a/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java +++ b/framework/widget/src/org/ofbiz/widget/cache/GenericWidgetOutput.java @@ -28,6 +28,7 @@ public class GenericWidgetOutput { this.output = output; } + @Override public String toString() { return this.output; } diff --git a/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java b/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java index 1df50c017f..e4fd4622e0 100644 --- a/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java +++ b/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java @@ -87,10 +87,12 @@ public class WidgetContextCacheKey { this.context.putAll(context); } + @Override public int hashCode() { return 0; } + @Override public boolean equals(Object obj) { WidgetContextCacheKey key = null; if (obj instanceof WidgetContextCacheKey) { @@ -133,6 +135,7 @@ public class WidgetContextCacheKey { return true; } + @Override public String toString() { Map printableMap = FastMap.newInstance(); for (String fieldName: this.context.keySet()) { diff --git a/framework/widget/src/org/ofbiz/widget/form/ModelForm.java b/framework/widget/src/org/ofbiz/widget/form/ModelForm.java index 6ebbdebd55..04c4f483c7 100644 --- a/framework/widget/src/org/ofbiz/widget/form/ModelForm.java +++ b/framework/widget/src/org/ofbiz/widget/form/ModelForm.java @@ -1850,6 +1850,7 @@ public class ModelForm extends ModelWidget { return lstNm; } + @Override public String getName() { return this.name; } @@ -1935,6 +1936,7 @@ public class ModelForm extends ModelWidget { return this.type; } + @Override public String getBoundaryCommentName() { return formLocation + "#" + name; } @@ -2586,9 +2588,11 @@ public class ModelForm extends ModelWidget { this.useWhen = altTargetElement.getAttribute("use-when"); this.targetExdr = FlexibleStringExpander.getInstance(altTargetElement.getAttribute("target")); } + @Override public int hashCode() { return useWhen.hashCode(); } + @Override public boolean equals(Object obj) { return obj instanceof AltTarget && obj.hashCode() == this.hashCode(); } @@ -2619,9 +2623,11 @@ public class ModelForm extends ModelWidget { this.areaId = areaId; this.areaTarget = areaTarget; } + @Override public int hashCode() { return areaId.hashCode(); } + @Override public boolean equals(Object obj) { return obj instanceof UpdateArea && obj.hashCode() == this.hashCode(); } diff --git a/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java b/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java index cd24584ae0..b11925a63d 100644 --- a/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java +++ b/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java @@ -125,6 +125,7 @@ public abstract class ModelFormAction { } } + @Override public void runAction(Map context) { String globalStr = this.globalExdr.expandString(context); // default to false @@ -188,6 +189,7 @@ public abstract class ModelFormAction { this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global")); } + @Override public void runAction(Map context) { String globalStr = this.globalExdr.expandString(context); // default to false @@ -228,6 +230,7 @@ public abstract class ModelFormAction { this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global")); } + @Override public void runAction(Map context) { //String globalStr = this.globalExdr.expandString(context); // default to false @@ -271,6 +274,7 @@ public abstract class ModelFormAction { this.location = scriptElement.getAttribute("location"); } + @Override public void runAction(Map context) { if (location.endsWith(".bsh")) { try { @@ -327,6 +331,7 @@ public abstract class ModelFormAction { this.fieldMap = EntityFinderUtil.makeFieldMap(serviceElement); } + @Override public void runAction(Map context) { String serviceNameExpanded = this.serviceNameExdr.expandString(context); if (UtilValidate.isEmpty(serviceNameExpanded)) { @@ -391,6 +396,7 @@ public abstract class ModelFormAction { finder = new PrimaryKeyFinder(entityOneElement); } + @Override public void runAction(Map context) { try { finder.runFind(context, this.modelForm.getDelegator(context)); @@ -427,6 +433,7 @@ public abstract class ModelFormAction { finder = new ByAndFinder(entityAndElement); } + @Override public void runAction(Map context) { try { // don't want to do this: context.put("defaultFormResultList", null); @@ -470,6 +477,7 @@ public abstract class ModelFormAction { finder = new ByConditionFinder(entityConditionElement); } + @Override public void runAction(Map context) { try { // don't want to do this: context.put("defaultFormResultList", null); diff --git a/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java b/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java index 34484a64a8..94f2903d33 100644 --- a/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java +++ b/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java @@ -1602,6 +1602,7 @@ public class ModelFormField { this.fieldInfo = fieldInfo; } + @Override public void addOptionValues(List optionValues, Map context, GenericDelegator delegator) { optionValues.add(new OptionValue(key.expandString(context), description.expandString(context))); } @@ -1630,6 +1631,7 @@ public class ModelFormField { this.fieldInfo = fieldInfo; } + @Override public void addOptionValues(List optionValues, Map context, GenericDelegator delegator) { List dataList = UtilGenerics.checkList(this.listAcsr.get(context)); if (dataList != null && dataList.size() != 0) { @@ -1697,6 +1699,7 @@ public class ModelFormField { } } + @Override public void addOptionValues(List optionValues, Map context, GenericDelegator delegator) { // first expand any conditions that need expanding based on the current context EntityCondition findCondition = null; @@ -2046,6 +2049,7 @@ public class ModelFormField { } } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderDisplayField(writer, context, this); } @@ -2161,6 +2165,7 @@ public class ModelFormField { } } + @Override public String getDescription(Map context) { Locale locale = UtilMisc.ensureLocale(context.get("locale")); @@ -2248,6 +2253,7 @@ public class ModelFormField { } } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderHyperlinkField(writer, context, this); } @@ -2604,6 +2610,7 @@ public class ModelFormField { } } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderTextField(writer, context, this); } @@ -2716,6 +2723,7 @@ public class ModelFormField { } } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderTextareaField(writer, context, this); } @@ -2817,6 +2825,7 @@ public class ModelFormField { clock = element.getAttribute("clock"); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderDateTimeField(writer, context, this); } @@ -2940,6 +2949,7 @@ public class ModelFormField { } } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderDropDownField(writer, context, this); } @@ -3044,6 +3054,7 @@ public class ModelFormField { super(element, modelFormField); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderRadioField(writer, context, this); } @@ -3070,6 +3081,7 @@ public class ModelFormField { allChecked = FlexibleStringExpander.getInstance(element.getAttribute("all-checked")); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderCheckField(writer, context, this); } @@ -3108,6 +3120,7 @@ public class ModelFormField { this.backgroundSubmitRefreshTargetExdr = FlexibleStringExpander.getInstance(element.getAttribute("background-submit-refresh-target")); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderSubmitField(writer, context, this); } @@ -3156,6 +3169,7 @@ public class ModelFormField { super(element, modelFormField); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderResetField(writer, context, this); } @@ -3181,6 +3195,7 @@ public class ModelFormField { this.setValue(element.getAttribute("value")); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderHiddenField(writer, context, this); } @@ -3220,6 +3235,7 @@ public class ModelFormField { super(element, modelFormField); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderIgnoredField(writer, context, this); } @@ -3261,6 +3277,7 @@ public class ModelFormField { return this.hideOptions; } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderTextFindField(writer, context, this); } @@ -3280,6 +3297,7 @@ public class ModelFormField { super(fieldSource, modelFormField); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderDateFindField(writer, context, this); } @@ -3307,6 +3325,7 @@ public class ModelFormField { super(fieldSource, modelFormField); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderRangeFindField(writer, context, this); } @@ -3342,6 +3361,7 @@ public class ModelFormField { super(fieldSource, modelFormField); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderLookupField(writer, context, this); } @@ -3373,6 +3393,7 @@ public class ModelFormField { this.descriptionFieldName = str; } + @Override public SubHyperlink getSubHyperlink() { return this.subHyperlink; } @@ -3388,6 +3409,7 @@ public class ModelFormField { super(fieldSource, modelFormField); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderFileField(writer, context, this); } @@ -3403,6 +3425,7 @@ public class ModelFormField { super(fieldSource, modelFormField); } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderPasswordField(writer, context, this); } @@ -3471,6 +3494,7 @@ public class ModelFormField { } } + @Override public void renderFieldString(Appendable writer, Map context, FormStringRenderer formStringRenderer) throws IOException { formStringRenderer.renderImageField(writer, context, this); } diff --git a/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java b/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java index 97d60ce586..839a6368a6 100644 --- a/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java +++ b/framework/widget/src/org/ofbiz/widget/html/HtmlMenuWrapperImage.java @@ -50,10 +50,12 @@ public class HtmlMenuWrapperImage extends HtmlMenuWrapper { super(resourceName, menuName, request, response); } + @Override public MenuStringRenderer getMenuRenderer() { return new HtmlMenuRendererImage(request, response); } + @Override public void init(String resourceName, String menuName, HttpServletRequest request, HttpServletResponse response) throws IOException, SAXException, ParserConfigurationException { diff --git a/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java b/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java index c0a44871b0..6088fdc3e7 100644 --- a/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java +++ b/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java @@ -422,7 +422,9 @@ public class HtmlScreenRenderer extends HtmlWidgetRenderer implements ScreenStri public ScreenletMenuRenderer(HttpServletRequest request, HttpServletResponse response) { super(request, response); } + @Override public void renderMenuOpen(Appendable writer, Map context, ModelMenu modelMenu) {} + @Override public void renderMenuClose(Appendable writer, Map context, ModelMenu modelMenu) {} } diff --git a/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java b/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java index 2476338470..816ee06090 100644 --- a/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java +++ b/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java @@ -140,6 +140,7 @@ public class MenuWrapTransform implements TemplateTransformModel { return new LoopWriter(out) { + @Override public int onStart() throws TemplateModelException, IOException { String renderOnStart = (String)templateCtx.get("renderOnStart"); if (renderOnStart != null && renderOnStart.equalsIgnoreCase("true")) { @@ -148,14 +149,17 @@ public class MenuWrapTransform implements TemplateTransformModel { return TransformControl.EVALUATE_BODY; } + @Override public void write(char cbuf[], int off, int len) { buf.append(cbuf, off, len); } + @Override public void flush() throws IOException { out.flush(); } + @Override public void close() throws IOException { FreeMarkerWorker.reloadValues(templateCtx, savedValues, env); String wrappedContent = buf.toString(); diff --git a/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java b/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java index ff321f48d9..328633f535 100644 --- a/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java +++ b/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java @@ -432,6 +432,7 @@ public class ModelMenu extends ModelWidget { return this.type; } + @Override public String getBoundaryCommentName() { return menuLocation + "#" + name; } diff --git a/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java b/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java index 9c9ef236ea..db1cf6447e 100644 --- a/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java +++ b/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java @@ -138,6 +138,7 @@ public abstract class ModelMenuAction { } } + @Override public void runAction(Map context) { String globalStr = this.globalExdr.expandString(context); // default to false @@ -247,6 +248,7 @@ public abstract class ModelMenuAction { this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global")); } + @Override public void runAction(Map context) { String globalStr = this.globalExdr.expandString(context); // default to false @@ -287,6 +289,7 @@ public abstract class ModelMenuAction { this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global")); } + @Override public void runAction(Map context) { // default to false @@ -328,6 +331,7 @@ public abstract class ModelMenuAction { this.location = scriptElement.getAttribute("location"); } + @Override public void runAction(Map context) { if (location.endsWith(".bsh")) { try { @@ -375,6 +379,7 @@ public abstract class ModelMenuAction { } } + @Override public void runAction(Map context) { String serviceNameExpanded = this.serviceNameExdr.expandString(context); if (UtilValidate.isEmpty(serviceNameExpanded)) { @@ -423,6 +428,7 @@ public abstract class ModelMenuAction { finder = new PrimaryKeyFinder(entityOneElement); } + @Override public void runAction(Map context) { try { finder.runFind(context, this.modelMenu.getDelegator()); @@ -442,6 +448,7 @@ public abstract class ModelMenuAction { finder = new ByAndFinder(entityAndElement); } + @Override public void runAction(Map context) { try { finder.runFind(context, this.modelMenu.getDelegator()); @@ -461,6 +468,7 @@ public abstract class ModelMenuAction { finder = new ByConditionFinder(entityConditionElement); } + @Override public void runAction(Map context) { try { finder.runFind(context, this.modelMenu.getDelegator()); diff --git a/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java b/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java index 888aecf22d..ef87eea281 100644 --- a/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java +++ b/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java @@ -152,6 +152,7 @@ public class ModelMenuCondition { this.subConditions = readSubConditions(modelMenuItem, condElement); } + @Override public boolean eval(Map context) { // return false for the first one in the list that is false, basic and algo for (MenuCondition subCondition: this.subConditions) { @@ -171,6 +172,7 @@ public class ModelMenuCondition { this.subConditions = readSubConditions(modelMenuItem, condElement); } + @Override public boolean eval(Map context) { // if more than one is true stop immediately and return false; if all are false return false; if only one is true return true boolean foundOneTrue = false; @@ -196,6 +198,7 @@ public class ModelMenuCondition { this.subConditions = readSubConditions(modelMenuItem, condElement); } + @Override public boolean eval(Map context) { // return true for the first one in the list that is true, basic or algo for (MenuCondition subCondition: this.subConditions) { @@ -216,6 +219,7 @@ public class ModelMenuCondition { this.subCondition = readCondition(modelMenuItem, firstChildElement); } + @Override public boolean eval(Map context) { return !this.subCondition.eval(context); } @@ -233,6 +237,7 @@ public class ModelMenuCondition { this.resExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("resource-description")); } + @Override public boolean eval(Map context) { // if no user is logged in, treat as if the user does not have permission GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -302,6 +307,7 @@ public class ModelMenuCondition { this.actionExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("action")); } + @Override public boolean eval(Map context) { // if no user is logged in, treat as if the user does not have permission GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -341,6 +347,7 @@ public class ModelMenuCondition { this.classExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("class")); } + @Override public boolean eval(Map context) { String methodName = this.methodExdr.expandString(context); String className = this.classExdr.expandString(context); @@ -408,6 +415,7 @@ public class ModelMenuCondition { this.formatExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("format")); } + @Override public boolean eval(Map context) { String value = this.valueExdr.expandString(context); String format = this.formatExdr.expandString(context); @@ -458,6 +466,7 @@ public class ModelMenuCondition { this.formatExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("format")); } + @Override public boolean eval(Map context) { String format = this.formatExdr.expandString(context); @@ -501,6 +510,7 @@ public class ModelMenuCondition { this.exprExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("expr")); } + @Override public boolean eval(Map context) { Object fieldVal = this.fieldAcsr.get(context); String expr = this.exprExdr.expandString(context); @@ -535,6 +545,7 @@ public class ModelMenuCondition { if (this.fieldAcsr.isEmpty()) this.fieldAcsr = FlexibleMapAccessor.getInstance(condElement.getAttribute("field-name")); } + @Override public boolean eval(Map context) { Object fieldVal = this.fieldAcsr.get(context); return ObjectType.isEmpty(fieldVal); @@ -548,6 +559,7 @@ public class ModelMenuCondition { this.permissionChecker = new EntityPermissionChecker(condElement); } + @Override public boolean eval(Map context) { boolean passed = permissionChecker.runPermissionCheck(context); diff --git a/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java b/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java index 8758df4fd5..21808a8d3b 100644 --- a/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java +++ b/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java @@ -61,6 +61,7 @@ public class HtmlWidget extends ModelScreenWidget { // not sure if this is the best way to get FTL to use my fancy MapModel derivative, but should work at least... public static class ExtendedWrapper extends BeansWrapper { + @Override public TemplateModel wrap(Object object) throws TemplateModelException { /* NOTE: don't use this and the StringHtmlWrapperForFtl or things will be double-encoded if (object instanceof GenericValue) { @@ -79,6 +80,7 @@ public class HtmlWidget extends ModelScreenWidget { public StringHtmlWrapperForFtl(String str, BeansWrapper wrapper) { super(str, wrapper); } + @Override public String getAsString() { return StringUtil.htmlEncoder.encode(super.getAsString()); } @@ -102,12 +104,14 @@ public class HtmlWidget extends ModelScreenWidget { } } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { for (ModelScreenWidget subWidget : subWidgets) { subWidget.renderWidgetString(writer, context, screenStringRenderer); } } + @Override public String rawString() { StringBuilder buffer = new StringBuilder(""); for (ModelScreenWidget subWidget : subWidgets) { @@ -241,10 +245,12 @@ public class HtmlWidget extends ModelScreenWidget { this.locationExdr = FlexibleStringExpander.getInstance(htmlTemplateElement.getAttribute("location")); } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) { renderHtmlTemplate(writer, this.locationExdr, context); } + @Override public String rawString() { return ""; } @@ -265,6 +271,7 @@ public class HtmlWidget extends ModelScreenWidget { } } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) { // isolate the scope MapStack contextMs; @@ -288,6 +295,7 @@ public class HtmlWidget extends ModelScreenWidget { contextMs.pop(); } + @Override public String rawString() { return ""; } @@ -305,11 +313,13 @@ public class HtmlWidget extends ModelScreenWidget { this.subWidgets = ModelScreenWidget.readSubWidgets(this.modelScreen, subElementList); } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { // render sub-widgets renderSubWidgetsString(this.subWidgets, writer, context, screenStringRenderer); } + @Override public String rawString() { return ""; } diff --git a/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java b/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java index 02d4080114..629cd568be 100644 --- a/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java +++ b/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java @@ -96,6 +96,7 @@ public class IterateSectionWidget extends ModelScreenWidget { } } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { boolean isEntrySet = false; @@ -399,6 +400,7 @@ public class IterateSectionWidget extends ModelScreenWidget { } + @Override public String rawString() { // TODO: something more than the empty tag return ""; diff --git a/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java b/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java index 61a8b47265..88b3d668d7 100644 --- a/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java +++ b/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java @@ -144,6 +144,7 @@ public abstract class ModelScreenAction implements Serializable { } } + @Override public void runAction(Map context) { String globalStr = this.globalExdr.expandString(context); // default to false @@ -290,6 +291,7 @@ public abstract class ModelScreenAction implements Serializable { this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global")); } + @Override public void runAction(Map context) { String globalStr = this.globalExdr.expandString(context); // default to false @@ -353,6 +355,7 @@ public abstract class ModelScreenAction implements Serializable { this.globalExdr = FlexibleStringExpander.getInstance(setElement.getAttribute("global")); } + @Override public void runAction(Map context) { //String globalStr = this.globalExdr.expandString(context); // default to false @@ -396,6 +399,7 @@ public abstract class ModelScreenAction implements Serializable { this.location = scriptElement.getAttribute("location"); } + @Override public void runAction(Map context) throws GeneralException { if (location.endsWith(".bsh")) { try { @@ -443,6 +447,7 @@ public abstract class ModelScreenAction implements Serializable { this.fieldMap = EntityFinderUtil.makeFieldMap(serviceElement); } + @Override public void runAction(Map context) { String serviceNameExpanded = this.serviceNameExdr.expandString(context); if (UtilValidate.isEmpty(serviceNameExpanded)) { @@ -512,6 +517,7 @@ public abstract class ModelScreenAction implements Serializable { finder = new PrimaryKeyFinder(entityOneElement); } + @Override public void runAction(Map context) { try { finder.runFind(context, this.modelScreen.getDelegator(context)); @@ -531,6 +537,7 @@ public abstract class ModelScreenAction implements Serializable { finder = new ByAndFinder(entityAndElement); } + @Override public void runAction(Map context) { try { finder.runFind(context, this.modelScreen.getDelegator(context)); @@ -550,6 +557,7 @@ public abstract class ModelScreenAction implements Serializable { finder = new ByConditionFinder(entityConditionElement); } + @Override public void runAction(Map context) { try { finder.runFind(context, this.modelScreen.getDelegator(context)); @@ -577,6 +585,7 @@ public abstract class ModelScreenAction implements Serializable { this.useCache = "true".equals(getRelatedOneElement.getAttribute("use-cache")); } + @Override public void runAction(Map context) { Object valueObject = valueNameAcsr.get(context); if (valueObject == null) { @@ -626,6 +635,7 @@ public abstract class ModelScreenAction implements Serializable { this.useCache = "true".equals(getRelatedElement.getAttribute("use-cache")); } + @Override public void runAction(Map context) { Object valueObject = valueNameAcsr.get(context); if (valueObject == null) { diff --git a/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java b/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java index 03fe216504..ed4be2c009 100644 --- a/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java +++ b/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java @@ -136,6 +136,7 @@ public class ModelScreenCondition implements Serializable { this.subConditions = readSubConditions(modelScreen, condElement); } + @Override public boolean eval(Map context) { // return false for the first one in the list that is false, basic and algo for (ScreenCondition subCondition: this.subConditions) { @@ -155,6 +156,7 @@ public class ModelScreenCondition implements Serializable { this.subConditions = readSubConditions(modelScreen, condElement); } + @Override public boolean eval(Map context) { // if more than one is true stop immediately and return false; if all are false return false; if only one is true return true boolean foundOneTrue = false; @@ -180,6 +182,7 @@ public class ModelScreenCondition implements Serializable { this.subConditions = readSubConditions(modelScreen, condElement); } + @Override public boolean eval(Map context) { // return true for the first one in the list that is true, basic or algo for (ScreenCondition subCondition: this.subConditions) { @@ -200,6 +203,7 @@ public class ModelScreenCondition implements Serializable { this.subCondition = readCondition(modelScreen, firstChildElement); } + @Override public boolean eval(Map context) { return !this.subCondition.eval(context); } @@ -219,6 +223,7 @@ public class ModelScreenCondition implements Serializable { this.resExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("resource-description")); } + @Override public boolean eval(Map context) { // if no user is logged in, treat as if the user does not have permission GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -298,6 +303,7 @@ public class ModelScreenCondition implements Serializable { this.actionExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("action")); } + @Override public boolean eval(Map context) { // if no user is logged in, treat as if the user does not have permission GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -337,6 +343,7 @@ public class ModelScreenCondition implements Serializable { this.classExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("class")); } + @Override public boolean eval(Map context) { String methodName = this.methodExdr.expandString(context); String className = this.classExdr.expandString(context); @@ -404,6 +411,7 @@ public class ModelScreenCondition implements Serializable { this.formatExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("format")); } + @Override public boolean eval(Map context) { String value = this.valueExdr.expandString(context); String format = this.formatExdr.expandString(context); @@ -454,6 +462,7 @@ public class ModelScreenCondition implements Serializable { this.formatExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("format")); } + @Override public boolean eval(Map context) { String format = this.formatExdr.expandString(context); @@ -497,6 +506,7 @@ public class ModelScreenCondition implements Serializable { this.exprExdr = FlexibleStringExpander.getInstance(condElement.getAttribute("expr")); } + @Override public boolean eval(Map context) { Object fieldVal = this.fieldAcsr.get(context); String expr = this.exprExdr.expandString(context); @@ -531,6 +541,7 @@ public class ModelScreenCondition implements Serializable { if (this.fieldAcsr.isEmpty()) this.fieldAcsr = FlexibleMapAccessor.getInstance(condElement.getAttribute("field-name")); } + @Override public boolean eval(Map context) { Object fieldVal = this.fieldAcsr.get(context); return ObjectType.isEmpty(fieldVal); @@ -544,6 +555,7 @@ public class ModelScreenCondition implements Serializable { this.permissionChecker = new EntityPermissionChecker(condElement); } + @Override public boolean eval(Map context) { return permissionChecker.runPermissionCheck(context); } diff --git a/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java b/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java index 4a797e249b..fb16fc2870 100644 --- a/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java +++ b/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java @@ -139,6 +139,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa } } + @Override public boolean boundaryCommentsEnabled() { return modelScreen.boundaryCommentsEnabled(); } @@ -205,6 +206,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa } } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { // check the condition, if there is one boolean condTrue = true; @@ -250,6 +252,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa } + @Override public String getBoundaryCommentName() { if (isMainSection) { return modelScreen.getSourceLocation() + "#" + modelScreen.getName(); @@ -258,6 +261,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa } } + @Override public String rawString() { return ""; } @@ -284,6 +288,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa this.subWidgets = ModelScreenWidget.readSubWidgets(this.modelScreen, subElementList); } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { try { screenStringRenderer.renderContainerBegin(writer, context, this); @@ -315,6 +320,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa return this.autoUpdateInterval; } + @Override public String rawString() { return ""; } @@ -380,6 +386,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa } } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { boolean collapsed = initiallyCollapsed; if (this.collapsible) { @@ -445,6 +452,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa return this.tabMenu; } + @Override public String rawString() { return ""; } @@ -460,6 +468,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa this.styleExdr = FlexibleStringExpander.getInstance(separatorElement.getAttribute("style")); } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { screenStringRenderer.renderHorizontalSeparator(writer, context, this); } @@ -472,6 +481,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa return this.styleExdr.expandString(context); } + @Override public String rawString() { return ""; } @@ -489,6 +499,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa this.shareScopeExdr = FlexibleStringExpander.getInstance(includeScreenElement.getAttribute("share-scope")); } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { // if we are not sharing the scope, protect it using the MapStack boolean protectScope = !shareScope(context); @@ -570,6 +581,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa return "true".equals(shareScopeString); } + @Override public String rawString() { return ""; } @@ -592,6 +604,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa } } + @Override @SuppressWarnings("unchecked") public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { // isolate the scope @@ -656,6 +669,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa return this.locationExdr.expandString(context); } + @Override public String rawString() { return ""; } @@ -671,11 +685,13 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa this.subWidgets = ModelScreenWidget.readSubWidgets(this.modelScreen, subElementList); } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { // render sub-widgets renderSubWidgetsString(this.subWidgets, writer, context, screenStringRenderer); } + @Override public String rawString() { return ""; } @@ -687,6 +703,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa super(modelScreen, decoratorSectionElement); } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException { Map preRenderedContent = UtilGenerics.checkMap(context.get("preRenderedContent")); if (preRenderedContent != null && preRenderedContent.containsKey(this.name)) { @@ -708,6 +725,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa } } + @Override public String rawString() { return ""; } @@ -731,6 +749,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa this.styleExdr = FlexibleStringExpander.getInstance(labelElement.getAttribute("style")); } + @Override public void renderWidgetString(Appendable writer, Map context, ScreenStringRenderer screenStringRenderer) { try { screenStringRenderer.renderLabel(writer, context, this); @@ -758,6 +777,7 @@ public abstract class ModelScreenWidget extends ModelWidget implements Serializa return this.styleExdr.expandString(context); } + @Override public String rawString() { return "