Author: taher
Date: Mon Jul 17 16:59:18 2017
New Revision: 1802172
URL: http://svn.apache.org/viewvc?rev=1802172&view=rev
Log:
Improved: minor refactoring to remove miscellanous warnings
Minor code cleanup to remove:
- unused private variables
- unused imports
- improper object castings
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
Mon Jul 17 16:59:18 2017
@@ -28,7 +28,6 @@ import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilDateTime;
import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilMisc;
-import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericValue;
Modified:
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
Mon Jul 17 16:59:18 2017
@@ -19,7 +19,6 @@
package org.apache.ofbiz.accounting.period;
-import java.sql.Date;
import java.sql.Timestamp;
import java.util.List;
import java.util.Locale;
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
Mon Jul 17 16:59:18 2017
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -59,7 +58,6 @@ public class ContentManagementEvents {
HttpSession session = request.getSession();
Security security = (Security)request.getAttribute("security");
GenericValue userLogin =
(GenericValue)session.getAttribute("userLogin");
- ServletContext servletContext = session.getServletContext();
String webSiteId = WebSiteWorker.getWebSiteId(request);
Delegator delegator = (Delegator)request.getAttribute("delegator");
LocalDispatcher dispatcher =
(LocalDispatcher)request.getAttribute("dispatcher");
@@ -136,7 +134,6 @@ public class ContentManagementEvents {
HttpSession session = request.getSession();
Security security = (Security)request.getAttribute("security");
GenericValue userLogin =
(GenericValue)session.getAttribute("userLogin");
- ServletContext servletContext = session.getServletContext();
String webSiteId = WebSiteWorker.getWebSiteId(request);
Delegator delegator = (Delegator)request.getAttribute("delegator");
LocalDispatcher dispatcher =
(LocalDispatcher)request.getAttribute("dispatcher");
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
Mon Jul 17 16:59:18 2017
@@ -371,7 +371,6 @@ public final class ContentManagementWork
}
List<Map<String, Object>> staticValueList = new
LinkedList<Map<String,Object>>();
- int counter = 0;
for (GenericValue content : assocValueList) {
String contentId = (String)content.get("contentId");
String contentName = (String)content.get("contentName");
@@ -394,7 +393,6 @@ public final class ContentManagementWork
}
}
staticValueList.add(map);
- counter++;
}
return staticValueList;
}
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
Mon Jul 17 16:59:18 2017
@@ -117,7 +117,6 @@ In order ta make this service active add
contentAssoc.put("contentIdTo", "ROOT");
contentAssoc.put("userLogin", userLogin);
dispatcher.runSync("createContentAssoc", contentAssoc);
- int recordCount = 0;
while ((line = input.readLine()) != null) {//start line
boolean hasFolder = true;
String rootContent = null, contentId = null;
counterLine++;
@@ -220,7 +219,6 @@ In order ta make this service active add
}
}
}//end character in line
- recordCount++;
}
}//end line
sucMsg = UtilProperties.getMessage("ContentUiLabels",
"ContentConvertDocumentsTreeSuccessful", UtilMisc.toMap("counterLine",
counterLine), locale);
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java
Mon Jul 17 16:59:18 2017
@@ -135,7 +135,6 @@ public class CompDocServices {
String contentId = (String) context.get("contentId");
String contentRevisionSeqId = (String)
context.get("contentRevisionSeqId");
- GenericValue userLogin = (GenericValue) context.get("userLogin");
try {
List<EntityCondition> exprList = new LinkedList<EntityCondition>();
@@ -157,7 +156,6 @@ public class CompDocServices {
document.setPageSize(PageSize.LETTER);
PdfCopy writer = new PdfCopy(document, baos);
document.open();
- int pgCnt = 0;
for (GenericValue contentAssocRevisionItemView : compDocParts) {
String thisDataResourceId =
contentAssocRevisionItemView.getString("dataResourceId");
GenericValue dataResource =
EntityQuery.use(delegator).from("DataResource").where("dataResourceId",
thisDataResourceId).queryOne();
@@ -228,7 +226,6 @@ public class CompDocServices {
for (int i=0; i < n; i++) {
PdfImportedPage pg = writer.getImportedPage(reader, i
+ 1);
writer.addPage(pg);
- pgCnt++;
}
}
}
@@ -263,7 +260,6 @@ public class CompDocServices {
String contentId = (String) context.get("contentId");
String contentRevisionSeqId = (String)
context.get("contentRevisionSeqId");
- GenericValue userLogin = (GenericValue) context.get("userLogin");
try {
Document document = new Document();
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java
Mon Jul 17 16:59:18 2017
@@ -467,7 +467,6 @@ public class DataServices {
public static Map<String, Object> renderDataResourceAsText(DispatchContext
dctx, Map<String, ? extends Object> context) throws GeneralException,
IOException {
Map<String, Object> results = new HashMap<String, Object>();
- Delegator delegator = dctx.getDelegator();
//LocalDispatcher dispatcher = dctx.getDispatcher();
Writer out = (Writer) context.get("outWriter");
Map<String, Object> templateContext =
UtilGenerics.checkMap(context.get("templateContext"));
Modified:
ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/humanres/src/main/java/org/apache/ofbiz/humanres/HumanResEvents.java
Mon Jul 17 16:59:18 2017
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.ofbiz.base.util.Debug;
+import org.apache.ofbiz.base.util.UtilGenerics;
import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.GenericEntityException;
@@ -165,7 +166,7 @@ public class HumanResEvents {
String hrefString = (String) params.get("hrefString");
String hrefString2 = (String) params.get("hrefString2");
- Map<String , Object> partyGroup = (Map<String, Object>)
params.get("partyGroup");
+ Map<String , Object> partyGroup =
UtilGenerics.checkMap(params.get("partyGroup"));
List<Map<String, Object>> resultList = new
ArrayList<Map<String,Object>>();
List<GenericValue> childOfComs = null;
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderEvents.java
Mon Jul 17 16:59:18 2017
@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.HashMap;
-import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -34,7 +33,6 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.io.IOUtils;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
-import org.apache.ofbiz.base.util.UtilGenerics;
import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.content.data.DataResourceWorker;
import org.apache.ofbiz.entity.Delegator;
@@ -107,7 +105,6 @@ public class OrderEvents {
public static String cancelSelectedOrderItems(HttpServletRequest request,
HttpServletResponse response) {
LocalDispatcher dispatcher = (LocalDispatcher)
request.getAttribute("dispatcher");
- Delegator delegator = (Delegator) request.getAttribute("delegator");
HttpSession session = request.getSession();
GenericValue userLogin = (GenericValue)
session.getAttribute("userLogin");
Locale locale = UtilHttp.getLocale(request);
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
Mon Jul 17 16:59:18 2017
@@ -2444,7 +2444,6 @@ public class ShoppingCartItem implements
public List<ShoppingCartItem> explodeItem(ShoppingCart cart,
LocalDispatcher dispatcher) throws CartItemModifyException {
BigDecimal baseQuantity = this.getQuantity();
- int thisIndex = cart.items().indexOf(this);
List<ShoppingCartItem> newItems = new ArrayList<ShoppingCartItem>();
if (baseQuantity.compareTo(BigDecimal.ONE) > 0) {
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyTypeHelper.java
Mon Jul 17 16:59:18 2017
@@ -20,7 +20,6 @@
package org.apache.ofbiz.party.party;
import org.apache.ofbiz.base.util.Debug;
-import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericValue;
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoConfigUtil.java
Mon Jul 17 16:59:18 2017
@@ -70,7 +70,6 @@ public final class SeoConfigUtil {
private static Map<String, String> specialProductIds = null;
private static final String ELEMENT_REGEXPIFMATCH = "regexpifmatch";
private static final String ELEMENT_URL_CONFIG = "url-config";
- private static final String ELEMENT_DESCRIPTION = "description";
private static final String ELEMENT_FORWARD = "forward";
private static final String ELEMENT_SEO = "seo";
private static final String ELEMENT_URLPATTERN = "url-pattern";
@@ -81,7 +80,6 @@ public final class SeoConfigUtil {
private static final String ELEMENT_VALUE = "value";
private static final String ELEMENT_USER = "user";
private static final String ELEMENT_EXCEPTIONS = "exceptions";
- private static final String ELEMENT_CHAR_FILTERS = "char-filters";
private static final String ELEMENT_CHAR_FILTER = "char-filter";
private static final String ELEMENT_CHARACTER_PATTERN =
"character-pattern";
private static final String ELEMENT_CATEGORY_URL = "category-url";
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
Mon Jul 17 16:59:18 2017
@@ -56,7 +56,6 @@ import org.apache.ofbiz.service.ModelSer
public final class ProductWorker {
public static final String module = ProductWorker.class.getName();
- private static final String resource = "ProductUiLabels";
private static final MathContext generalRounding = new MathContext(10);
Modified:
ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
Mon Jul 17 16:59:18 2017
@@ -135,7 +135,6 @@ public class WorkEffortKeywordIndex {
}
}
public static void addWeightedKeywordSourceString(GenericValue value,
String fieldName, List<String> strings) {
- Delegator delegator = value.getDelegator();
if (value.getString(fieldName) != null) {
int weight = 1;
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
Mon Jul 17 16:59:18 2017
@@ -29,7 +29,6 @@ import java.io.StringWriter;
import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URL;
-import java.security.Security;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.LinkedList;
Modified:
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ServiceUtil.java
Mon Jul 17 16:59:18 2017
@@ -49,7 +49,6 @@ import org.apache.ofbiz.entity.util.Enti
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.security.Security;
import org.apache.ofbiz.service.config.ServiceConfigUtil;
-import org.apache.ofbiz.service.config.model.ServiceEngine;
import com.ibm.icu.util.Calendar;
Modified:
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
Mon Jul 17 16:59:18 2017
@@ -3461,8 +3461,7 @@ public class ModelFormField {
try {
ScreenRenderer renderer =
(ScreenRenderer)context.get("screens");
if (renderer != null) {
- @SuppressWarnings("unchecked")
- MapStack<String> mapStack =
(MapStack)UtilGenerics.cast(context);
+ MapStack<String> mapStack = UtilGenerics.cast(context);
ScreenRenderer subRenderer = new ScreenRenderer(writer,
mapStack, renderer.getScreenStringRenderer());
writer.append(subRenderer.render(location, name));
}
@@ -3695,7 +3694,6 @@ public class ModelFormField {
if (UtilValidate.isNotEmpty(useWhen)) {
try {
Object retVal =
GroovyUtil.eval(StringUtil.convertOperatorSubstitutions(useWhen),context);
- boolean condTrue = false;
// retVal should be a Boolean, if not something weird is
up...
if (retVal instanceof Boolean) {
@@ -3722,7 +3720,6 @@ public class ModelFormField {
try {
Object retVal =
GroovyUtil.eval(StringUtil.convertOperatorSubstitutions(ignoreWhen),context);
- boolean condTrue = false;
if (retVal instanceof Boolean) {
shouldIgnore =(Boolean) retVal;
Modified:
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java?rev=1802172&r1=1802171&r2=1802172&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/ScreenRenderer.java
Mon Jul 17 16:59:18 2017
@@ -189,7 +189,6 @@ public class ScreenRenderer {
populateContextForRequest(context, this, request, response,
servletContext);
}
- @SuppressWarnings("rawtypes")
public static void populateContextForRequest(MapStack<String> context,
ScreenRenderer screens, HttpServletRequest request, HttpServletResponse
response, ServletContext servletContext) {
HttpSession session = request.getSession();
