You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2006/12/07 11:21:30 UTC
svn commit: r483405 - in /incubator/ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/
applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/ ...
Author: jleroux
Date: Thu Dec 7 02:21:27 2006
New Revision: 483405
URL: http://svn.apache.org/viewvc?view=rev&rev=483405
Log:
A patch from Stefan Huehner "Remove unused variables" (https://issues.apache.org/jira/browse/OFBIZ-525).
Issue is not closed : more patches to come
Modified:
incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java
incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java
incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java
incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java
incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java
incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java
incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java
incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java
incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java
Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Thu Dec 7 02:21:27 2006
@@ -943,7 +943,6 @@
}
public static Map readyInvoices(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = (Locale) context.get("locale");
Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original)
+++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Thu Dec 7 02:21:27 2006
@@ -469,7 +469,6 @@
private static void processAuthTransResult(Map reply, Map results) {
- String version = getVersion();
AuthorizeResponse ar = (AuthorizeResponse)reply.get("authorizeResponse");
Boolean authResult = (Boolean)reply.get("authResult");
results.put("authResult", new Boolean(authResult.booleanValue()));
Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original)
+++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Thu Dec 7 02:21:27 2006
@@ -61,9 +61,7 @@
/** Initiate PayPal Request */
public static String callPayPal(HttpServletRequest request, HttpServletResponse response) {
- ServletContext application = ((ServletContext) request.getAttribute("servletContext"));
GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
- LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
// get the orderId
@@ -164,7 +162,6 @@
/** PayPal Call-Back Event */
public static String payPalIPN(HttpServletRequest request, HttpServletResponse response) {
- ServletContext application = ((ServletContext) request.getAttribute("servletContext"));
GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
@@ -338,8 +335,6 @@
/** Event called when customer cancels a paypal order */
public static String cancelPayPalOrder(HttpServletRequest request, HttpServletResponse response) {
- ServletContext application = ((ServletContext) request.getAttribute("servletContext"));
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java Thu Dec 7 02:21:27 2006
@@ -1347,7 +1347,6 @@
public static Map initContentChildCounts(DispatchContext dctx, Map context) throws GenericServiceException{
Map result = new HashMap();
- GenericDelegator delegator = dctx.getDelegator();
GenericValue content = (GenericValue)context.get("content");
if (content == null) {
@@ -1685,7 +1684,6 @@
*/
public static Map persistContentWithRevision(DispatchContext dctx, Map context) {
Map result = null;
- boolean dataResourceExists = false;
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue dataResource = null;
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java Thu Dec 7 02:21:27 2006
@@ -1024,7 +1024,6 @@
public static Map publishContent(DispatchContext dctx, Map context) throws GenericServiceException{
Map result = new HashMap();
- GenericDelegator delegator = dctx.getDelegator();
GenericValue content = (GenericValue)context.get("content");
GenericValue userLogin = (GenericValue)context.get("userLogin");
Security security = dctx.getSecurity();
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Thu Dec 7 02:21:27 2006
@@ -423,7 +423,6 @@
String parentContentId = (String) parentContent.get("contentId");
//if (Debug.infoOn()) Debug.logInfo("traverse, contentAssocTypeId:" + contentAssocTypeId,null);
Map whenMap = (Map) ctx.get("whenMap");
- Map context = new HashMap();
List kids = new ArrayList();
currentNode.put("kids", kids);
String direction = (String) ctx.get("direction");
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Thu Dec 7 02:21:27 2006
@@ -337,8 +337,6 @@
try {
- LocalDispatcher dispatcher = (LocalDispatcher)request.getAttribute("dispatcher");
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
HttpSession session = request.getSession();
GenericValue userLogin = (GenericValue)session.getAttribute("userLogin");
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Thu Dec 7 02:21:27 2006
@@ -936,7 +936,6 @@
if (!file.isAbsolute()) {
throw new GeneralException("File (" + objectInfo + ") is not absolute");
}
- int c;
} else if (dataResourceTypeId.equals("OFBIZ_FILE") || dataResourceTypeId.equals("OFBIZ_FILE_BIN")) {
String prefix = System.getProperty("ofbiz.home");
String sep = "";
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java Thu Dec 7 02:21:27 2006
@@ -55,8 +55,6 @@
* A top-level service for creating a DataResource and ElectronicText together.
*/
public static Map createDataResourceAndText(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
Map result = new HashMap();
Map thisResult = createDataResourceMethod(dctx, context);
@@ -89,7 +87,6 @@
public static Map createDataResourceMethod(DispatchContext dctx, Map context) {
Map result = new HashMap();
GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String userLoginId = (String) userLogin.get("userLoginId");
String createdByUserLogin = userLoginId;
@@ -148,7 +145,6 @@
public static Map createElectronicTextMethod(DispatchContext dctx, Map context) {
HashMap result = new HashMap();
GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
String dataResourceId = (String) context.get("dataResourceId");
String textData = (String) context.get("textData");
if (textData != null && textData.length() > 0) {
@@ -178,8 +174,6 @@
}
public static Map createFileMethod(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
//GenericValue dataResource = (GenericValue) context.get("dataResource");
String dataResourceTypeId = (String) context.get("dataResourceTypeId");
String objectInfo = (String) context.get("objectInfo");
@@ -253,8 +247,6 @@
* A top-level service for updating a DataResource and ElectronicText together.
*/
public static Map updateDataResourceAndText(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
Map thisResult = updateDataResourceMethod(dctx, context);
if (thisResult.get(ModelService.RESPONSE_MESSAGE) != null) {
return ServiceUtil.returnError((String) thisResult.get(ModelService.ERROR_MESSAGE));
@@ -284,7 +276,6 @@
Map result = new HashMap();
GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue dataResource = null;
//Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -334,7 +325,6 @@
public static Map updateElectronicTextMethod(DispatchContext dctx, Map context) {
HashMap result = new HashMap();
GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue electronicText = null;
//Locale locale = (Locale) context.get("locale");
String dataResourceId = (String) context.get("dataResourceId");
@@ -383,8 +373,6 @@
public static Map updateFileMethod(DispatchContext dctx, Map context) throws GenericServiceException {
HashMap result = new HashMap();
- GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
//GenericValue fileText = null;
//Locale locale = (Locale) context.get("locale");
//String dataResourceId = (String) dataResource.get("dataResourceId");
@@ -503,8 +491,6 @@
public static Map updateImageMethod(DispatchContext dctx, Map context) {
HashMap result = new HashMap();
GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericValue image = null;
//Locale locale = (Locale) context.get("locale");
String dataResourceId = (String) context.get("dataResourceId");
ByteWrapper byteWrapper = (ByteWrapper)context.get("imageData");
@@ -539,7 +525,6 @@
public static Map createImageMethod(DispatchContext dctx, Map context) {
HashMap result = new HashMap();
GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
String dataResourceId = (String) context.get("dataResourceId");
ByteWrapper byteWrapper = (ByteWrapper)context.get("imageData");
if (byteWrapper != null) {
@@ -573,15 +558,12 @@
public static Map createBinaryFileMethod(DispatchContext dctx, Map context) throws GenericServiceException {
HashMap result = new HashMap();
- GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue dataResource = (GenericValue) context.get("dataResource");
//String dataResourceId = (String) dataResource.get("dataResourceId");
String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId");
String objectInfo = (String) dataResource.get("objectInfo");
byte [] imageData = (byte []) context.get("imageData");
String rootDir = (String)context.get("rootDir");
- String prefix = "";
File file = null;
if (Debug.infoOn()) Debug.logInfo("in createBinaryFileMethod, dataResourceTypeId:" + dataResourceTypeId, module);
if (Debug.infoOn()) Debug.logInfo("in createBinaryFileMethod, objectInfo:" + objectInfo, module);
@@ -628,15 +610,12 @@
public static Map updateBinaryFileMethod(DispatchContext dctx, Map context) throws GenericServiceException {
HashMap result = new HashMap();
- GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue dataResource = (GenericValue) context.get("dataResource");
//String dataResourceId = (String) dataResource.get("dataResourceId");
String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId");
String objectInfo = (String) dataResource.get("objectInfo");
byte [] imageData = (byte []) context.get("imageData");
String rootDir = (String)context.get("rootDir");
- String prefix = "";
File file = null;
if (Debug.infoOn()) Debug.logInfo("in updateBinaryFileMethod, dataResourceTypeId:" + dataResourceTypeId, module);
if (Debug.infoOn()) Debug.logInfo("in updateBinaryFileMethod, objectInfo:" + objectInfo, module);
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Thu Dec 7 02:21:27 2006
@@ -173,7 +173,6 @@
Locale locale = UtilHttp.getLocale(request);
try {
GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator");
- LocalDispatcher dispatcher = (LocalDispatcher)request.getAttribute("dispatcher");
HttpSession session = request.getSession();
Map uploadResults = LayoutWorker.uploadImageAndParameters(request, "imageData");
Map context = (Map)uploadResults.get("formInput");
@@ -231,7 +230,6 @@
public static String replaceSubContent(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher)request.getAttribute("dispatcher");
HttpSession session = request.getSession();
Locale locale = UtilHttp.getLocale(request);
Modified: incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java (original)
+++ incubator/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java Thu Dec 7 02:21:27 2006
@@ -47,7 +47,6 @@
public static Map uploadImageAndParameters(HttpServletRequest request, String uploadField) {
//Debug.logVerbose("in uploadAndStoreImage", "");
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
Locale locale = UtilHttp.getLocale(request);
HashMap results = new HashMap();
Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java Thu Dec 7 02:21:27 2006
@@ -134,10 +134,8 @@
}
public static String createProductionRunsForShipment(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) {
- String errMsg = "";
GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
- Security security = (Security) request.getAttribute("security");
GenericValue userLogin = (GenericValue)request.getSession().getAttribute("userLogin");
String shipmentId = request.getParameter("shipmentId");
Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Thu Dec 7 02:21:27 2006
@@ -60,9 +60,7 @@
public static Map getMaxDepth(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
- LocalDispatcher dispatcher = dctx.getDispatcher();
String productId = (String) context.get("productId");
String fromDateStr = (String) context.get("fromDate");
String bomType = (String) context.get("bomType");
@@ -121,7 +119,6 @@
*/
public static Map updateLowLevelCode(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
String productId = (String) context.get("productIdTo");
@@ -209,7 +206,6 @@
*/
public static Map initLowLevelCode(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
@@ -253,7 +249,6 @@
*/
public static Map searchDuplicatedAncestor(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue)context.get("userLogin");
@@ -288,7 +283,6 @@
public static Map getBOMTree(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue)context.get("userLogin");
@@ -340,10 +334,8 @@
public static Map getManufacturingComponents(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
- Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue)context.get("userLogin");
String productId = (String) context.get("productId");
@@ -428,7 +420,6 @@
public static Map getNotAssembledComponents(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
String productId = (String) context.get("productId");
@@ -482,7 +473,6 @@
//
public static Map createShipmentPackages(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
Locale locale = (Locale) context.get("locale");
@@ -760,10 +750,8 @@
public static Map getProductsInPackages(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
- Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue)context.get("userLogin");
String productId = (String) context.get("productId");
Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Thu Dec 7 02:21:27 2006
@@ -82,7 +82,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -154,9 +153,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
/* TODO: security management and finishing cleaning (ex copy from PartyServices.java)
@@ -427,7 +423,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
/* TODO: security management and finishing cleaning (ex copy from PartyServices.java)
@@ -480,7 +475,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -622,7 +616,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -795,9 +788,6 @@
public static Map getWorkEffortCosts(DispatchContext ctx, Map context) {
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
- LocalDispatcher dispatcher = ctx.getDispatcher();
- Locale locale = (Locale) context.get("locale");
- GenericValue userLogin = (GenericValue) context.get("userLogin");
String workEffortId = (String)context.get("workEffortId");
try {
GenericValue workEffort = delegator.findByPrimaryKey("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId));
@@ -867,7 +857,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
/* TODO: security management and finishing cleaning (ex copy from PartyServices.java)
@@ -942,7 +931,6 @@
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -1012,8 +1000,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -1088,8 +1074,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -1227,8 +1211,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -1261,7 +1243,6 @@
if (lastTask == null) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunTaskNotExists", locale));
}
- String productType = productionRun.getProductProduced().getString("productTypeId");
if ("WIP".equals("productTypeId")) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductIsWIP", locale));
}
@@ -1430,9 +1411,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
- Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
String productionRunTaskId = (String)context.get("workEffortId");
@@ -1534,9 +1512,6 @@
public static Map productionRunTaskReturnMaterial(DispatchContext ctx, Map context) {
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
- Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
String productionRunTaskId = (String)context.get("workEffortId");
@@ -1603,8 +1578,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -1726,8 +1699,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -1753,8 +1724,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -1817,8 +1786,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -1920,8 +1887,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
@@ -2006,7 +1971,6 @@
public static Map createProductionRunsForOrder(DispatchContext dctx, Map context) {
Map result = new HashMap();
- Security security = dctx.getSecurity();
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue)context.get("userLogin");
@@ -2107,7 +2071,6 @@
Map result = ServiceUtil.returnSuccess();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -2152,7 +2115,6 @@
Map result = ServiceUtil.returnSuccess();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -2193,9 +2155,7 @@
*/
public static Map quickChangeProductionRunStatus(DispatchContext ctx, Map context) {
Map result = ServiceUtil.returnSuccess();
- GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -2294,8 +2254,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Timestamp now = UtilDateTime.nowTimestamp();
- Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
String inventoryItemId = (String)context.get("inventoryItemId");
/*
@@ -2338,8 +2296,6 @@
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
Timestamp now = UtilDateTime.nowTimestamp();
- List msgResult = new LinkedList();
- Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
// Mandatory input fields
String inventoryItemId = (String)context.get("inventoryItemId");
Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Thu Dec 7 02:21:27 2006
@@ -74,11 +74,7 @@
public static Map initInventoryEventPlanned(DispatchContext ctx, Map context) {
GenericDelegator delegator = ctx.getDelegator();
- LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
Timestamp now = UtilDateTime.nowTimestamp();
- Locale locale = (Locale) context.get("locale");
- GenericValue userLogin = (GenericValue) context.get("userLogin");
//Erases the old table for the moment and initializes it with the new orders,
//Does not modify the old one now.
@@ -354,9 +350,6 @@
Debug.logInfo("listProductForMrp called", module);
// read parameters from context
GenericDelegator delegator = ctx.getDelegator();
- Security security = ctx.getSecurity();
- Locale locale = (Locale) context.get("locale");
- GenericValue userLogin = (GenericValue) context.get("userLogin");
Long billOfMaterialLevel = (Long) context.get("billOfMaterialLevel");
// Find all products in MrpInventoryEventPlanned, ordered by bom and eventDate
@@ -472,8 +465,6 @@
//Context
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Security security = ctx.getSecurity();
- Locale locale = (Locale) context.get("locale");
GenericValue userLogin = (GenericValue) context.get("userLogin");
Timestamp now = UtilDateTime.nowTimestamp();
Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java Thu Dec 7 02:21:27 2006
@@ -49,8 +49,6 @@
Map result = new HashMap();
GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
- Locale locale = (Locale) context.get("locale");
- GenericValue userLogin = (GenericValue) context.get("userLogin");
// The mandatory IN parameters
String taskId = (String) context.get("taskId");
Modified: incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java Thu Dec 7 02:21:27 2006
@@ -56,7 +56,6 @@
*/
public static Map lookupRoutingTask(DispatchContext ctx, Map context) {
GenericDelegator delegator = ctx.getDelegator();
- GenericValue userLogin = (GenericValue) context.get("userLogin");
Map result = new HashMap();
String workEffortName = (String) context.get("workEffortName");
Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java Thu Dec 7 02:21:27 2006
@@ -55,7 +55,6 @@
public static String processOfflinePayments(HttpServletRequest request, HttpServletResponse response) {
HttpSession session = request.getSession();
- ServletContext application = ((ServletContext) request.getAttribute("servletContext"));
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Thu Dec 7 02:21:27 2006
@@ -298,7 +298,6 @@
// get the returnable quantiy for an order item
public static Map getReturnableQuantity(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
GenericValue orderItem = (GenericValue) context.get("orderItem");
GenericValue product = null;
Locale locale = (Locale) context.get("locale");
@@ -729,7 +728,6 @@
*/
private static Map createBillingAccountFromReturn(GenericValue returnHeader, List returnItems, DispatchContext dctx, Map context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Locale locale = (Locale) context.get("locale");
Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Thu Dec 7 02:21:27 2006
@@ -3604,7 +3604,6 @@
LocalDispatcher dispatcher = ctx.getDispatcher();
// TODO (use the "system" user)
GenericValue userLogin = (GenericValue) context.get("userLogin");
- Locale locale = (Locale) context.get("locale");
String orderId = (String) context.get("orderId");
OrderReadHelper orh = new OrderReadHelper(delegator, orderId);
Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Thu Dec 7 02:21:27 2006
@@ -460,8 +460,6 @@
}
public static String quickInitPurchaseOrder(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
- LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
HttpSession session = request.getSession();
ShoppingCart cart = new WebShoppingCart(request);
@@ -1106,7 +1104,6 @@
HttpSession session = request.getSession();
Security security = (Security) request.getAttribute("security");
GenericValue userLogin = (GenericValue)session.getAttribute("userLogin");
- String finalizeMode = (String)session.getAttribute("finalizeMode");
Locale locale = UtilHttp.getLocale(request);
String productStoreId = request.getParameter("productStoreId");
Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java (original)
+++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java Thu Dec 7 02:21:27 2006
@@ -396,7 +396,6 @@
* Saves the shopping cart to the specialized (auto-save) shopping list
*/
public static String saveCartToAutoSaveList(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
ShoppingCart cart = ShoppingCartEvents.getCartObject(request);
Modified: incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original)
+++ incubator/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Thu Dec 7 02:21:27 2006
@@ -934,7 +934,6 @@
public static Map copyPartyContactMechs(DispatchContext dctx, Map context) {
GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
- Security security = dctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String partyIdFrom = (String) context.get("partyIdFrom");
Modified: incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java (original)
+++ incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java Thu Dec 7 02:21:27 2006
@@ -184,7 +184,6 @@
*/
public static Map getVariantCombinations(DispatchContext dctx, Map context) {
Map results = new HashMap();
- GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
String productId = (String) context.get("productId");
@@ -243,7 +242,6 @@
Map combination = (Map) comboIt.next();
for (Iterator cFi = currentFeatures.iterator(); cFi.hasNext(); ) {
GenericEntity currentFeature = (GenericEntity) cFi.next();
- String defaultVariantProductId = null;
if (currentFeature.getString("productFeatureApplTypeId").equals("SELECTABLE_FEATURE")) {
Map newCombination = new HashMap();
// .clone() is important, or you'll keep adding to the same List for all the variants
@@ -300,7 +298,6 @@
*/
public static Map getCategoryVariantProducts(DispatchContext dctx, Map context) {
Map results = new HashMap();
- GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
List productFeatures = (List) context.get("productFeatures");
Modified: incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original)
+++ incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Thu Dec 7 02:21:27 2006
@@ -624,7 +624,6 @@
* be the minimum of all the associated products' inventory divided by their ProductAssoc.quantity
* */
public static Map getProductInventoryAvailableFromAssocProducts(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
List productAssocList = (List) context.get("assocProducts");
String facilityId = (String)context.get("facilityId");
Modified: incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original)
+++ incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Thu Dec 7 02:21:27 2006
@@ -202,7 +202,6 @@
}
public static void getAssociatedProducts(PageContext pageContext, String productAttributeName, String assocPrefix) {
- GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator");
GenericValue product = (GenericValue) pageContext.getAttribute(productAttributeName);
if (product == null)
Modified: incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java (original)
+++ incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java Thu Dec 7 02:21:27 2006
@@ -50,7 +50,6 @@
public static String quickAddChosenVariant(HttpServletRequest request, HttpServletResponse response) {
String errMsg = "";
GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
- Security security = (Security) request.getAttribute("security");
String productId = request.getParameter("productId");
String variantProductId = request.getParameter("variantProductId");
Modified: incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original)
+++ incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Thu Dec 7 02:21:27 2006
@@ -302,7 +302,6 @@
}
public static Map getWorkEffortEventsByPeriod(DispatchContext ctx, Map context) {
- GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -421,7 +420,6 @@
public static Map getProductManufacturingSummaryByFacility(DispatchContext ctx, Map context) {
GenericDelegator delegator = ctx.getDelegator();
- Security security = ctx.getSecurity();
String productId = (String) context.get("productId");
String facilityId = (String) context.get("facilityId"); // optional
Modified: incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java (original)
+++ incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java Thu Dec 7 02:21:27 2006
@@ -130,7 +130,6 @@
}
public static void getActivityContext(PageContext pageContext, String workEffortId, String attribute) {
- GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) pageContext.getRequest().getAttribute("dispatcher");
GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin");
Map svcCtx = UtilMisc.toMap("workEffortId", workEffortId, "userLogin", userLogin);
Modified: incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java (original)
+++ incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java Thu Dec 7 02:21:27 2006
@@ -51,7 +51,6 @@
public static Map importDelimitedFromDirectory(DispatchContext dctx, Map context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
// check permission
Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java (original)
+++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckPermission.java Thu Dec 7 02:21:27 2006
@@ -132,7 +132,6 @@
}
public void addMessage(List messages, MethodContext methodContext) {
- ClassLoader loader = methodContext.getLoader();
String message = methodContext.expandString(this.message);
String propertyResource = methodContext.expandString(this.propertyResource);
Modified: incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original)
+++ incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Thu Dec 7 02:21:27 2006
@@ -68,7 +68,6 @@
public static Map entityImport(DispatchContext dctx, Map context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
List messages = new ArrayList();
@@ -187,7 +186,6 @@
public static Map entityImportDir(DispatchContext dctx, Map context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
List messages = new ArrayList();
@@ -326,7 +324,6 @@
}
public static Map entityExportAll(DispatchContext dctx, Map context) {
- LocalDispatcher dispatcher = dctx.getDispatcher();
GenericDelegator delegator = dctx.getDelegator();
String outpath = (String)context.get("outpath"); // mandatory
Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java (original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java Thu Dec 7 02:21:27 2006
@@ -282,7 +282,6 @@
}
public void runAction(Map context) {
- String globalStr = this.globalExdr.expandString(context);
// default to false
Locale locale = (Locale) context.get("locale");
Modified: incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java?view=diff&rev=483405&r1=483404&r2=483405
==============================================================================
--- incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java (original)
+++ incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/WorkflowServices.java Thu Dec 7 02:21:27 2006
@@ -101,7 +101,6 @@
/** Suspend activity */
public static Map suspendActivity(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
@@ -127,7 +126,6 @@
/** Resume activity */
public static Map resumeActivity(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
@@ -153,7 +151,6 @@
/** Change the state of an activity */
public static Map changeActivityState(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
String newState = (String) context.get("newState");
@@ -180,8 +177,6 @@
/** Check the state of an activity */
public static Map checkActivityState(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
- Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
try {
@@ -199,8 +194,6 @@
/** Get the current activity context */
public static Map getActivityContext(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
- Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
try {
@@ -218,7 +211,6 @@
/** Appends data to the activity context */
public static Map appendActivityContext(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
Map appendContext = (Map) context.get("currentContext");
@@ -250,7 +242,6 @@
/** Assign activity to a new or additional party */
public static Map assignActivity(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
String partyId = (String) context.get("partyId");
@@ -384,7 +375,6 @@
/** Complete an assignment */
public static Map completeAssignment(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
String workEffortId = (String) context.get("workEffortId");
String partyId = (String) context.get("partyId");
@@ -414,7 +404,6 @@
public static Map limitInvoker(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
LocalDispatcher dispatcher = ctx.getDispatcher();
String workEffortId = (String) context.get("workEffortId");
String limitService = (String) context.get("serviceName");