You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2016/11/05 11:16:49 UTC
svn commit: r1768189 - in /ofbiz/trunk:
applications/order/src/main/java/org/apache/ofbiz/order/order/
applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/
applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/
a...
Author: arunpatidar
Date: Sat Nov 5 11:16:49 2016
New Revision: 1768189
URL: http://svn.apache.org/viewvc?rev=1768189&view=rev
Log:
Implemented: Refer to objects by their interfaces rather than class when instantiating Collection implementation classes in Java files
(OFBIZ-9023) (OFBIZ-9026)(OFBIZ-9027)(OFBIZ-9032)(OFBIZ-9034)(OFBIZ-9036)(OFBIZ-9030)
Thanks: Divesh Dutta, Amit Gadaley and Shubham Agrawal for the contribution.
Modified:
ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java
ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java
ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java
ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java
ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java
ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java
ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java
ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
ofbiz/trunk/specialpurpose/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java
ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java
ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java
ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java
ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java
Modified: ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java Sat Nov 5 11:16:49 2016
@@ -3064,7 +3064,7 @@ public class OrderServices {
}
} else {
// check for auto-cancel items
- ArrayList<EntityCondition> itemsExprs = new ArrayList<EntityCondition>();
+ List<EntityCondition> itemsExprs = new ArrayList<EntityCondition>();
// create the query expressions
itemsExprs.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId));
@@ -6245,7 +6245,7 @@ public class OrderServices {
// In order to improve efficiency a little bit, we will always create the ProductAssoc records
// with productId < productIdTo when the two are compared. This way when checking for an existing
// record we don't have to check both possible combinations of productIds
- TreeSet<String> productIdSet = new TreeSet<String>();
+ Set<String> productIdSet = new TreeSet<String>();
if (orderItems != null) {
for (GenericValue orderItem : orderItems) {
String productId = orderItem.getString("productId");
@@ -6256,7 +6256,7 @@ public class OrderServices {
}
}
}
- TreeSet<String> productIdToSet = new TreeSet<String>(productIdSet);
+ Set<String> productIdToSet = new TreeSet<String>(productIdSet);
for (String productId : productIdSet) {
productIdToSet.remove(productId);
for (String productIdTo : productIdToSet) {
Modified: ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
+++ ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java Sat Nov 5 11:16:49 2016
@@ -275,7 +275,7 @@ public class ShoppingCartHelper {
}
public Map<String, Object> addToCartFromOrder(String catalogId, String orderId, String[] itemIds, boolean addAll, String itemGroupNumber) {
- ArrayList<String> errorMsgs = new ArrayList<String>();
+ List<String> errorMsgs = new ArrayList<String>();
Map<String, Object> result;
String errMsg = null;
@@ -569,7 +569,7 @@ public class ShoppingCartHelper {
* quantity is 0, do not add
*/
public Map<String, Object> addCategoryDefaults(String catalogId, String categoryId, String itemGroupNumber) {
- ArrayList<String> errorMsgs = new ArrayList<String>();
+ List<String> errorMsgs = new ArrayList<String>();
Map<String, Object> result = null;
String errMsg = null;
@@ -630,7 +630,7 @@ public class ShoppingCartHelper {
/** Delete an item from the shopping cart. */
public Map<String, Object> deleteFromCart(Map<String, ? extends Object> context) {
Map<String, Object> result = null;
- ArrayList<String> errorMsgs = new ArrayList<String>();
+ List<String> errorMsgs = new ArrayList<String>();
for (String o : context.keySet()) {
if (o.toUpperCase().startsWith("DELETE")) {
try {
@@ -663,8 +663,8 @@ public class ShoppingCartHelper {
locale = this.cart.getLocale();
}
- ArrayList<ShoppingCartItem> deleteList = new ArrayList<ShoppingCartItem>();
- ArrayList<String> errorMsgs = new ArrayList<String>();
+ List<ShoppingCartItem> deleteList = new ArrayList<ShoppingCartItem>();
+ List<String> errorMsgs = new ArrayList<String>();
BigDecimal oldQuantity = BigDecimal.ONE.negate();
String oldDescription = "";
Modified: ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original)
+++ ofbiz/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Sat Nov 5 11:16:49 2016
@@ -662,8 +662,8 @@ public final class ProductPromoWorker {
if (productPromo == null) {
return "";
}
- ArrayList<String> partyClassificationsIncluded = new ArrayList<String>();
- ArrayList<String> partyClassificationsExcluded = new ArrayList<String>();
+ List<String> partyClassificationsIncluded = new ArrayList<String>();
+ List<String> partyClassificationsExcluded = new ArrayList<String>();
StringBuilder promoDescBuf = new StringBuilder();
List<GenericValue> productPromoRules = productPromo.getRelated("ProductPromoRule", null, null, true);
Iterator<GenericValue> promoRulesIter = productPromoRules.iterator();
Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java (original)
+++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductWorker.java Sat Nov 5 11:16:49 2016
@@ -1222,7 +1222,7 @@ nextProd:
// Method to filter-out out of stock products
public static List<GenericValue> filterOutOfStockProducts (List<GenericValue> productsToFilter, LocalDispatcher dispatcher, Delegator delegator) throws GeneralException {
- ArrayList<GenericValue> productsInStock = new ArrayList<GenericValue>();
+ List<GenericValue> productsInStock = new ArrayList<GenericValue>();
if (UtilValidate.isNotEmpty(productsToFilter)) {
for (GenericValue genericRecord : productsToFilter) {
String productId = genericRecord.getString("productId");
Modified: ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java (original)
+++ ofbiz/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortServices.java Sat Nov 5 11:16:49 2016
@@ -355,7 +355,7 @@ public class WorkEffortServices {
private static TreeMap<DateRange, List<Map<String, Object>>> groupCalendarEntriesByDateRange(DateRange inDateRange, List<Map<String, Object>> calendarEntries) {
TreeMap<DateRange, List<Map<String, Object>>> calendarEntriesByDateRange = new TreeMap<DateRange, List<Map<String, Object>>>();
- TreeSet<Date> dateBoundaries = new TreeSet<Date>();
+ Set<Date> dateBoundaries = new TreeSet<Date>();
if (inDateRange != null) {
dateBoundaries.add(inDateRange.start());
dateBoundaries.add(inDateRange.end());
Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java (original)
+++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java Sat Nov 5 11:16:49 2016
@@ -75,12 +75,12 @@ public class MiscTests extends GenericTe
BigDecimal bigDecimal = new BigDecimal("1.234");
URL url = new URL("http://ofbiz.apache.org");
List<String> baseList = UtilMisc.toList("a", "1", "b", "2", "c", "3");
- ArrayList<String> arrayList = new ArrayList<String>();
+ List<String> arrayList = new ArrayList<String>();
arrayList.addAll(baseList);
List<String> fastList = new LinkedList<String>();
fastList.addAll(baseList);
Map<String, String> baseMap = UtilMisc.toMap("a", "1", "b", "2", "c", "3");
- HashMap<String, String> hashMap = new HashMap<String, String>();
+ Map<String, String> hashMap = new HashMap<String, String>();
hashMap.putAll(baseMap);
Map<String, String> fastMap = new HashMap<String, String>();
fastMap.putAll(baseMap);
Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java (original)
+++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/GenericTestCaseBase.java Sat Nov 5 11:16:49 2016
@@ -44,7 +44,7 @@ public abstract class GenericTestCaseBas
}
public static void useAllMemory() throws Exception {
- LinkedList<long[]> dummy = new LinkedList<long[]>();
+ List<long[]> dummy = new LinkedList<long[]>();
try {
do {
dummy.add(new long[1048576]);
@@ -300,7 +300,7 @@ OUTER:
Map<?, ?> gotMap = (Map<?, ?>) got;
if (!got.equals(wanted)) {
Set<T> leftKeys = new LinkedHashSet<T>(wanted.keySet());
- HashSet<Object> rightKeys = new HashSet<Object>(gotMap.keySet());
+ Set<Object> rightKeys = new HashSet<Object>(gotMap.keySet());
for (T key: leftKeys) {
assertTrue(msg + "got key(" + key + ")", rightKeys.remove(key));
assertEquals(msg + "key(" + key + ") value", wanted.get(key), gotMap.get(key));
@@ -345,7 +345,7 @@ OUTER:
}
public static <T> List<T> list(T value) {
- ArrayList<T> list = new ArrayList<T>(1);
+ List<T> list = new ArrayList<T>(1);
list.add(value);
return list;
}
@@ -355,7 +355,7 @@ OUTER:
}
public static <T> Set<T> set(T value) {
- HashSet<T> set = new HashSet<T>(1);
+ Set<T> set = new HashSet<T>(1);
set.add(value);
return set;
}
@@ -369,7 +369,7 @@ OUTER:
}
public static <T> Set<T> set(Iterator<T> it) {
- HashSet<T> set = new HashSet<T>();
+ Set<T> set = new HashSet<T>();
while (it.hasNext()) {
T item = it.next();
set.add(item);
Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java (original)
+++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java Sat Nov 5 11:16:49 2016
@@ -122,7 +122,7 @@ public final class UtilDateTime {
}
public static String formatInterval(double interval, int count, Locale locale) {
- ArrayList<Double> parts = new ArrayList<Double>(timevals.length);
+ List<Double> parts = new ArrayList<Double>(timevals.length);
for (String[] timeval: timevals) {
int value = Integer.valueOf(timeval[0]);
double remainder = interval % value;
Modified: ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java Sat Nov 5 11:16:49 2016
@@ -211,7 +211,7 @@ public class DatabaseUtil {
timer.timerString("Before Individual Table/Column Check");
- ArrayList<ModelEntity> modelEntityList = new ArrayList<ModelEntity>(modelEntities.values());
+ List<ModelEntity> modelEntityList = new ArrayList<ModelEntity>(modelEntities.values());
// sort using compareTo method on ModelEntity
Collections.sort(modelEntityList);
int curEnt = 0;
Modified: ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java (original)
+++ ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelReader.java Sat Nov 5 11:16:49 2016
@@ -319,7 +319,7 @@ TEMP_VIEW_LOOP:
}
// auto-create relationships
- TreeSet<String> orderedMessages = new TreeSet<String>();
+ Set<String> orderedMessages = new TreeSet<String>();
for (String curEntityName: new TreeSet<String>(this.getEntityNames())) {
ModelEntity curModelEntity = this.getModelEntity(curEntityName);
if (curModelEntity instanceof ModelViewEntity) {
Modified: ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java (original)
+++ ofbiz/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityTestSuite.java Sat Nov 5 11:16:49 2016
@@ -586,7 +586,7 @@ public class EntityTestSuite extends Ent
.where(EntityCondition.makeCondition("testingId", EntityOperator.LIKE, "rnmat:%"))
.queryList();
- ArrayList<GenericValue> testings = new ArrayList<GenericValue>();
+ List<GenericValue> testings = new ArrayList<GenericValue>();
for (GenericValue nodeMember: values) {
testings.add(nodeMember.getRelatedOne("Testing", false));
Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java (original)
+++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/OrderMapList.java Sat Nov 5 11:16:49 2016
@@ -56,7 +56,7 @@ public final class OrderMapList extends
listFma = FlexibleMapAccessor.getInstance(element.getAttribute("list"));
List<? extends Element> orderByElements = UtilXml.childElementList(element, "order-by");
if (orderByElements.size() > 0) {
- ArrayList<FlexibleMapAccessor<String>> orderByList = new ArrayList<FlexibleMapAccessor<String>>(orderByElements.size());
+ List<FlexibleMapAccessor<String>> orderByList = new ArrayList<FlexibleMapAccessor<String>>(orderByElements.size());
for (Element orderByElement : orderByElements) {
FlexibleMapAccessor<String> fma = FlexibleMapAccessor.getInstance(orderByElement.getAttribute("field"));
orderByList.add(fma);
Modified: ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java (original)
+++ ofbiz/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/EntityAutoEngine.java Sat Nov 5 11:16:49 2016
@@ -90,7 +90,7 @@ public final class EntityAutoEngine exte
try {
boolean allPksInOnly = true;
- LinkedList<String> pkFieldNameOutOnly = null;
+ List<String> pkFieldNameOutOnly = null;
/* Check for each pk if it's :
* 1. part IN
* 2. or part IN and OUT, but without value but present on parameters map
@@ -519,7 +519,7 @@ public final class EntityAutoEngine exte
private static Map<String, Object> invokeExpire(DispatchContext dctx, Map<String, Object> parameters, ModelService modelService, ModelEntity modelEntity, boolean allPksInOnly)
throws GeneralException {
Locale locale = (Locale) parameters.get("locale");
- LinkedList<String> fieldThruDates = new LinkedList<String>();
+ List<String> fieldThruDates = new LinkedList<String>();
boolean thruDatePresent = false;
String fieldDateNameIn = null;
Modified: ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java (original)
+++ ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java Sat Nov 5 11:16:49 2016
@@ -620,8 +620,8 @@ public class WebToolsServices {
ModelReader reader = delegator.getModelReader();
Map<String, TreeSet<String>> entitiesByPackage = new HashMap<String, TreeSet<String>>();
- TreeSet<String> packageNames = new TreeSet<String>();
- TreeSet<String> tableNames = new TreeSet<String>();
+ Set<String> packageNames = new TreeSet<String>();
+ Set<String> tableNames = new TreeSet<String>();
//put the entityNames TreeSets in a HashMap by packageName
try {
Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java Sat Nov 5 11:16:49 2016
@@ -467,7 +467,7 @@ public abstract class ModelForm extends
if (parentModel != null) {
useWhenFields.addAll(parentModel.useWhenFields);
}
- ArrayList<ModelFormFieldBuilder> fieldBuilderList = new ArrayList<ModelFormFieldBuilder>();
+ List<ModelFormFieldBuilder> fieldBuilderList = new ArrayList<ModelFormFieldBuilder>();
Map<String, ModelFormFieldBuilder> fieldBuilderMap = new HashMap<String, ModelFormFieldBuilder>();
if (parentModel != null) {
// Create this fieldList/Map from clones of parentModel's
@@ -610,7 +610,7 @@ public abstract class ModelForm extends
rowCountExdr = parentModel.rowCountExdr;
}
this.rowCountExdr = paginate;
- ArrayList<ModelFormFieldBuilder> multiSubmitBuilders = new ArrayList<ModelFormFieldBuilder>();
+ List<ModelFormFieldBuilder> multiSubmitBuilders = new ArrayList<ModelFormFieldBuilder>();
ArrayList<AutoFieldsService> autoFieldsServices = new ArrayList<AutoFieldsService>();
ArrayList<AutoFieldsEntity> autoFieldsEntities = new ArrayList<AutoFieldsEntity>();
ArrayList<SortField> sortOrderFields = new ArrayList<SortField>();
@@ -666,7 +666,7 @@ public abstract class ModelForm extends
}
}
if (sortOrderFields.size() > 0) {
- ArrayList<ModelFormFieldBuilder> sortedFields = new ArrayList<ModelFormFieldBuilder>();
+ List<ModelFormFieldBuilder> sortedFields = new ArrayList<ModelFormFieldBuilder>();
for (SortField sortField : sortOrderFields) {
String fieldName = sortField.getFieldName();
if (UtilValidate.isEmpty(fieldName)) {
Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java Sat Nov 5 11:16:49 2016
@@ -355,7 +355,7 @@ public class ModelFormField {
} else if (retVal instanceof Collection) {
Collection<Object> col = UtilGenerics.checkCollection(retVal);
Iterator<Object> iter = col.iterator();
- ArrayList<Object> newCol = new ArrayList<Object>(col.size());
+ List<Object> newCol = new ArrayList<Object>(col.size());
while (iter.hasNext()) {
Object item = iter.next();
if (item == null) {
Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormFieldBuilder.java Sat Nov 5 11:16:49 2016
@@ -568,7 +568,7 @@ public class ModelFormFieldBuilder {
Integer.valueOf(250), null);
this.setFieldInfo(textField);
} else if ("indicator".equals(modelField.getType())) {
- ArrayList<OptionSource> optionSources = new ArrayList<OptionSource>();
+ List<OptionSource> optionSources = new ArrayList<OptionSource>();
optionSources.add(new ModelFormField.SingleOption("Y", null, null));
optionSources.add(new ModelFormField.SingleOption("N", null, null));
ModelFormField.DropDownField dropDownField = new ModelFormField.DropDownField(FieldInfo.SOURCE_AUTO_ENTITY,
Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelMenuItem.java Sat Nov 5 11:16:49 2016
@@ -529,7 +529,7 @@ public class ModelMenuItem extends Model
public MenuLink(GenericValue portalPage, ModelMenuItem parentMenuItem, Locale locale) {
this.linkMenuItem = parentMenuItem;
- ArrayList<Parameter> parameterList = new ArrayList<Parameter>();
+ List<Parameter> parameterList = new ArrayList<Parameter>();
if (parentMenuItem.link != null) {
parameterList.addAll(parentMenuItem.link.getParameterList());
}
Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java Sat Nov 5 11:16:49 2016
@@ -540,7 +540,7 @@ public abstract class ModelScreenWidget
this.titleExdr = FlexibleStringExpander.getInstance(screenletElement.getAttribute("title"));
List<? extends Element> subElementList = UtilXml.childElementList(screenletElement);
// Make a copy of the unmodifiable List so we can modify it.
- ArrayList<ModelScreenWidget> subWidgets = new ArrayList<ModelScreenWidget>(ModelScreenWidget.readSubWidgets(getModelScreen(), subElementList));
+ List<ModelScreenWidget> subWidgets = new ArrayList<ModelScreenWidget>(ModelScreenWidget.readSubWidgets(getModelScreen(), subElementList));
Menu navigationMenu = null;
String navMenuName = screenletElement.getAttribute("navigation-menu-name");
if (!navMenuName.isEmpty()) {
Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java Sat Nov 5 11:16:49 2016
@@ -177,7 +177,7 @@ public class FormRenderer {
}
private List<FieldGroupBase> getInbetweenList(FieldGroup startFieldGroup, FieldGroup endFieldGroup) {
- ArrayList<FieldGroupBase> inbetweenList = new ArrayList<FieldGroupBase>();
+ List<FieldGroupBase> inbetweenList = new ArrayList<FieldGroupBase>();
boolean firstFound = false;
String startFieldGroupId = null;
String endFieldGroupId = null;
Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java Sat Nov 5 11:16:49 2016
@@ -2315,7 +2315,7 @@ public final class MacroFormRenderer imp
// strip legacy viewIndex/viewSize params from the query string
String queryString = UtilHttp.stripViewParamsFromQueryString(str, "" + paginatorNumber);
// strip parameterized index/size params from the query string
- HashSet<String> paramNames = new HashSet<String>();
+ Set<String> paramNames = new HashSet<String>();
paramNames.add(viewIndexParam);
paramNames.add(viewSizeParam);
queryString = UtilHttp.stripNamedParamsFromQueryString(queryString, paramNames);
Modified: ofbiz/trunk/specialpurpose/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java (original)
+++ ofbiz/trunk/specialpurpose/birt/src/main/java/org/apache/ofbiz/birt/email/BirtEmailServices.java Sat Nov 5 11:16:49 2016
@@ -173,7 +173,7 @@ public class BirtEmailServices {
birtContentType = "application/pdf";
}
IReportEngine engine = BirtFactory.getReportEngine();
- HashMap<String, Object> appContext = UtilGenerics.cast(engine.getConfig().getAppContext());
+ Map<String, Object> appContext = UtilGenerics.cast(engine.getConfig().getAppContext());
appContext.put("delegator", delegator);
appContext.put("dispatcher", dispatcher);
appContext.put("security", security);
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayEvents.java Sat Nov 5 11:16:49 2016
@@ -599,7 +599,7 @@ public class EbayEvents {
}
public static ShippingServiceDetailsType[] filterShippingService(ShippingServiceDetailsType[] array) {
- ArrayList<ShippingServiceDetailsType> list = new ArrayList<ShippingServiceDetailsType>();
+ List<ShippingServiceDetailsType> list = new ArrayList<ShippingServiceDetailsType>();
for (int i = 0; i < array.length; i++) {
if (isFlat(array[i].getServiceType()) && array[i].getShippingServiceID() < SHIPPING_SERVICE_ID_LIMIT) {
list.add(array[i]);
@@ -615,7 +615,7 @@ public class EbayEvents {
Map<String,Object> requestParams = UtilHttp.getParameterMap(request);
Locale locale = UtilHttp.getLocale(request);
GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
- HashMap<String, Object> attributeMapList = new HashMap<String, Object>();
+ Map<String, Object> attributeMapList = new HashMap<String, Object>();
String id = "";
if (UtilValidate.isNotEmpty(requestParams.get("listype"))) {
if ("auction".equals(requestParams.get("listype"))) {
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreCategoryFacade.java Sat Nov 5 11:16:49 2016
@@ -160,7 +160,7 @@ public class EbayStoreCategoryFacade {
//remove all 'null' code type
private static BuyerPaymentMethodCodeType[] fiterPaymentMethod(BuyerPaymentMethodCodeType[] paymentMethods) {
- ArrayList<BuyerPaymentMethodCodeType> al = new ArrayList<BuyerPaymentMethodCodeType>();
+ List<BuyerPaymentMethodCodeType> al = new ArrayList<BuyerPaymentMethodCodeType>();
for (BuyerPaymentMethodCodeType pm : paymentMethods) {
if (pm != null) {
al.add(pm);
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreHelper.java Sat Nov 5 11:16:49 2016
@@ -468,7 +468,7 @@ public class EbayStoreHelper {
public static Map<String, Object> setEbayProductListingAttribute(DispatchContext dctx, Map<String, Object> context) {
Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
- HashMap<String, Object> attributeMapList = UtilGenerics.cast(context.get("attributeMapList"));
+ Map<String, Object> attributeMapList = UtilGenerics.cast(context.get("attributeMapList"));
String productListingId = (String) context.get("productListingId");
GenericValue userLogin = (GenericValue) context.get("userLogin");
Map<String, Object> ebayProductListingAttributeMap = new HashMap<String, Object>();
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java?rev=1768189&r1=1768188&r2=1768189&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStoreOrder.java Sat Nov 5 11:16:49 2016
@@ -553,7 +553,7 @@ public class EbayStoreOrder {
BigDecimal price = new BigDecimal(itemPrice);
price = price.setScale(ShoppingCart.scale, ShoppingCart.rounding);
- HashMap<String, Object> attrs = new HashMap<String, Object>();
+ Map<String, Object> attrs = new HashMap<String, Object>();
attrs.put("shipGroup", groupIdx);
int idx = cart.addItemToEnd(productId, null, qty, null, null, attrs, null, null, dispatcher, Boolean.FALSE, Boolean.TRUE, Boolean.TRUE, Boolean.TRUE);