svn commit: r1672752 [13/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1672752 [13/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java Fri Apr 10 20:22:54 2015 @@ -19,13 +19,12 @@ package org.ofbiz.workeffort.workeffort; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.Stack; -import javolution.util.FastList; -import javolution.util.FastSet; - import net.fortuna.ical4j.model.*; import net.fortuna.ical4j.model.property.*; @@ -70,10 +69,10 @@ public class ICalRecurConverter implemen } protected DtStart dateStart = null; - protected List<DateListProperty> incDateList = FastList.newInstance(); - protected List<DateListProperty> exDateList = FastList.newInstance(); - protected List<RRule> incRuleList = FastList.newInstance(); - protected List<ExRule> exRuleList = FastList.newInstance(); + protected List<DateListProperty> incDateList = new LinkedList<DateListProperty>(); + protected List<DateListProperty> exDateList = new LinkedList<DateListProperty>(); + protected List<RRule> incRuleList = new LinkedList<RRule>(); + protected List<ExRule> exRuleList = new LinkedList<ExRule>(); protected VisitorState state = new VisitorState(); protected Stack<VisitorState> stateStack = new Stack<VisitorState>(); @@ -82,11 +81,11 @@ public class ICalRecurConverter implemen @SuppressWarnings("unchecked") protected Recur consolidateRecurs(List<Recur> recurList) { // Try to consolidate a list of Recur instances into one instance - Set<Integer> monthList = FastSet.newInstance(); - Set<Integer> monthDayList = FastSet.newInstance(); - Set<WeekDay> weekDayList = FastSet.newInstance(); - Set<Integer> hourList = FastSet.newInstance(); - Set<Integer> minuteList = FastSet.newInstance(); + Set<Integer> monthList = new HashSet<Integer>(); + Set<Integer> monthDayList = new HashSet<Integer>(); + Set<WeekDay> weekDayList = new HashSet<WeekDay>(); + Set<Integer> hourList = new HashSet<Integer>(); + Set<Integer> minuteList = new HashSet<Integer>(); String freq = null; int freqCount = 0; for (Recur recur : recurList) { @@ -302,8 +301,8 @@ public class ICalRecurConverter implemen protected class VisitorState { public boolean isExcluded = false; public boolean isIntersection = false; - public List<Recur> inclRecurList = FastList.newInstance(); - public List<Recur> exRecurList = FastList.newInstance(); + public List<Recur> inclRecurList = new LinkedList<Recur>(); + public List<Recur> exRecurList = new LinkedList<Recur>(); public void addRecur(Recur recur) { if (this.isIntersection) { if (this.isExcluded) { Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java Fri Apr 10 20:22:54 2015 @@ -23,6 +23,8 @@ import java.io.IOException; import java.io.Writer; import java.util.Date; import java.util.Enumeration; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -32,9 +34,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilHttp; @@ -71,7 +70,7 @@ public class ICalWorker { } protected static Map<String, Object> createConversionContext(HttpServletRequest request) { - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); Enumeration<String> attributeEnum = UtilGenerics.cast(request.getAttributeNames()); while (attributeEnum.hasMoreElements()) { String attributeName = attributeEnum.nextElement(); @@ -173,8 +172,8 @@ public class ICalWorker { PropFindHelper helper = new PropFindHelper(requestDocument); if (!helper.isAllProp() && !helper.isPropName()) { Document responseDocument = helper.getResponseDocument(); - List<Element> supportedProps = FastList.newInstance(); - List<Element> unSupportedProps = FastList.newInstance(); + List<Element> supportedProps = new LinkedList<Element>(); + List<Element> unSupportedProps = new LinkedList<Element>(); List<Element> propElements = helper.getFindPropsList(ResponseHelper.DAV_NAMESPACE_URI); for (Element propElement : propElements) { if ("getetag".equals(propElement.getNodeName())) { Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Fri Apr 10 20:22:54 2015 @@ -20,13 +20,12 @@ package org.ofbiz.workeffort.workeffort; import java.io.IOException; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilDateTime; @@ -55,7 +54,7 @@ public class WorkEffortKeywordIndex { Set<String> stemSet = KeywordSearchUtil.getStemSet(); Map<String, Long> keywords = new TreeMap<String, Long>(); - List<String> strings = FastList.newInstance(); + List<String> strings = new LinkedList<String>(); int widWeight = 1; try { widWeight = Integer.parseInt(EntityUtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffort.workEffortId", "1", delegator)); @@ -108,7 +107,7 @@ public class WorkEffortKeywordIndex { KeywordSearchUtil.processKeywordsForIndex(str, keywords, separators, stopWordBagAnd, stopWordBagOr, removeStems, stemSet); } - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); for (Map.Entry<String, Long> entry: keywords.entrySet()) { if (entry.getKey().length() < 60) { // ignore very long strings, cannot be stored anyway GenericValue workEffortKeyword = delegator.makeValue("WorkEffortKeyword", UtilMisc.toMap("workEffortId", workEffort.getString("workEffortId"), "keyword", entry.getKey(), "relevancyWeight", entry.getValue())); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Fri Apr 10 20:22:54 2015 @@ -21,16 +21,15 @@ package org.ofbiz.workeffort.workeffort; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javolution.util.FastList; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilMisc; @@ -134,17 +133,17 @@ public class WorkEffortSearch { public static class WorkEffortSearchContext { public int index = 1; - public List<EntityCondition> entityConditionList = FastList.newInstance(); - public List<String> orderByList = FastList.newInstance(); + public List<EntityCondition> entityConditionList = new LinkedList<EntityCondition>(); + public List<String> orderByList = new LinkedList<String>(); public List<String> fieldsToSelect = UtilMisc.toList("workEffortId"); public DynamicViewEntity dynamicViewEntity = new DynamicViewEntity(); public boolean workEffortIdGroupBy = false; public boolean includedKeywordSearch = false; public Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); - public List<Set<String>> keywordFixedOrSetAndList = FastList.newInstance(); - public Set<String> orKeywordFixedSet = FastSet.newInstance(); - public Set<String> andKeywordFixedSet = FastSet.newInstance(); - public List<GenericValue> workEffortSearchConstraintList = FastList.newInstance(); + public List<Set<String>> keywordFixedOrSetAndList = new LinkedList<Set<String>>(); + public Set<String> orKeywordFixedSet = new HashSet<String>(); + public Set<String> andKeywordFixedSet = new HashSet<String>(); + public List<GenericValue> workEffortSearchConstraintList = new LinkedList<GenericValue>(); public ResultSortOrder resultSortOrder = null; public Integer resultOffset = null; public Integer maxResults = null; @@ -274,7 +273,7 @@ public class WorkEffortSearch { dynamicViewEntity.addMemberEntity(entityAlias, "WorkEffortKeyword"); dynamicViewEntity.addAlias(entityAlias, prefix + "Keyword", "keyword", null, null, null, null); dynamicViewEntity.addViewLink("WEFF", entityAlias, Boolean.FALSE, ModelKeyMap.makeKeyMapList("workEffortId")); - List<EntityExpr> keywordOrList = FastList.newInstance(); + List<EntityExpr> keywordOrList = new LinkedList<EntityExpr>(); for (String keyword: keywordFixedOrSet) { keywordOrList.add(EntityCondition.makeCondition(prefix + "Keyword", EntityOperator.LIKE, keyword)); } @@ -386,7 +385,7 @@ public class WorkEffortSearch { int numRetreived = 1; int duplicatesFound = 0; - Set<String> workEffortIdSet = FastSet.newInstance(); + Set<String> workEffortIdSet = new HashSet<String>(); workEffortIds.add(searchResult.getString("workEffortId")); workEffortIdSet.add(searchResult.getString("workEffortId")); @@ -508,7 +507,7 @@ public class WorkEffortSearch { @Override public void addConstraint(WorkEffortSearchContext workEffortSearchContext) { - Set<String> workEffortIdSet = FastSet.newInstance(); + Set<String> workEffortIdSet = new HashSet<String>(); if (includeSubWorkEfforts) { // find all sub-categories recursively, make a Set of workEffortId WorkEffortSearch.getAllSubWorkEffortIds(workEffortId, workEffortIdSet, workEffortSearchContext.getDelegator(), workEffortSearchContext.nowTimestamp); @@ -535,7 +534,7 @@ public class WorkEffortSearch { workEffortSearchContext.dynamicViewEntity.addAlias(entityAlias, prefix + "ThruDate", "thruDate", null, null, null, null); workEffortSearchContext.dynamicViewEntity.addViewLink("WEFF", entityAlias, Boolean.TRUE, ModelKeyMap.makeKeyMapList("workEffortId","workEffortIdFrom")); - List<EntityExpr> assocConditionFromTo = FastList.newInstance(); + List<EntityExpr> assocConditionFromTo = new LinkedList<EntityExpr>(); assocConditionFromTo.add(EntityCondition.makeCondition(prefix + "WorkEffortIdTo", EntityOperator.IN, workEffortIdSet)); if (UtilValidate.isNotEmpty(workEffortAssocTypeId)) { assocConditionFromTo.add(EntityCondition.makeCondition(prefix + "WorkEffortAssocTypeId", EntityOperator.EQUALS, workEffortAssocTypeId)); @@ -556,7 +555,7 @@ public class WorkEffortSearch { workEffortSearchContext.dynamicViewEntity.addAlias(entityAlias, prefix + "ThruDate", "thruDate", null, null, null, null); workEffortSearchContext.dynamicViewEntity.addViewLink("WEFF", entityAlias, Boolean.TRUE, ModelKeyMap.makeKeyMapList("workEffortId","workEffortIdTo")); - List<EntityExpr> assocConditionToFrom = FastList.newInstance(); + List<EntityExpr> assocConditionToFrom = new LinkedList<EntityExpr>(); assocConditionToFrom.add(EntityCondition.makeCondition(prefix + "WorkEffortIdFrom", EntityOperator.IN, workEffortIdSet)); if (UtilValidate.isNotEmpty(workEffortAssocTypeId)) { assocConditionToFrom.add(EntityCondition.makeCondition(prefix + "WorkEffortAssocTypeId", EntityOperator.EQUALS, workEffortAssocTypeId)); @@ -955,7 +954,7 @@ public class WorkEffortSearch { expandedSet.add(keyword); } Set<String> fixedSet = KeywordSearchUtil.fixKeywordsForSearch(expandedSet, anyPrefix, anySuffix, removeStems, isAnd); - Set<String> fixedKeywordSet = FastSet.newInstance(); + Set<String> fixedKeywordSet = new HashSet<String>(); fixedKeywordSet.addAll(fixedSet); workEffortSearchContext.keywordFixedOrSetAndList.add(fixedKeywordSet); } Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java Fri Apr 10 20:22:54 2015 @@ -19,14 +19,13 @@ package org.ofbiz.workeffort.workeffort; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import javolution.util.FastMap; - import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; import org.ofbiz.webapp.stats.VisitHandler; @@ -99,7 +98,7 @@ public class WorkEffortSearchEvents { String searchSortOrderString = WorkEffortSearchSession.searchGetSortOrderString(false, request); // ========== populate the result Map - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.put("workEffortIds", workEffortIds); result.put("viewIndex", Integer.valueOf(viewIndex)); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Fri Apr 10 20:22:54 2015 @@ -19,6 +19,7 @@ package org.ofbiz.workeffort.workeffort; import java.sql.Timestamp; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -26,8 +27,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilHttp; @@ -69,7 +68,7 @@ public class WorkEffortSearchSession { public static void addConstraint(WorkEffortSearchConstraint workEffortSearchConstraint, HttpSession session) { WorkEffortSearchOptions workEffortSearchOptions = getWorkEffortSearchOptions(session); if (workEffortSearchOptions.constraintList == null) { - workEffortSearchOptions.constraintList = FastList.newInstance(); + workEffortSearchOptions.constraintList = new LinkedList<WorkEffortSearch.WorkEffortSearchConstraint>(); } if (!workEffortSearchOptions.constraintList.contains(workEffortSearchConstraint)) { workEffortSearchOptions.constraintList.add(workEffortSearchConstraint); @@ -132,7 +131,7 @@ public class WorkEffortSearchSession { public List<String> searchGetConstraintStrings(boolean detailed, Delegator delegator, Locale locale) { List<WorkEffortSearchConstraint> workEffortSearchConstraintList = this.getConstraintList(); - List<String> constraintStrings = FastList.newInstance(); + List<String> constraintStrings = new LinkedList<String>(); if (workEffortSearchConstraintList == null) { return constraintStrings; } @@ -209,7 +208,7 @@ public class WorkEffortSearchSession { // add a Product Set to the search if (UtilValidate.isNotEmpty(parameters.get("productId_1"))) { - List<String> productSet = FastList.newInstance(); + List<String> productSet = new LinkedList<String>(); productSet.add((String) parameters.get("productId_1")); if (UtilValidate.isNotEmpty(parameters.get("productId_2"))) { productSet.add((String) parameters.get("productId_2")); @@ -292,7 +291,7 @@ public class WorkEffortSearchSession { public static List<WorkEffortSearchOptions> getSearchOptionsHistoryList(HttpSession session) { List<WorkEffortSearchOptions> optionsHistoryList = UtilGenerics.checkList(session.getAttribute("_WORK_EFFORT_SEARCH_OPTIONS_HISTORY_")); if (optionsHistoryList == null) { - optionsHistoryList = FastList.newInstance(); + optionsHistoryList = new LinkedList<WorkEffortSearchSession.WorkEffortSearchOptions>(); session.setAttribute("_WORK_EFFORT_SEARCH_OPTIONS_HISTORY_", optionsHistoryList); } return optionsHistoryList; Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Fri Apr 10 20:22:54 2015 @@ -22,6 +22,9 @@ package org.ofbiz.workeffort.workeffort; import java.sql.Timestamp; import java.util.Collection; import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -30,10 +33,6 @@ import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.DateRange; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.TimeDuration; @@ -100,9 +99,9 @@ public class WorkEffortServices { } } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); if (validWorkEfforts == null) { - validWorkEfforts = FastList.newInstance(); + validWorkEfforts = new LinkedList<GenericValue>(); } result.put("events", validWorkEfforts); return result; @@ -116,7 +115,7 @@ public class WorkEffortServices { List<GenericValue> validWorkEfforts = null; try { - List<EntityExpr> conditionList = FastList.newInstance(); + List<EntityExpr> conditionList = new LinkedList<EntityExpr>(); conditionList.add(EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, roleTypeId)); conditionList.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "EVENT")); conditionList.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.NOT_EQUAL, "CAL_DECLINED")); @@ -132,9 +131,9 @@ public class WorkEffortServices { "WorkEffortNotFound", UtilMisc.toMap("errorString", e.toString()), locale)); } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); if (validWorkEfforts == null) { - validWorkEfforts = FastList.newInstance(); + validWorkEfforts = new LinkedList<GenericValue>(); } result.put("events", validWorkEfforts); return result; @@ -174,8 +173,8 @@ public class WorkEffortServices { } } - Map<String, Object> result = FastMap.newInstance(); - if (validWorkEfforts == null) validWorkEfforts = FastList.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); + if (validWorkEfforts == null) validWorkEfforts = new LinkedList<GenericValue>(); validWorkEfforts = WorkEffortWorker.removeDuplicateWorkEfforts(validWorkEfforts); result.put("tasks", validWorkEfforts); return result; @@ -190,7 +189,7 @@ public class WorkEffortServices { if (userLogin != null && userLogin.get("partyId") != null) { try { - List<EntityExpr> constraints = FastList.newInstance(); + List<EntityExpr> constraints = new LinkedList<EntityExpr>(); constraints.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, userLogin.get("partyId"))); constraints.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "ACTIVITY")); @@ -211,8 +210,8 @@ public class WorkEffortServices { } } - Map<String, Object> result = FastMap.newInstance(); - if (validWorkEfforts == null) validWorkEfforts = FastList.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); + if (validWorkEfforts == null) validWorkEfforts = new LinkedList<GenericValue>(); result.put("activities", validWorkEfforts); return result; } @@ -226,7 +225,7 @@ public class WorkEffortServices { if (userLogin != null && userLogin.get("partyId") != null) { try { - List<EntityExpr> constraints = FastList.newInstance(); + List<EntityExpr> constraints = new LinkedList<EntityExpr>(); constraints.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, userLogin.get("partyId"))); constraints.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "ACTIVITY")); @@ -247,8 +246,8 @@ public class WorkEffortServices { } } - Map<String, Object> result = FastMap.newInstance(); - if (roleWorkEfforts == null) roleWorkEfforts = FastList.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); + if (roleWorkEfforts == null) roleWorkEfforts = new LinkedList<GenericValue>(); result.put("roleActivities", roleWorkEfforts); return result; } @@ -262,7 +261,7 @@ public class WorkEffortServices { if (userLogin != null && userLogin.get("partyId") != null) { try { - List<EntityExpr> constraints = FastList.newInstance(); + List<EntityExpr> constraints = new LinkedList<EntityExpr>(); constraints.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, userLogin.get("partyId"))); constraints.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "ACTIVITY")); @@ -283,8 +282,8 @@ public class WorkEffortServices { } } - Map<String, Object> result = FastMap.newInstance(); - if (groupWorkEfforts == null) groupWorkEfforts = FastList.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); + if (groupWorkEfforts == null) groupWorkEfforts = new LinkedList<GenericValue>(); result.put("groupActivities", groupWorkEfforts); return result; } @@ -293,7 +292,7 @@ public class WorkEffortServices { Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Security security = ctx.getSecurity(); - Map<String, Object> resultMap = FastMap.newInstance(); + Map<String, Object> resultMap = new HashMap<String, Object>(); String workEffortId = (String) context.get("workEffortId"); GenericValue workEffort = null; @@ -377,7 +376,7 @@ public class WorkEffortServices { if (calEntryRange.intersectsRange(dateRange) && !(calEntryRange.end().equals(dateRange.start()) || calEntryRange.start().equals(dateRange.end()))) { List<Map<String, Object>> calendarEntryByDateRangeList = calendarEntriesByDateRange.get(dateRange); if (calendarEntryByDateRangeList == null) { - calendarEntryByDateRangeList = FastList.newInstance(); + calendarEntryByDateRangeList = new LinkedList(); } calendarEntryByDateRangeList.add(calendarEntry); calendarEntriesByDateRange.put(dateRange, calendarEntryByDateRangeList); @@ -390,11 +389,11 @@ public class WorkEffortServices { } private static List<EntityCondition> getDefaultWorkEffortExprList(String calendarType, Collection<String> partyIds, String workEffortTypeId, List<EntityCondition> cancelledCheckAndList) { - List<EntityCondition> entityExprList = FastList.newInstance(); + List<EntityCondition> entityExprList = new LinkedList<EntityCondition>(); if (cancelledCheckAndList != null) { entityExprList.addAll(cancelledCheckAndList); } - List<EntityExpr> typesList = FastList.newInstance(); + List<EntityExpr> typesList = new LinkedList<EntityExpr>(); if (UtilValidate.isNotEmpty(workEffortTypeId)) { typesList.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, workEffortTypeId)); } @@ -540,7 +539,7 @@ public class WorkEffortServices { List<GenericValue> validWorkEfforts = null; Collection<String> partyIdsToUse = partyIds; if (partyIdsToUse == null) { - partyIdsToUse = FastSet.newInstance(); + partyIdsToUse = new HashSet<String>(); } if (UtilValidate.isNotEmpty(partyId)) { if (partyId.equals(userLogin.getString("partyId")) || security.hasEntityPermission("WORKEFFORTMGR", "_VIEW", userLogin)) { @@ -642,9 +641,9 @@ public class WorkEffortServices { } // Split the WorkEffort list into a map with entries for each period, period start is the key - List<Map<String, Object>> periods = FastList.newInstance(); + List<Map<String, Object>> periods = new LinkedList<Map<String,Object>>(); if (validWorkEfforts != null) { - List<DateRange> periodRanges = FastList.newInstance(); + List<DateRange> periodRanges = new LinkedList<DateRange>(); for (int i = 0; i < numPeriods; i++) { Timestamp curPeriodStart = UtilDateTime.adjustTimestamp(startStamp, periodType, i, timeZone, locale); Timestamp curPeriodEnd = UtilDateTime.adjustTimestamp(curPeriodStart, periodType, 1, timeZone, locale); @@ -653,8 +652,8 @@ public class WorkEffortServices { } try { // Process recurring work efforts - Set<GenericValue> exclusions = FastSet.newInstance(); - Set<GenericValue> inclusions = FastSet.newInstance(); + Set<GenericValue> exclusions = new HashSet<GenericValue>(); + Set<GenericValue> inclusions = new HashSet<GenericValue>(); DateRange range = new DateRange(startStamp, endStamp); Calendar cal = UtilDateTime.toCalendar(startStamp, timeZone, locale); for (GenericValue workEffort : validWorkEfforts) { @@ -695,8 +694,8 @@ public class WorkEffortServices { // For each period in the set we check all work efforts to see if they fall within range boolean firstEntry = true; for (DateRange periodRange : periodRanges) { - List<Map<String, Object>> curWorkEfforts = FastList.newInstance(); - Map<String, Object> entry = FastMap.newInstance(); + List<Map<String, Object>> curWorkEfforts = new LinkedList<Map<String,Object>>(); + Map<String, Object> entry = new HashMap<String, Object>(); for (GenericValue workEffort : validWorkEfforts) { Timestamp startDate = workEffort.getTimestamp("estimatedStartDate"); if (workEffort.getTimestamp("actualStartDate") != null) { @@ -709,7 +708,7 @@ public class WorkEffortServices { if (endDate == null) endDate = startDate; DateRange weRange = new DateRange(startDate, endDate); if (periodRange.intersectsRange(weRange)) { - Map<String, Object> calEntry = FastMap.newInstance(); + Map<String, Object> calEntry = new HashMap<String, Object>(); calEntry.put("workEffort", workEffort); long length = ((weRange.end().after(endStamp) ? endStamp.getTime() : weRange.end().getTime()) - (weRange.start().before(startStamp) ? startStamp.getTime() : weRange.start().getTime())); int periodSpan = (int) Math.ceil((double) length / periodLen); @@ -741,7 +740,7 @@ public class WorkEffortServices { periods.add(entry); } } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.put("periods", periods); result.put("maxConcurrentEntries", Integer.valueOf(maxConcurrentEntries)); return result; @@ -753,14 +752,14 @@ public class WorkEffortServices { String facilityId = (String) context.get("facilityId"); // optional Locale locale = (Locale) context.get("locale"); - Map<String, Map<String, Object>> summaryInByFacility = FastMap.newInstance(); - Map<String, Map<String, Object>> summaryOutByFacility = FastMap.newInstance(); + Map<String, Map<String, Object>> summaryInByFacility = new HashMap<String, Map<String,Object>>(); + Map<String, Map<String, Object>> summaryOutByFacility = new HashMap<String, Map<String,Object>>(); try { // // Information about the running production runs that are going // to produce units of productId by facility. // - List<EntityCondition> findIncomingProductionRunsConds = FastList.newInstance(); + List<EntityCondition> findIncomingProductionRunsConds = new LinkedList<EntityCondition>(); findIncomingProductionRunsConds.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); findIncomingProductionRunsConds.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "WEGS_CREATED")); @@ -769,7 +768,7 @@ public class WorkEffortServices { findIncomingProductionRunsConds.add(EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId)); } - List<EntityCondition> findIncomingProductionRunsStatusConds = FastList.newInstance(); + List<EntityCondition> findIncomingProductionRunsStatusConds = new LinkedList<EntityCondition>(); findIncomingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_CREATED")); findIncomingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_SCHEDULED")); findIncomingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_DOC_PRINTED")); @@ -803,7 +802,7 @@ public class WorkEffortServices { Map<String, Object> quantitySummary = UtilGenerics.checkMap(summaryInByFacility.get(weFacilityId)); if (quantitySummary == null) { - quantitySummary = FastMap.newInstance(); + quantitySummary = new HashMap<String, Object>(); quantitySummary.put("facilityId", weFacilityId); summaryInByFacility.put(weFacilityId, quantitySummary); } @@ -816,7 +815,7 @@ public class WorkEffortServices { List<GenericValue> incomingProductionRunList = UtilGenerics.checkList(quantitySummary.get("incomingProductionRunList")); if (incomingProductionRunList == null) { - incomingProductionRunList = FastList.newInstance(); + incomingProductionRunList = new LinkedList<GenericValue>(); quantitySummary.put("incomingProductionRunList", incomingProductionRunList); } incomingProductionRunList.add(incomingProductionRun); @@ -825,7 +824,7 @@ public class WorkEffortServices { // Information about the running production runs that are going // to consume units of productId by facility. // - List<EntityCondition> findOutgoingProductionRunsConds = FastList.newInstance(); + List<EntityCondition> findOutgoingProductionRunsConds = new LinkedList<EntityCondition>(); findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId)); findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "WEGS_CREATED")); @@ -834,7 +833,7 @@ public class WorkEffortServices { findOutgoingProductionRunsConds.add(EntityCondition.makeCondition("facilityId", EntityOperator.EQUALS, facilityId)); } - List<EntityCondition> findOutgoingProductionRunsStatusConds = FastList.newInstance(); + List<EntityCondition> findOutgoingProductionRunsStatusConds = new LinkedList<EntityCondition>(); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_CREATED")); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_SCHEDULED")); findOutgoingProductionRunsStatusConds.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, "PRUN_DOC_PRINTED")); @@ -851,7 +850,7 @@ public class WorkEffortServices { Map<String, Object> quantitySummary = UtilGenerics.checkMap(summaryOutByFacility.get(weFacilityId)); if (quantitySummary == null) { - quantitySummary = FastMap.newInstance(); + quantitySummary = new HashMap<String, Object>(); quantitySummary.put("facilityId", weFacilityId); summaryOutByFacility.put(weFacilityId, quantitySummary); } @@ -864,7 +863,7 @@ public class WorkEffortServices { List<GenericValue> outgoingProductionRunList = UtilGenerics.checkList(quantitySummary.get("outgoingProductionRunList")); if (outgoingProductionRunList == null) { - outgoingProductionRunList = FastList.newInstance(); + outgoingProductionRunList = new LinkedList<GenericValue>(); quantitySummary.put("outgoingProductionRunList", outgoingProductionRunList); } outgoingProductionRunList.add(outgoingProductionRun); @@ -1121,8 +1120,8 @@ public class WorkEffortServices { EntityListIterator eli = (EntityListIterator) context.get("workEffortIterator"); if (eli != null) { try { - Set<String> keys = FastSet.newInstance(); - resultList = FastList.newInstance(); + Set<String> keys = new HashSet<String>(); + resultList = new LinkedList<GenericValue>(); GenericValue workEffort = eli.next(); while (workEffort != null) { String workEffortId = workEffort.getString("workEffortId"); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java Fri Apr 10 20:22:54 2015 @@ -19,12 +19,11 @@ package org.ofbiz.workeffort.workeffort; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Set; -import javolution.util.FastList; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; @@ -50,13 +49,13 @@ public class WorkEffortWorker { right = "workEffortIdTo"; } - List<GenericValue> workEfforts = FastList.newInstance(); + List<GenericValue> workEfforts = new LinkedList<GenericValue>(); try { List<GenericValue> childWEAssocsLevelFirst = EntityQuery.use(delegator).from("WorkEffortAssoc").where(left, workEffortId, "workEffortAssocTypeId", workEffortAssocTypeId).cache(true).queryList(); for (GenericValue childWEAssocLevelFirst : childWEAssocsLevelFirst) { List<GenericValue> childWEAssocsLevelNext = EntityQuery.use(delegator).from("WorkEffortAssoc").where(left, childWEAssocLevelFirst.get(right), "workEffortAssocTypeId", workEffortAssocTypeId).cache(true).queryList(); while (UtilValidate.isNotEmpty(childWEAssocsLevelNext)) { - List<GenericValue> tempWorkEffortList = FastList.newInstance(); + List<GenericValue> tempWorkEffortList = new LinkedList<GenericValue>(); for (GenericValue childWEAssocLevelNext : childWEAssocsLevelNext) { List<GenericValue> childWEAssocsLevelNth = EntityQuery.use(delegator).from("WorkEffortAssoc").where(left, childWEAssocLevelNext.get(right), "workEffortAssocTypeId", workEffortAssocTypeId).cache(true).queryList(); if (UtilValidate.isNotEmpty(childWEAssocsLevelNth)) { @@ -75,8 +74,8 @@ public class WorkEffortWorker { } public static List<GenericValue> removeDuplicateWorkEfforts(List<GenericValue> workEfforts) { - Set<String> keys = FastSet.newInstance(); - Set<GenericValue> exclusions = FastSet.newInstance(); + Set<String> keys = new HashSet<String>(); + Set<GenericValue> exclusions = new HashSet<GenericValue>(); for (GenericValue workEffort : workEfforts) { String workEffortId = workEffort.getString("workEffortId"); if (keys.contains(workEffortId)) { Modified: ofbiz/trunk/framework/common/template/JsLanguageFilesMapping.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/JsLanguageFilesMapping.ftl?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/common/template/JsLanguageFilesMapping.ftl (original) +++ ofbiz/trunk/framework/common/template/JsLanguageFilesMapping.ftl Fri Apr 10 20:22:54 2015 @@ -21,10 +21,9 @@ package org.ofbiz.common; +import java.util.HashMap; import java.util.Map; -import javolution.util.FastMap; - <#-- The comment in UPPERCASE below is dynamically put in the JsLanguageFilesMapping.java generated file, so please keep it... --> public final class JsLanguageFilesMapping { @@ -34,7 +33,7 @@ public final class JsLanguageFilesMappin public static class datejs { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new HashMap<String, String>(); private static String defaultDateJs = "/images/jquery/plugins/datejs/date-en-US.js"; static { @@ -54,7 +53,7 @@ public final class JsLanguageFilesMappin } public static class jquery { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new HashMap<String, String>(); private static String defaultDateJs = "/images/jquery/ui/i18n/jquery.ui.datepicker-en.js"; static { @@ -74,7 +73,7 @@ public final class JsLanguageFilesMappin } public static class validation { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new HashMap<String, String>(); private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js"; static { @@ -93,7 +92,7 @@ public final class JsLanguageFilesMappin } public static class dateTime { - private static Map<String, String> localeFiles = FastMap.newInstance(); + private static Map<String, String> localeFiles = new HashMap<String, String>(); private static String defaultDateTime = "/images/webapp/images/jquery/ui/i18n/jquery.ui.datepicker-en.js"; static { Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original) +++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Fri Apr 10 20:22:54 2015 @@ -256,7 +256,7 @@ public class EntityPermissionChecker { // Get all the condition operations that could apply, rather than having to go thru // entire table each time. - //List condList = FastList.newInstance(); + //List condList = new LinkedList(); //Iterator iterType = targetOperationList.iterator(); //while (iterType.hasNext()) { // String op = (String)iterType.next(); Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Fri Apr 10 20:22:54 2015 @@ -34,7 +34,10 @@ import java.net.URL; import java.sql.Timestamp; import java.text.NumberFormat; import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -44,10 +47,6 @@ import java.util.TreeSet; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -109,7 +108,7 @@ public class WebToolsServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); - List<String> messages = FastList.newInstance(); + List<String> messages = new LinkedList<String>(); String filename = (String)context.get("filename"); String fmfilename = (String)context.get("fmfilename"); @@ -157,7 +156,7 @@ public class WebToolsServices { try { Configuration conf = org.ofbiz.base.util.template.FreeMarkerWorker.getDefaultOfbizConfig(); template = new Template("FMImportFilter", templateReader, conf); - Map<String, Object> fmcontext = FastMap.newInstance(); + Map<String, Object> fmcontext = new HashMap<String, Object>(); InputSource ins = url != null ? new InputSource(url.openStream()) : new InputSource(new StringReader(fulltext)); NodeModel nodeModel; @@ -221,7 +220,7 @@ public class WebToolsServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); - List<String> messages = FastList.newInstance(); + List<String> messages = new LinkedList<String>(); String path = (String) context.get("path"); String mostlyInserts = (String) context.get("mostlyInserts"); @@ -246,7 +245,7 @@ public class WebToolsServices { if (baseDir.isDirectory() && baseDir.canRead()) { File[] fileArray = baseDir.listFiles(); - FastList<File> files = FastList.newInstance(); + List<File> files = new LinkedList<File>(); for (File file: fileArray) { if (file.getName().toUpperCase().endsWith("XML")) { files.add(file); @@ -256,11 +255,11 @@ public class WebToolsServices { int passes=0; int initialListSize = files.size(); int lastUnprocessedFilesCount = 0; - FastList<File> unprocessedFiles = FastList.newInstance(); + List<File> unprocessedFiles = new LinkedList<File>(); while (files.size()>0 && files.size() != lastUnprocessedFilesCount) { lastUnprocessedFilesCount = files.size(); - unprocessedFiles = FastList.newInstance(); + unprocessedFiles = new LinkedList<File>(); for (File f: files) { Map<String, Object> parseEntityXmlFileArgs = UtilMisc.toMap("mostlyInserts", mostlyInserts, "createDummyFks", createDummyFks, @@ -330,13 +329,13 @@ public class WebToolsServices { Integer txTimeoutInt = (Integer) context.get("txTimeout"); int txTimeout = txTimeoutInt != null ? txTimeoutInt.intValue() : -1; - List<Object> messages = FastList.newInstance(); + List<Object> messages = new LinkedList<Object>(); // parse the pass in list of readers to use List<String> readerNames = null; if (UtilValidate.isNotEmpty(readers) && !"none".equalsIgnoreCase(readers)) { if (readers.indexOf(",") == -1) { - readerNames = FastList.newInstance(); + readerNames = new LinkedList<String>(); readerNames.add(readers); } else { readerNames = StringUtil.split(readers, ","); @@ -366,7 +365,7 @@ public class WebToolsServices { // need a list if it is empty if (urlList == null) { - urlList = FastList.newInstance(); + urlList = new LinkedList<URL>(); } // process the list of files @@ -374,8 +373,8 @@ public class WebToolsServices { changedFormat.setMinimumIntegerDigits(5); changedFormat.setGroupingUsed(false); - List<Object> errorMessages = FastList.newInstance(); - List<String> infoMessages = FastList.newInstance(); + List<Object> errorMessages = new LinkedList<Object>(); + List<String> infoMessages = new LinkedList<String>(); int totalRowsChanged = 0; if (UtilValidate.isNotEmpty(urlList)) { messages.add("=-=-=-=-=-=-= Doing a data " + (checkDataOnly ? "check" : "load") + " with the following files:"); @@ -477,7 +476,7 @@ public class WebToolsServices { txTimeout = Integer.valueOf(7200); } - List<String> results = FastList.newInstance(); + List<String> results = new LinkedList<String>(); if (UtilValidate.isNotEmpty(outpath)) { File outdir = new File(outpath); @@ -509,7 +508,7 @@ public class WebToolsServices { boolean beganTx = TransactionUtil.begin(); // some databases don't support cursors, or other problems may happen, so if there is an error here log it and move on to get as much as possible try { - List<EntityCondition> conds = FastList.newInstance(); + List<EntityCondition> conds = new LinkedList<EntityCondition>(); if (UtilValidate.isNotEmpty(fromDate)) { conds.add(EntityCondition.makeCondition("createdStamp", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate)); } @@ -624,7 +623,7 @@ public class WebToolsServices { Map<String, Object> resultMap = ServiceUtil.returnSuccess(); ModelReader reader = delegator.getModelReader(); - Map<String, TreeSet<String>> entitiesByPackage = FastMap.newInstance(); + Map<String, TreeSet<String>> entitiesByPackage = new HashMap<String, TreeSet<String>>(); TreeSet<String> packageNames = new TreeSet<String>(); TreeSet<String> tableNames = new TreeSet<String>(); @@ -651,14 +650,14 @@ public class WebToolsServices { } String search = (String) context.get("search"); - List<Map<String, Object>> packagesList = FastList.newInstance(); + List<Map<String, Object>> packagesList = new LinkedList<Map<String,Object>>(); try { for (String pName : packageNames) { - Map<String, Object> packageMap = FastMap.newInstance(); + Map<String, Object> packageMap = new HashMap<String, Object>(); TreeSet<String> entities = entitiesByPackage.get(pName); - List<Map<String, Object>> entitiesList = FastList.newInstance(); + List<Map<String, Object>> entitiesList = new LinkedList<Map<String,Object>>(); for (String entityName: entities) { - Map<String, Object> entityMap = FastMap.newInstance(); + Map<String, Object> entityMap = new HashMap<String, Object>(); String helperName = delegator.getEntityHelperName(entityName); String groupName = delegator.getEntityGroupName(entityName); if (search == null || entityName.toLowerCase().indexOf(search.toLowerCase()) != -1) { @@ -682,9 +681,9 @@ public class WebToolsServices { } // fields list - List<Map<String, Object>> javaNameList = FastList.newInstance(); + List<Map<String, Object>> javaNameList = new LinkedList<Map<String,Object>>(); for (Iterator<ModelField> f = entity.getFieldsIterator(); f.hasNext();) { - Map<String, Object> javaNameMap = FastMap.newInstance(); + Map<String, Object> javaNameMap = new HashMap<String, Object>(); ModelField field = f.next(); ModelFieldType type = delegator.getEntityFieldType(entity, field.getType()); javaNameMap.put("isPk", field.getIsPk()); @@ -718,14 +717,14 @@ public class WebToolsServices { } // relations list - List<Map<String, Object>> relationsList = FastList.newInstance(); + List<Map<String, Object>> relationsList = new LinkedList<Map<String,Object>>(); for (int r = 0; r < entity.getRelationsSize(); r++) { - Map<String, Object> relationMap = FastMap.newInstance(); + Map<String, Object> relationMap = new HashMap<String, Object>(); ModelRelation relation = entity.getRelation(r); - List<Map<String, Object>> keysList = FastList.newInstance(); + List<Map<String, Object>> keysList = new LinkedList<Map<String,Object>>(); int row = 1; for (ModelKeyMap keyMap : relation.getKeyMaps()) { - Map<String, Object> keysMap = FastMap.newInstance(); + Map<String, Object> keysMap = new HashMap<String, Object>(); String fieldName = null; String relFieldName = null; if (keyMap.getFieldName().equals(keyMap.getRelFieldName())) { @@ -751,16 +750,16 @@ public class WebToolsServices { } // index list - List<Map<String, Object>> indexList = FastList.newInstance(); + List<Map<String, Object>> indexList = new LinkedList<Map<String,Object>>(); for (int r = 0; r < entity.getIndexesSize(); r++) { - List<String> fieldNameList = FastList.newInstance(); + List<String> fieldNameList = new LinkedList<String>(); ModelIndex index = entity.getIndex(r); for (Iterator<ModelIndex.Field> fieldIterator = index.getFields().iterator(); fieldIterator.hasNext();) { fieldNameList.add(fieldIterator.next().getFieldName()); } - Map<String, Object> indexMap = FastMap.newInstance(); + Map<String, Object> indexMap = new HashMap<String, Object>(); indexMap.put("name", index.getName()); indexMap.put("description", index.getDescription()); indexMap.put("fieldNameList", fieldNameList); @@ -823,7 +822,7 @@ public class WebToolsServices { Set<String> entityNames = new TreeSet<String>(); if (UtilValidate.isNotEmpty(entityPackageNameOrig)) { - Set<String> entityPackageNameSet = FastSet.newInstance(); + Set<String> entityPackageNameSet = new HashSet<String>(); entityPackageNameSet.addAll(StringUtil.split(entityPackageNameOrig, ",")); Debug.logInfo("Exporting with entityPackageNameSet: " + entityPackageNameSet, module); @@ -851,12 +850,12 @@ public class WebToolsServices { } // write the index.eomodeld file - Map<String, Object> topLevelMap = FastMap.newInstance(); + Map<String, Object> topLevelMap = new HashMap<String, Object>(); topLevelMap.put("EOModelVersion", "\"2.1\""); - List<Map<String, Object>> entitiesMapList = FastList.newInstance(); + List<Map<String, Object>> entitiesMapList = new LinkedList<Map<String,Object>>(); topLevelMap.put("entities", entitiesMapList); for (String entityName: entityNames) { - Map<String, Object> entitiesMap = FastMap.newInstance(); + Map<String, Object> entitiesMap = new HashMap<String, Object>(); entitiesMapList.add(entitiesMap); entitiesMap.put("className", "EOGenericRecord"); entitiesMap.put("name", entityName); Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java Fri Apr 10 20:22:54 2015 @@ -24,6 +24,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -33,8 +34,6 @@ import java.util.concurrent.Future; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastSet; - import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.concurrent.ExecutionPool; import org.ofbiz.base.util.Debug; @@ -329,7 +328,7 @@ public class ArtifactInfoFactory { } public Set<ArtifactInfoBase> getAllArtifactInfosByNamePartial(String artifactNamePartial, String type) { - Set<ArtifactInfoBase> aiBaseSet = FastSet.newInstance(); + Set<ArtifactInfoBase> aiBaseSet = new HashSet<ArtifactInfoBase>(); if (UtilValidate.isEmpty(artifactNamePartial)) { return aiBaseSet; Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java Fri Apr 10 20:22:54 2015 @@ -20,12 +20,11 @@ package org.ofbiz.webtools.artifactinfo; import java.net.MalformedURLException; import java.net.URL; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.TreeSet; -import javolution.util.FastSet; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.GeneralException; import org.ofbiz.entity.GenericEntityException; @@ -112,13 +111,13 @@ public class EntityArtifactInfo extends /** Get the Services called by Entity ECA */ public Set<ServiceArtifactInfo> getServicesCalledByEntityEca() { - Set<ServiceArtifactInfo> serviceSet = FastSet.newInstance(); + Set<ServiceArtifactInfo> serviceSet = new HashSet<ServiceArtifactInfo>(); // TODO: implement this return serviceSet; } public Set<EntityEcaRule> getEntityEcaRules() { - Set<EntityEcaRule> eecaSet = FastSet.newInstance(); + Set<EntityEcaRule> eecaSet = new HashSet<EntityEcaRule>(); // TODO: implement this return eecaSet; } Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java Fri Apr 10 20:22:54 2015 @@ -21,13 +21,12 @@ package org.ofbiz.webtools.artifactinfo; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.util.HashSet; import java.util.Set; import java.util.TreeSet; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastSet; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -216,7 +215,7 @@ public class ScreenWidgetArtifactInfo ex public Set<ScreenWidgetArtifactInfo> getScreensIncludedInScreen() { // TODO: implement this - return FastSet.newInstance(); + return new HashSet<ScreenWidgetArtifactInfo>(); } public Set<ScreenWidgetArtifactInfo> getScreensIncludingThisScreen() { Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java Fri Apr 10 20:22:54 2015 @@ -23,15 +23,14 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.net.URL; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.FileUtil; @@ -178,7 +177,7 @@ public class ServiceArtifactInfo extends populateServicesFromNameSet(allServiceNameSet); } } else if ("group".equals(this.modelService.engineName)) { - Set<String> allServiceNameSet = FastSet.newInstance(); + Set<String> allServiceNameSet = new HashSet<String>(); GroupModel groupModel = modelService.internalGroup; if (groupModel == null) { groupModel = ServiceGroupReader.getGroupModel(this.modelService.location); @@ -279,7 +278,7 @@ public class ServiceArtifactInfo extends public Set<ServiceArtifactInfo> getServicesCalledByServiceEcas() { // TODO: implement this sometime, not really necessary - return FastSet.newInstance(); + return new HashSet<ServiceArtifactInfo>(); } public Set<ServiceEcaArtifactInfo> getServiceEcaRulesTriggeredByService() { @@ -288,7 +287,7 @@ public class ServiceArtifactInfo extends public Set<ServiceArtifactInfo> getServicesCallingServiceByEcas() { // TODO: implement this sometime, not really necessary - return FastSet.newInstance(); + return new HashSet<ServiceArtifactInfo>(); } public Set<ServiceEcaArtifactInfo> getServiceEcaRulesCallingService() { @@ -316,9 +315,9 @@ public class ServiceArtifactInfo extends Debug.logInfo("Writing Service Call Graph EO Model for service [" + this.modelService.name + "] to [" + eomodeldFullPath + "]", module); - Set<String> allDiagramEntitiesWithPrefixes = FastSet.newInstance(); - List<ServiceArtifactInfo> allServiceList = FastList.newInstance(); - List<ServiceEcaArtifactInfo> allServiceEcaList = FastList.newInstance(); + Set<String> allDiagramEntitiesWithPrefixes = new HashSet<String>(); + List<ServiceArtifactInfo> allServiceList = new LinkedList<ServiceArtifactInfo>(); + List<ServiceEcaArtifactInfo> allServiceEcaList = new LinkedList<ServiceEcaArtifactInfo>(); // make sure that any prefix that might have been set on this is cleared this.setDisplayPrefix(""); @@ -345,7 +344,7 @@ public class ServiceArtifactInfo extends allServiceList.add(calledService); } - Map<String, Integer> displaySuffixNumByEcaName = FastMap.newInstance(); + Map<String, Integer> displaySuffixNumByEcaName = new HashMap<String, Integer>(); // all SECAs and triggering services that call this service as an action Set<ServiceEcaArtifactInfo> callingServiceEcaSet = this.getServiceEcaRulesCallingService(); @@ -386,12 +385,12 @@ public class ServiceArtifactInfo extends } // write index.eomodeld file - Map<String, Object> indexEoModelMap = FastMap.newInstance(); + Map<String, Object> indexEoModelMap = new HashMap<String, Object>(); indexEoModelMap.put("EOModelVersion", "\"2.1\""); - List<Map<String, Object>> entitiesMapList = FastList.newInstance(); + List<Map<String, Object>> entitiesMapList = new LinkedList<Map<String,Object>>(); indexEoModelMap.put("entities", entitiesMapList); for (String entityName: allDiagramEntitiesWithPrefixes) { - Map<String, Object> entitiesMap = FastMap.newInstance(); + Map<String, Object> entitiesMap = new HashMap<String, Object>(); entitiesMapList.add(entitiesMap); entitiesMap.put("className", "EOGenericRecord"); entitiesMap.put("name", entityName); @@ -446,17 +445,17 @@ public class ServiceArtifactInfo extends } public Map<String, Object> createEoModelMap(Set<ServiceArtifactInfo> callingServiceSet, Set<ServiceArtifactInfo> calledServiceSet, Set<ServiceEcaArtifactInfo> callingServiceEcaSet, Set<ServiceEcaArtifactInfo> calledServiceEcaSet, boolean useMoreDetailedNames) { - if (callingServiceSet == null) callingServiceSet = FastSet.newInstance(); - if (calledServiceSet == null) calledServiceSet = FastSet.newInstance(); - if (callingServiceEcaSet == null) callingServiceEcaSet = FastSet.newInstance(); - if (calledServiceEcaSet == null) calledServiceEcaSet = FastSet.newInstance(); - Map<String, Object> topLevelMap = FastMap.newInstance(); + if (callingServiceSet == null) callingServiceSet = new HashSet<ServiceArtifactInfo>(); + if (calledServiceSet == null) calledServiceSet = new HashSet<ServiceArtifactInfo>(); + if (callingServiceEcaSet == null) callingServiceEcaSet = new HashSet<ServiceEcaArtifactInfo>(); + if (calledServiceEcaSet == null) calledServiceEcaSet = new HashSet<ServiceEcaArtifactInfo>(); + Map<String, Object> topLevelMap = new HashMap<String, Object>(); topLevelMap.put("name", this.getDisplayPrefixedName()); topLevelMap.put("className", "EOGenericRecord"); // for classProperties add attribute names AND relationship names to get a nice, complete chart - List<String> classPropertiesList = FastList.newInstance(); + List<String> classPropertiesList = new LinkedList<String>(); topLevelMap.put("classProperties", classPropertiesList); for (ModelParam param: this.modelService.getModelParamList()) { // skip the internal parameters, very redundant in the diagrams @@ -482,10 +481,10 @@ public class ServiceArtifactInfo extends } // attributes - List<Map<String, Object>> attributesList = FastList.newInstance(); + List<Map<String, Object>> attributesList = new LinkedList<Map<String,Object>>(); topLevelMap.put("attributes", attributesList); for (ModelParam param: this.modelService.getModelParamList()) { - Map<String, Object> attributeMap = FastMap.newInstance(); + Map<String, Object> attributeMap = new HashMap<String, Object>(); attributesList.add(attributeMap); if (useMoreDetailedNames) { @@ -498,10 +497,10 @@ public class ServiceArtifactInfo extends } // relationships - List<Map<String, Object>> relationshipsMapList = FastList.newInstance(); + List<Map<String, Object>> relationshipsMapList = new LinkedList<Map<String,Object>>(); for (ServiceArtifactInfo sai: callingServiceSet) { - Map<String, Object> relationshipMap = FastMap.newInstance(); + Map<String, Object> relationshipMap = new HashMap<String, Object>(); relationshipsMapList.add(relationshipMap); relationshipMap.put("name", sai.getDisplayPrefixedName()); @@ -516,7 +515,7 @@ public class ServiceArtifactInfo extends //joinsMap.put("destinationAttribute", keyMap.getRelFieldName()); } for (ServiceArtifactInfo sai: calledServiceSet) { - Map<String, Object> relationshipMap = FastMap.newInstance(); + Map<String, Object> relationshipMap = new HashMap<String, Object>(); relationshipsMapList.add(relationshipMap); relationshipMap.put("name", sai.getDisplayPrefixedName()); @@ -532,7 +531,7 @@ public class ServiceArtifactInfo extends } for (ServiceEcaArtifactInfo seai: callingServiceEcaSet) { - Map<String, Object> relationshipMap = FastMap.newInstance(); + Map<String, Object> relationshipMap = new HashMap<String, Object>(); relationshipsMapList.add(relationshipMap); relationshipMap.put("name", seai.getDisplayPrefixedName()); @@ -541,7 +540,7 @@ public class ServiceArtifactInfo extends relationshipMap.put("isMandatory", "Y"); } for (ServiceEcaArtifactInfo seai: calledServiceEcaSet) { - Map<String, Object> relationshipMap = FastMap.newInstance(); + Map<String, Object> relationshipMap = new HashMap<String, Object>(); relationshipsMapList.add(relationshipMap); relationshipMap.put("name", seai.getDisplayPrefixedName()); Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java Fri Apr 10 20:22:54 2015 @@ -20,15 +20,14 @@ package org.ofbiz.webtools.artifactinfo; import java.net.MalformedURLException; import java.net.URL; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilMisc; @@ -114,15 +113,15 @@ public class ServiceEcaArtifactInfo exte } public Map<String, Object> createEoModelMap(Set<ServiceArtifactInfo> triggeringServiceSet, Set<ServiceArtifactInfo> triggeredServiceSet, boolean useMoreDetailedNames) { - if (triggeringServiceSet == null) triggeringServiceSet = FastSet.newInstance(); - if (triggeredServiceSet == null) triggeredServiceSet = FastSet.newInstance(); - Map<String, Object> topLevelMap = FastMap.newInstance(); + if (triggeringServiceSet == null) triggeringServiceSet = new HashSet<ServiceArtifactInfo>(); + if (triggeredServiceSet == null) triggeredServiceSet = new HashSet<ServiceArtifactInfo>(); + Map<String, Object> topLevelMap = new HashMap<String, Object>(); topLevelMap.put("name", this.getDisplayPrefixedName()); topLevelMap.put("className", "EOGenericRecord"); // for classProperties add attribute names AND relationship names to get a nice, complete chart - List<String> classPropertiesList = FastList.newInstance(); + List<String> classPropertiesList = new LinkedList<String>(); topLevelMap.put("classProperties", classPropertiesList); // conditions for (ServiceEcaCondition ecaCondition: this.serviceEcaRule.getEcaConditionList()) { @@ -139,10 +138,10 @@ public class ServiceEcaArtifactInfo exte /* going to try this without any attributes... // attributes - List<Map<String, Object>> attributesList = FastList.newInstance(); + List<Map<String, Object>> attributesList = new LinkedList(); topLevelMap.put("attributes", attributesList); for (ModelParam param: this.modelService.getModelParamList()) { - Map<String, Object> attributeMap = FastMap.newInstance(); + Map<String, Object> attributeMap = new HashMap(); attributesList.add(attributeMap); if (useMoreDetailedNames) { @@ -156,10 +155,10 @@ public class ServiceEcaArtifactInfo exte */ // relationships - List<Map<String, Object>> relationshipsMapList = FastList.newInstance(); + List<Map<String, Object>> relationshipsMapList = new LinkedList<Map<String,Object>>(); for (ServiceArtifactInfo sai: triggeringServiceSet) { - Map<String, Object> relationshipMap = FastMap.newInstance(); + Map<String, Object> relationshipMap = new HashMap<String, Object>(); relationshipsMapList.add(relationshipMap); relationshipMap.put("name", sai.getDisplayPrefixedName()); @@ -168,7 +167,7 @@ public class ServiceEcaArtifactInfo exte relationshipMap.put("isMandatory", "Y"); } for (ServiceArtifactInfo sai: triggeredServiceSet) { - Map<String, Object> relationshipMap = FastMap.newInstance(); + Map<String, Object> relationshipMap = new HashMap<String, Object>(); relationshipsMapList.add(relationshipMap); relationshipMap.put("name", sai.getDisplayPrefixedName()); Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java Fri Apr 10 20:22:54 2015 @@ -18,10 +18,9 @@ */ package org.ofbiz.webtools.labelmanager; +import java.util.LinkedHashMap; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; @@ -32,7 +31,7 @@ public class LabelInfo { protected String labelKey = ""; protected String labelKeyComment = ""; protected String fileName = ""; - protected Map<String, LabelValue> labelValues = FastMap.newInstance(); + protected Map<String, LabelValue> labelValues = new LinkedHashMap<String, LabelValue>(); public LabelInfo(String labelKey, String labelKeyComment, String fileName, String localeStr, String labelValue, String labelComment) { this.labelKey = labelKey; Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java Fri Apr 10 20:22:54 2015 @@ -22,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.util.Collection; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -30,8 +31,6 @@ import java.util.TreeSet; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastList; - import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.component.ComponentConfig.ClasspathInfo; import org.ofbiz.base.util.Debug; @@ -57,7 +56,7 @@ public class LabelManagerFactory { protected Map<String, LabelInfo> labels = new TreeMap<String, LabelInfo>(); protected Set<String> localesFound = new TreeSet<String>(); - protected List<LabelInfo> duplicatedLocalesLabelsList = FastList.newInstance(); + protected List<LabelInfo> duplicatedLocalesLabelsList = new LinkedList<LabelInfo>(); public static synchronized LabelManagerFactory getInstance() throws IOException { if (componentNamesFound == null) { Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Fri Apr 10 20:22:54 2015 @@ -22,7 +22,9 @@ import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -30,9 +32,6 @@ import java.util.TreeMap; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastList; -import javolution.util.FastSet; - import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.FileUtil; @@ -65,8 +64,8 @@ public class LabelReferences { protected Delegator delegator; protected DispatchContext dispatchContext; protected Map<String, LabelInfo> labels; - protected Set<String> labelSet = FastSet.newInstance(); - protected Set<String> rootFolders = FastSet.newInstance(); + protected Set<String> labelSet = new HashSet<String>(); + protected Set<String> rootFolders = new HashSet<String>(); public LabelReferences(Delegator delegator, LabelManagerFactory factory) { this.delegator = delegator; @@ -113,7 +112,7 @@ public class LabelReferences { // get labels from simple method files getLabelsFromSimpleMethodFiles(); // get labels from widgets files - List<File> fileList = FastList.newInstance(); + List<File> fileList = new LinkedList<File>(); for (String rootFolder : this.rootFolders) { fileList.addAll(FileUtil.findXmlFiles(rootFolder + "webapp", null, null, null)); fileList.addAll(FileUtil.findXmlFiles(rootFolder + "widget", null, null, null)); @@ -259,7 +258,7 @@ public class LabelReferences { } private void getLabelsFromFormWidgets(String inFile, File file) throws MalformedURLException, SAXException, ParserConfigurationException, IOException, GenericServiceException { - Set<String> fieldNames = FastSet.newInstance(); + Set<String> fieldNames = new HashSet<String>(); findUiLabelMapInFile(inFile, file.getPath()); Document formDocument = UtilXml.readXmlDocument(file.toURI().toURL()); Element rootElem = formDocument.getDocumentElement(); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy Fri Apr 10 20:22:54 2015 @@ -20,7 +20,6 @@ import org.ofbiz.entity.Delegator; import org.ofbiz.webtools.artifactinfo.*; import org.ofbiz.base.util.*; -import javolution.util.FastList; name = parameters.name; location = parameters.location; @@ -56,7 +55,7 @@ if (artifactInfo) { // add to the recently viewed list recentArtifactInfoList = session.getAttribute("recentArtifactInfoList"); if (!recentArtifactInfoList) { - recentArtifactInfoList = FastList.newInstance(); + recentArtifactInfoList = []; session.setAttribute("recentArtifactInfoList", recentArtifactInfoList); } if (recentArtifactInfoList && recentArtifactInfoList.get(0).equals(artifactInfoMap)) { Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ComponentList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ComponentList.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ComponentList.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ComponentList.groovy Fri Apr 10 20:22:54 2015 @@ -23,17 +23,15 @@ import java.util.List; import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.component.ComponentConfig.WebappInfo; -import javolution.util.FastMap; -import javolution.util.FastList; import org.ofbiz.base.util.* Collection <ComponentConfig> components = ComponentConfig.getAllComponents(); -List componentList = FastList.newInstance(); +List componentList = []; components.each { component -> List<WebappInfo> webApps = component.getWebappInfos(); webApps.each { webApp -> - componentMap = FastMap.newInstance(); + componentMap = [:]; componentMap.compName = component.getComponentName(); componentMap.rootLocation = component.getRootLocation(); componentMap.enabled = (component.enabled() == true? "Y" : "N"); @@ -46,7 +44,7 @@ components.each { component -> componentList.add(componentMap); } if (UtilValidate.isEmpty(webApps)) { - componentMap = FastMap.newInstance(); + componentMap = [:]; componentMap.compName = component.getComponentName(); componentMap.rootLocation = component.getRootLocation(); componentMap.enabled = (component.enabled() == true? "Y" : "N"); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy Fri Apr 10 20:22:54 2015 @@ -28,10 +28,7 @@ import org.w3c.dom.Element; import java.util.Collection; import java.util.List; -import javolution.util.FastMap; -import javolution.util.FastList; - -List testList = FastList.newInstance(); +List testList = []; for (ComponentConfig.TestSuiteInfo testSuiteInfo: ComponentConfig.getAllTestSuiteInfos(parameters.compName)) { String componentName = testSuiteInfo.componentConfig.getComponentName(); ResourceHandler testSuiteResource = testSuiteInfo.createResourceHandler(); @@ -42,7 +39,7 @@ for (ComponentConfig.TestSuiteInfo testS suiteName = documentElement.getAttribute("suite-name") firstLine = true; for (Element testCaseElement : UtilXml.childElementList(documentElement, UtilMisc.toSet("test-case", "test-group"))) { - testMap = FastMap.newInstance(); + testMap = [:]; String caseName = testCaseElement.getAttribute("case-name"); if (firstLine == true) { testMap = UtilMisc.toMap("suiteName", suiteName, "suiteNameSave", suiteName, "caseName", caseName); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy Fri Apr 10 20:22:54 2015 @@ -16,8 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -import javolution.util.FastList; - import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator import org.ofbiz.entity.DelegatorFactory |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |