Author: jleroux
Date: Wed Dec 6 13:18:30 2006 New Revision: 483235 URL: http://svn.apache.org/viewvc?view=rev&rev=483235 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/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.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/product/ProductServices.java incubator/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java incubator/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java incubator/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java 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=483235&r1=483234&r2=483235 ============================================================================== --- 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 Wed Dec 6 13:18:30 2006 @@ -985,7 +985,6 @@ LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); HttpSession session = request.getSession(); GenericValue userLogin = (GenericValue)session.getAttribute("userLogin"); - Locale locale = UtilHttp.getLocale(request); String shoppingListId = request.getParameter("shoppingListId"); @@ -1013,7 +1012,6 @@ LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); HttpSession session = request.getSession(); GenericValue userLogin = (GenericValue)session.getAttribute("userLogin"); - Locale locale = UtilHttp.getLocale(request); String quoteId = request.getParameter("quoteId"); Modified: incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original) +++ incubator/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Wed Dec 6 13:18:30 2006 @@ -57,7 +57,6 @@ Integer itemIndex = (Integer) context.get("itemIndex"); Double quantity = (Double) context.get("quantity"); Boolean clearEmptyGroups = (Boolean) context.get("clearEmptyGroups"); - Locale locale = (Locale) context.get("locale"); if (clearEmptyGroups == null) { clearEmptyGroups = new Boolean(true); @@ -131,7 +130,6 @@ ShoppingCart cart = (ShoppingCart) context.get("shoppingCart"); String orderAdditionalEmails = (String) context.get("orderAdditionalEmails"); String correspondingPoId = (String) context.get("correspondingPoId"); - Locale locale = (Locale) context.get("locale"); cart.setOrderAdditionalEmails(orderAdditionalEmails); if (UtilValidate.isNotEmpty(correspondingPoId)) { 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=483235&r1=483234&r2=483235 ============================================================================== --- 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 Wed Dec 6 13:18:30 2006 @@ -68,7 +68,6 @@ LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); ShoppingCart cart = ShoppingCartEvents.getCartObject(request); GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); - Locale locale = UtilHttp.getLocale(request); String shoppingListId = request.getParameter("shoppingListId"); String selectedCartItems[] = request.getParameterValues("selectedItem"); @@ -167,7 +166,6 @@ GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); ShoppingCart cart = ShoppingCartEvents.getCartObject(request); - Locale locale = UtilHttp.getLocale(request); String shoppingListId = request.getParameter("shoppingListId"); String includeChild = request.getParameter("includeChild"); 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=483235&r1=483234&r2=483235 ============================================================================== --- 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 Wed Dec 6 13:18:30 2006 @@ -262,7 +262,6 @@ GenericDelegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Timestamp now = UtilDateTime.nowTimestamp(); String partyId = ServiceUtil.getPartyIdCheckSecurity(userLogin, security, context, result, "PARTYMGR", "_PCM_DELETE"); String errMsg = null; @@ -937,7 +936,6 @@ LocalDispatcher dispatcher = dctx.getDispatcher(); Security security = dctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Locale locale = (Locale) context.get("locale"); String partyIdFrom = (String) context.get("partyIdFrom"); String partyIdTo = (String) context.get("partyIdTo"); 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=483235&r1=483234&r2=483235 ============================================================================== --- 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 Wed Dec 6 13:18:30 2006 @@ -123,7 +123,6 @@ */ public static Map getAllExistingVariants(DispatchContext dctx, Map context) { Map results = new HashMap(); - Map featuresByType = new HashMap(); GenericDelegator delegator = dctx.getDelegator(); String productId = (String) context.get("productId"); @@ -185,7 +184,6 @@ */ public static Map getVariantCombinations(DispatchContext dctx, Map context) { Map results = new HashMap(); - Map featuresByType = new HashMap(); GenericDelegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Modified: incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ incubator/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Wed Dec 6 13:18:30 2006 @@ -753,7 +753,6 @@ */ public static Map quickCreateVirtualWithVariants(DispatchContext dctx, Map context) { GenericDelegator delegator = dctx.getDelegator(); - Locale locale = (Locale) context.get("locale"); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); // get the various IN attributes 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=483235&r1=483234&r2=483235 ============================================================================== --- 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 Wed Dec 6 13:18:30 2006 @@ -305,7 +305,6 @@ GenericDelegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map resultMap = new HashMap(); Timestamp startDay = (Timestamp) context.get("start"); Integer numPeriodsInteger = (Integer) context.get("numPeriods"); @@ -423,7 +422,6 @@ public static Map getProductManufacturingSummaryByFacility(DispatchContext ctx, Map context) { GenericDelegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); - GenericValue userLogin = (GenericValue) context.get("userLogin"); String productId = (String) context.get("productId"); String facilityId = (String) context.get("facilityId"); // optional Modified: incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java (original) +++ incubator/ofbiz/trunk/framework/common/src/org/ofbiz/common/FindServices.java Wed Dec 6 13:18:30 2006 @@ -587,8 +587,6 @@ // If it is an "op" field, it will be "equals", "greaterThan", etc. int iPos = -1; int iPos2 = -1; - HashMap subMap = null; - HashMap subMap2 = null; String fieldMode = null; fieldNameRaw = (String) ifIter.next(); Modified: incubator/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java (original) +++ incubator/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/Record.java Wed Dec 6 13:18:30 2006 @@ -318,7 +318,6 @@ } else if (fieldType.equals("FixedPointDouble")) { // this custom type will parse a fixed point number according to the number // of decimal places in the formatting string then place it in a Double - NumberFormat nf = NumberFormat.getNumberInstance(); double decimalPlaces = Double.parseDouble(field.format); double multiplier = Math.pow(10.0, decimalPlaces); double dnum = multiplier * ((Double) value).doubleValue(); Modified: incubator/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ incubator/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Wed Dec 6 13:18:30 2006 @@ -1072,7 +1072,6 @@ GenericValue value = (GenericValue) viter.next(); String entityName = value.getEntityName(); GenericPK primaryKey = value.getPrimaryKey(); - Map ecaEventMap = this.getEcaEntityEventMap(entityName); GenericHelper helper = getEntityHelper(entityName); // exists? Modified: incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original) +++ incubator/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Wed Dec 6 13:18:30 2006 @@ -114,14 +114,12 @@ String entityName = entityNameExdr.expandString(context); HttpServletRequest request = (HttpServletRequest)context.get("request"); GenericValue userLogin = null; - String userLoginId = null; String partyId = null; GenericDelegator delegator = null; if (request != null) { HttpSession session = request.getSession(); userLogin = (GenericValue)session.getAttribute("userLogin"); if (userLogin != null) { - userLoginId = userLogin.getString("userLoginId"); partyId = userLogin.getString("partyId"); } delegator = (GenericDelegator)request.getAttribute("delegator"); @@ -178,8 +176,6 @@ Security security, String entityAction, String privilegeEnumId, String quickCheckContentId) { - String contentId = null; - if (content != null) contentId = content.getString("contentId"); List entityIds = new ArrayList(); if (content != null) entityIds.add(content); if (UtilValidate.isNotEmpty(quickCheckContentId)) { @@ -506,8 +502,6 @@ if (Debug.verboseOn()) Debug.logVerbose(permissionConditionGetter.dumpAsText(), module); boolean passed = false; - String lcEntityName = entityName.toLowerCase(); - String userLoginId = null; boolean checkAncestors = false; boolean hasRoleOperation = checkHasRoleOperations(partyId, permissionConditionGetter, delegator); if( hasRoleOperation ) { @@ -602,7 +596,6 @@ while (iter.hasNext()) { GenericValue entity = getNextEntity(delegator, entityName, pkFieldName, iter.next(), entities); if (entity == null) continue; - String entityId = entity.getString(pkFieldName); checkAncestors = true; passed = hasMatch(entity, permissionConditionGetter, relatedRoleGetter, auxiliaryValueGetter, partyId, checkAncestors); @@ -662,7 +655,6 @@ } if (hasNeed) { - GenericValue uLogin = null; try { if (UtilValidate.isNotEmpty(partyId)) { List partyRoleList = delegator.findByAndCache("PartyRole", UtilMisc.toMap("partyId", partyId)); @@ -730,7 +722,6 @@ public static boolean hasMatch(GenericValue entity, PermissionConditionGetter permissionConditionGetter, RelatedRoleGetter relatedRoleGetter, AuxiliaryValueGetter auxiliaryValueGetter, String partyId, boolean checkAncestors) throws GenericEntityException { - String entityName = entity.getEntityName(); ModelEntity modelEntity = entity.getModelEntity(); GenericDelegator delegator = entity.getDelegator(); String pkFieldName = modelEntity.getFirstPkFieldName(); Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/SimpleMethodBsfEngine.java Wed Dec 6 13:18:30 2006 @@ -44,8 +44,6 @@ public void initialize(BSFManager mgr, String lang, Vector declaredBeans) throws BSFException { super.initialize(mgr, lang, declaredBeans); - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - // declare the bsf manager for callbacks, etc. context.put("bsf", mgr); Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/callops/AddError.java Wed Dec 6 13:18:30 2006 @@ -50,7 +50,6 @@ } public boolean exec(MethodContext methodContext) { - boolean hasPermission = false; List messages = (List) errorListAcsr.get(methodContext); if (messages == null) { Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/FilterListByDate.java Wed Dec 6 13:18:30 2006 @@ -53,12 +53,7 @@ } public boolean exec(MethodContext methodContext) { - String fromFieldName = methodContext.expandString(this.fromFieldName); - String thruFieldName = methodContext.expandString(this.thruFieldName); - String allSameStr = methodContext.expandString(this.allSameStr); - - boolean allSame = !"false".equals(allSameStr); - + if (!validDateAcsr.isEmpty()) { toListAcsr.put(methodContext, EntityUtil.filterByDate((List) listAcsr.get(methodContext), (java.sql.Timestamp) validDateAcsr.get(methodContext), fromFieldName, thruFieldName, true)); } else { Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/FirstFromList.java Wed Dec 6 13:18:30 2006 @@ -39,7 +39,6 @@ } public boolean exec(MethodContext methodContext) { - Object fieldVal = null; if (listAcsr.isEmpty()) { Debug.logWarning("No list-name specified in iterate tag, doing nothing", module); Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java Wed Dec 6 13:18:30 2006 @@ -51,7 +51,6 @@ } public boolean exec(MethodContext methodContext) { - Object fieldVal = null; if (listAcsr.isEmpty()) { Debug.logWarning("No list-name specified in iterate tag, doing nothing: " + rawString(), module); Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/IterateMap.java Wed Dec 6 13:18:30 2006 @@ -50,7 +50,7 @@ } public boolean exec(MethodContext methodContext) { - Object fieldVal = null; + if (mapAcsr.isEmpty()) { Debug.logWarning("No map-name specified in iterate tag, doing nothing: " + rawString(), module); Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/ListToList.java Wed Dec 6 13:18:30 2006 @@ -39,7 +39,6 @@ } public boolean exec(MethodContext methodContext) { - Object fieldVal = null; List fromList = (List) listAcsr.get(methodContext); List toList = (List) toListAcsr.get(methodContext); Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/envops/OrderMapList.java Wed Dec 6 13:18:30 2006 @@ -52,7 +52,6 @@ } public boolean exec(MethodContext methodContext) { - Object fieldVal = null; List orderList = (List) listAcsr.get(methodContext); Modified: incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java (original) +++ incubator/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/ifops/CheckId.java Wed Dec 6 13:18:30 2006 @@ -130,7 +130,6 @@ } public void addMessage(List messages, MethodContext methodContext, String defaultMessage, String errorDetails) { - ClassLoader loader = methodContext.getLoader(); String message = methodContext.expandString(this.message); String propertyResource = methodContext.expandString(this.propertyResource); Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java (original) +++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizContentTransform.java Wed Dec 6 13:18:30 2006 @@ -19,9 +19,7 @@ import java.io.Writer; import java.util.Map; -import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.ofbiz.webapp.taglib.ContentUrlTag; @@ -50,10 +48,7 @@ try { Environment env = Environment.getCurrentEnvironment(); BeanModel req = (BeanModel)env.getVariable("request"); - BeanModel res = (BeanModel) env.getVariable("response"); HttpServletRequest request = (HttpServletRequest) req.getWrappedObject(); - HttpServletResponse response = (HttpServletResponse) res.getWrappedObject(); - ServletContext ctx = (ServletContext) request.getAttribute("servletContext"); // make the link StringBuffer newURL = new StringBuffer(); Modified: incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java (original) +++ incubator/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/view/JPublishWrapper.java Wed Dec 6 13:18:30 2006 @@ -191,7 +191,6 @@ public void render(String path, HttpServletRequest request, HttpServletResponse response, Writer writer, OutputStream outputStream, boolean allowRedirect) throws GeneralException { HttpSession session = request.getSession(); - ActionManager actionManager = siteContext.getActionManager(); //String path = servletContext.getRealPath(pagePath); //Debug.logError("Path:" + path, module); 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=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original) +++ incubator/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Wed Dec 6 13:18:30 2006 @@ -70,7 +70,6 @@ LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Locale locale = (Locale) context.get("locale"); List messages = new ArrayList(); @@ -190,7 +189,6 @@ LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); - Locale locale = (Locale) context.get("locale"); List messages = new ArrayList(); @@ -293,7 +291,6 @@ public static Map parseEntityXmlFile(DispatchContext dctx, Map context) { GenericDelegator delegator = dctx.getDelegator(); - GenericValue userLogin = (GenericValue) context.get("userLogin"); URL url = (URL)context.get("url"); String xmltext = (String)context.get("xmltext"); @@ -331,8 +328,6 @@ public static Map entityExportAll(DispatchContext dctx, Map context) { LocalDispatcher dispatcher = dctx.getDispatcher(); GenericDelegator delegator = dctx.getDelegator(); - GenericValue userLogin = (GenericValue) context.get("userLogin"); - Locale locale = (Locale) context.get("locale"); String outpath = (String)context.get("outpath"); // mandatory Integer txTimeout = (Integer)context.get("txTimeout"); Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java (original) +++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java Wed Dec 6 13:18:30 2006 @@ -117,8 +117,6 @@ public void renderDateTimeField(StringBuffer buffer, Map context, DateTimeField dateTimeField) { ModelFormField modelFormField = dateTimeField.getModelFormField(); - String paramName = modelFormField.getParameterName(context); - String defaultDateTimeString = dateTimeField.getDefaultDateTimeString(context); this.makeBlockString(buffer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, dateTimeField.getDefaultValue(context))); this.appendWhitespace(buffer); } Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original) +++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Wed Dec 6 13:18:30 2006 @@ -332,11 +332,9 @@ if (editRequest != null && editRequest.toUpperCase().indexOf("IMAGE") > 0) { editMode += " Image"; } - Map params = (Map)context.get("parameters"); //String editRequestWithParams = editRequest + "?contentId=${currentValue.contentId}&drDataResourceId=${currentValue.drDataResourceId}&directEditRequest=${directEditRequest}&indirectEditRequest=${indirectEditRequest}&caContentIdTo=${currentValue.caContentIdTo}&caFromDate=${currentValue.caFromDate}&caContentAssocTypeId=${currentValue.caContentAssocTypeId}"; if (UtilValidate.isNotEmpty(editRequest) && "true".equals(enableEditValue)) { - String contentId = content.getContentId(context); HttpServletResponse response = (HttpServletResponse) context.get("response"); HttpServletRequest request = (HttpServletRequest) context.get("request"); if (request != null && response != null) { @@ -455,7 +453,6 @@ String enableEditValue = (String)context.get(enableEditName); String expandedContentId = content.getContentId(context); String expandedMapKey = content.getMapKey(context); - Map params = (Map)context.get("parameters"); if (editRequest != null && editRequest.toUpperCase().indexOf("IMAGE") > 0) { editMode += " Image"; } Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java (original) +++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java Wed Dec 6 13:18:30 2006 @@ -164,7 +164,6 @@ public void renderMenu() throws IOException { - ModelMenu modelMenu = null; String menuDefFile = (String)templateCtx.get("menuDefFile"); String menuName = (String)templateCtx.get("menuName"); String menuWrapperClassName = (String)templateCtx.get("menuWrapperClassName"); 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=483235&r1=483234&r2=483235 ============================================================================== --- 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 Wed Dec 6 13:18:30 2006 @@ -284,7 +284,6 @@ public void runAction(Map context) { String globalStr = this.globalExdr.expandString(context); // default to false - boolean global = "true".equals(globalStr); Locale locale = (Locale) context.get("locale"); String resource = this.resourceExdr.expandString(context, locale); Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java (original) +++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java Wed Dec 6 13:18:30 2006 @@ -322,8 +322,6 @@ HttpServletRequest request = (HttpServletRequest) context.get("request"); HttpServletResponse response = (HttpServletResponse) context.get("response"); - String str = (String) context.get("queryString"); - String queryString = UtilHttp.stripViewParamsFromQueryString(str); ServletContext ctx = (ServletContext) request.getAttribute("servletContext"); RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_"); Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java (original) +++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java Wed Dec 6 13:18:30 2006 @@ -101,8 +101,6 @@ public void renderDateTimeField(StringBuffer buffer, Map context, DateTimeField dateTimeField) { ModelFormField modelFormField = dateTimeField.getModelFormField(); - String paramName = modelFormField.getParameterName(context); - String defaultDateTimeString = dateTimeField.getDefaultDateTimeString(context); this.makeTextString(buffer, modelFormField.getWidgetStyle(), modelFormField.getEntry(context, dateTimeField.getDefaultValue(context))); this.appendWhitespace(buffer); } Modified: incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java (original) +++ incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/WfApplicationServices.java Wed Dec 6 13:18:30 2006 @@ -175,7 +175,6 @@ private static String insertAppSandbox(GenericDelegator delegator, String workEffortId, String partyId, String roleTypeId, Timestamp fromDate, Map context) throws GenericServiceException { String dataId = null; - String infoId = null; String applicationId = new String(new Long((new Date().getTime())).toString()); try { @@ -313,7 +312,6 @@ try { final Collection assigments = delegator.findByAnd("WorkEffortPartyAssignment", expresions, orderBy); - GenericValue assigment; if (assigments.isEmpty()) { Debug.logError("No accepted activities found for the workEffortId=" + workEffortId, module); throw new GenericServiceException("Can not find WorkEffortPartyAssignment for the Workflow service. WorkEffortId=" + workEffortId); Modified: incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java (original) +++ incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/client/StartActivityJob.java Wed Dec 6 13:18:30 2006 @@ -53,7 +53,6 @@ * @see org.ofbiz.service.job.Job#exec() */ public void exec() { - String activityIds = null; try { Debug.logVerbose("Executing job now : " + activity, module); activity.activate(); Modified: incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java?view=diff&rev=483235&r1=483234&r2=483235 ============================================================================== --- incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java (original) +++ incubator/ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java Wed Dec 6 13:18:30 2006 @@ -552,7 +552,6 @@ GenericValue value = (GenericValue) i.next(); String party = value.getString("partyId"); String role = value.getString("roleTypeId"); - String status = value.getString("statusId"); java.sql.Timestamp from = value.getTimestamp("fromDate"); WfAssignment a = WfFactory.getWfAssignment(getDelegator(), runtimeKey(), party, role, from); |
Free forum by Nabble | Edit this page |