svn commit: r1672752 [4/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1672752 [4/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java Fri Apr 10 20:22:54 2015 @@ -20,13 +20,12 @@ package org.ofbiz.content.blog; import java.io.IOException; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilMisc; @@ -100,7 +99,7 @@ public class BlogRssServices { } public static List<SyndEntry> generateEntryList(LocalDispatcher dispatcher, Delegator delegator, String contentId, String entryLink, Locale locale, GenericValue userLogin) { - List<SyndEntry> entries = FastList.newInstance(); + List<SyndEntry> entries = new LinkedList<SyndEntry>(); List<GenericValue> contentRecs = null; try { @@ -117,7 +116,7 @@ public class BlogRssServices { for (GenericValue v : contentRecs) { String sub = null; try { - Map<String, Object> dummy = FastMap.newInstance(); + Map<String, Object> dummy = new HashMap<String, Object>(); sub = ContentWorker.renderSubContentAsText(dispatcher, delegator, v.getString("contentId"), mapKey, dummy, locale, mimeTypeId, true); } catch (GeneralException e) { Debug.logError(e, module); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java Fri Apr 10 20:22:54 2015 @@ -21,6 +21,7 @@ package org.ofbiz.content.compdoc; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -29,8 +30,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilFormatOut; import org.ofbiz.base.util.UtilHttp; @@ -108,7 +107,7 @@ public class CompDocEvents { request.setAttribute(obj.toString(), val); } // Update ContentRevision and ContentRevisonItem - Map<String, Object> contentRevisionMap = FastMap.newInstance(); + Map<String, Object> contentRevisionMap = new HashMap<String, Object>(); contentRevisionMap.put("itemContentId", contentId); contentRevisionMap.put("contentId", contentId); contentRevisionMap.put("userLogin", userLogin); @@ -160,7 +159,7 @@ public class CompDocEvents { https = (String) servletContext.getAttribute("https"); } - Map<String, Object> mapIn = FastMap.newInstance(); + Map<String, Object> mapIn = new HashMap<String, Object>(); mapIn.put("contentId", contentId); mapIn.put("locale", locale); mapIn.put("rootDir", rootDir); @@ -231,7 +230,7 @@ public class CompDocEvents { https = (String) servletContext.getAttribute("https"); } - Map<String, Object> mapIn = FastMap.newInstance(); + Map<String, Object> mapIn = new HashMap<String, Object>(); mapIn.put("contentId", contentId); mapIn.put("locale", locale); mapIn.put("rootDir", rootDir); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java Fri Apr 10 20:22:54 2015 @@ -21,13 +21,12 @@ package org.ofbiz.content.compdoc; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; @@ -72,7 +71,7 @@ public class CompDocServices { */ public static Map<String, Object> persistRootCompDoc(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale)context.get("locale"); @@ -109,7 +108,7 @@ public class CompDocServices { //request.setAttribute("contentId", contentId); // Update ContentRevision and ContentRevisonItem - Map<String, Object> contentRevisionMap = FastMap.newInstance(); + Map<String, Object> contentRevisionMap = new HashMap<String, Object>(); contentRevisionMap.put("itemContentId", contentId); contentRevisionMap.put("contentId", contentId); contentRevisionMap.put("userLogin", userLogin); @@ -144,7 +143,7 @@ public class CompDocServices { GenericValue userLogin = (GenericValue) context.get("userLogin"); try { - List<EntityCondition> exprList = FastList.newInstance(); + List<EntityCondition> exprList = new LinkedList<EntityCondition>(); exprList.add(EntityCondition.makeCondition("contentIdTo", EntityOperator.EQUALS, contentId)); exprList.add(EntityCondition.makeCondition("contentAssocTypeId", EntityOperator.EQUALS, "COMPDOC_PART")); exprList.add(EntityCondition.makeCondition("rootRevisionContentId", EntityOperator.EQUALS, contentId)); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java Fri Apr 10 20:22:54 2015 @@ -19,13 +19,12 @@ package org.ofbiz.content.content; 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.UtilMisc; @@ -68,7 +67,7 @@ public class ContentKeywordIndex { 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 pidWeight = 1; keywords.put(content.getString("contentId").toLowerCase(), Long.valueOf(pidWeight)); @@ -198,7 +197,7 @@ public class ContentKeywordIndex { } } - List<GenericValue> toBeStored = FastList.newInstance(); + List<GenericValue> toBeStored = new LinkedList<GenericValue>(); int keywordMaxLength = Integer.parseInt(EntityUtilProperties.getPropertyValue("contentsearch", "content.keyword.max.length", delegator)); for (Map.Entry<String, Long> entry: keywords.entrySet()) { if (entry.getKey().length() <= keywordMaxLength) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java Fri Apr 10 20:22:54 2015 @@ -21,6 +21,9 @@ package org.ofbiz.content.content; import java.io.IOException; import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -29,10 +32,6 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilGenerics; @@ -52,7 +51,7 @@ public class ContentMapFacade implements public static final String module = ContentMapFacade.class.getName(); - protected static final Set<String> mapKeySet = FastSet.newInstance(); + protected static final Set<String> mapKeySet = new HashSet<String>(); static { mapKeySet.add("fields"); mapKeySet.add("link"); @@ -279,10 +278,10 @@ public class ContentMapFacade implements return dataResource; } else if ("subcontent_all".equalsIgnoreCase(name)) { // subcontent list of ordered subcontent - List<ContentMapFacade> subContent = FastList.newInstance(); + List<ContentMapFacade> subContent = new LinkedList<ContentMapFacade>(); List<GenericValue> subs = null; try { - Map<String, Object> expressions = FastMap.newInstance(); + Map<String, Object> expressions = new HashMap<String, Object>(); expressions.put("contentIdStart", contentId); if(!this.mapKeyFilter.equals("")) { expressions.put("caMapKey", this.mapKeyFilter); @@ -329,7 +328,7 @@ public class ContentMapFacade implements return "=========> " + errorMsg + " <========="; } // TODO: change to use the MapStack instead of a cloned Map - Map<String, Object> renderCtx = FastMap.newInstance(); + Map<String, Object> renderCtx = new HashMap<String, Object>(); renderCtx.putAll(context); if (this.decoratedContent != null) { renderCtx.put("decoratedContent", decoratedContent); @@ -457,7 +456,7 @@ public class ContentMapFacade implements // key is the mapKey GenericValue sub = null; try { - Map<String, Object> expressions = FastMap.newInstance(); + Map<String, Object> expressions = new HashMap<String, Object>(); expressions.put("contentIdStart", contentId); expressions.put("caMapKey", name); if(!this.statusFilter.equals("")) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java Fri Apr 10 20:22:54 2015 @@ -18,13 +18,12 @@ *******************************************************************************/ package org.ofbiz.content.content; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilGenerics; @@ -115,7 +114,7 @@ public class ContentPermissionServices { displayPassCond = true; } Debug.logInfo("displayPassCond(0):" + displayPassCond, ""); - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String partyId = (String) context.get("partyId"); if (UtilValidate.isEmpty(partyId)) { @@ -147,7 +146,7 @@ public class ContentPermissionServices { if (UtilValidate.isNotEmpty(contentPurposeString)) { List<String> purposesFromString = StringUtil.split(contentPurposeString, "|"); if (passedPurposes == null) { - passedPurposes = FastList.newInstance(); + passedPurposes = new LinkedList<String>(); } passedPurposes.addAll(purposesFromString); } @@ -164,7 +163,7 @@ public class ContentPermissionServices { if (UtilValidate.isNotEmpty(targetOperationString)) { List<String> operationsFromString = StringUtil.split(targetOperationString, "|"); if (targetOperations == null) { - targetOperations = FastList.newInstance(); + targetOperations = new LinkedList<String>(); } targetOperations.addAll(operationsFromString); } @@ -175,7 +174,7 @@ public class ContentPermissionServices { EntityPermissionChecker.StdRelatedRoleGetter roleGetter = new EntityPermissionChecker.StdRelatedRoleGetter("Content", "roleTypeId", "contentId", "partyId", "ownerContentId", "ContentRole"); //Debug.logInfo("targetOperations(b):" + targetOperations, ""); List<String> passedRoles = UtilGenerics.checkList(context.get("roleTypeList")); - if (passedRoles == null) passedRoles = FastList.newInstance(); + if (passedRoles == null) passedRoles = new LinkedList<String>(); String roleTypeString = (String) context.get("roleTypeString"); if (UtilValidate.isNotEmpty(roleTypeString)) { List<String> rolesFromString = StringUtil.split(roleTypeString, "|"); @@ -191,7 +190,7 @@ public class ContentPermissionServices { StringBuilder errBuf = new StringBuilder(); String permissionStatus = null; - List<Object> entityIds = FastList.newInstance(); + List<Object> entityIds = new LinkedList<Object>(); if (passed) { results.put("permissionStatus", "granted"); permissionStatus = "granted"; @@ -261,7 +260,7 @@ public class ContentPermissionServices { } public static Map<String, Object> checkAssocPermission(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); // Security security = dctx.getSecurity(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -291,12 +290,12 @@ public class ContentPermissionServices { // boolean isMatch = false; // boolean isMatchTo = false; // boolean isMatchFrom = false; - Map<String, Object> permResults = FastMap.newInstance(); + Map<String, Object> permResults = new HashMap<String, Object>(); // Use the purposes from the from entity for both cases. List<String> relatedPurposes = EntityPermissionChecker.getRelatedPurposes(contentFrom, null); List<String> relatedPurposesTo = EntityPermissionChecker.getRelatedPurposes(contentTo, relatedPurposes); - Map<String, Object> serviceInMap = FastMap.newInstance(); + Map<String, Object> serviceInMap = new HashMap<String, Object>(); serviceInMap.put("userLogin", userLogin); serviceInMap.put("targetOperationList", UtilMisc.toList("CONTENT_LINK_TO")); serviceInMap.put("contentPurposeList", relatedPurposesTo); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java Fri Apr 10 20:22:54 2015 @@ -20,16 +20,15 @@ package org.ofbiz.content.content; import java.sql.Timestamp; import java.util.ArrayList; +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; @@ -114,17 +113,17 @@ public class ContentSearch { public static class ContentSearchContext { 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 Set<String> fieldsToSelect = UtilMisc.toSet("contentId"); public DynamicViewEntity dynamicViewEntity = new DynamicViewEntity(); public boolean contentIdGroupBy = 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> contentSearchConstraintList = 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> contentSearchConstraintList = new LinkedList<GenericValue>(); public ResultSortOrder resultSortOrder = null; public Integer resultOffset = null; public Integer maxResults = null; @@ -254,7 +253,7 @@ public class ContentSearch { dynamicViewEntity.addMemberEntity(entityAlias, "ContentKeyword"); dynamicViewEntity.addAlias(entityAlias, prefix + "Keyword", "keyword", null, null, null, null); dynamicViewEntity.addViewLink("CNT", entityAlias, Boolean.FALSE, ModelKeyMap.makeKeyMapList("contentId")); - List<EntityExpr> keywordOrList = FastList.newInstance(); + List<EntityExpr> keywordOrList = new LinkedList<EntityExpr>(); for (String keyword: keywordFixedOrSet) { keywordOrList.add(EntityCondition.makeCondition(prefix + "Keyword", EntityOperator.LIKE, keyword)); } @@ -362,7 +361,7 @@ public class ContentSearch { int numRetreived = 1; int duplicatesFound = 0; - Set<String> contentIdSet = FastSet.newInstance(); + Set<String> contentIdSet = new HashSet<String>(); contentIds.add(searchResult.getString("contentId")); contentIdSet.add(searchResult.getString("contentId")); @@ -484,7 +483,7 @@ public class ContentSearch { @Override public void addConstraint(ContentSearchContext contentSearchContext) { - Set<String> contentIdSet = FastSet.newInstance(); + Set<String> contentIdSet = new HashSet<String>(); if (includeSubContents) { // find all sub-categories recursively, make a Set of contentId ContentSearch.getAllSubContentIds(contentId, contentIdSet, contentSearchContext.getDelegator(), contentSearchContext.nowTimestamp); @@ -511,7 +510,7 @@ public class ContentSearch { contentSearchContext.dynamicViewEntity.addAlias(entityAlias, prefix + "ThruDate", "thruDate", null, null, null, null); contentSearchContext.dynamicViewEntity.addViewLink("CNT", entityAlias, Boolean.TRUE, ModelKeyMap.makeKeyMapList("contentId","contentIdFrom")); - List<EntityExpr> assocConditionFromTo = FastList.newInstance(); + List<EntityExpr> assocConditionFromTo = new LinkedList<EntityExpr>(); assocConditionFromTo.add(EntityCondition.makeCondition(prefix + "ContentIdTo", EntityOperator.IN, contentIdSet)); if (UtilValidate.isNotEmpty(contentAssocTypeId)) { assocConditionFromTo.add(EntityCondition.makeCondition(prefix + "ContentAssocTypeId", EntityOperator.EQUALS, contentAssocTypeId)); @@ -532,7 +531,7 @@ public class ContentSearch { contentSearchContext.dynamicViewEntity.addAlias(entityAlias, prefix + "ThruDate", "thruDate", null, null, null, null); contentSearchContext.dynamicViewEntity.addViewLink("CNT", entityAlias, Boolean.TRUE, ModelKeyMap.makeKeyMapList("contentId","contentIdTo")); - List<EntityExpr> assocConditionToFrom = FastList.newInstance(); + List<EntityExpr> assocConditionToFrom = new LinkedList<EntityExpr>(); assocConditionToFrom.add(EntityCondition.makeCondition(prefix + "ContentIdFrom", EntityOperator.IN, contentIdSet)); if (UtilValidate.isNotEmpty(contentAssocTypeId)) { assocConditionToFrom.add(EntityCondition.makeCondition(prefix + "ContentAssocTypeId", EntityOperator.EQUALS, contentAssocTypeId)); @@ -678,7 +677,7 @@ public class ContentSearch { 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); contentSearchContext.keywordFixedOrSetAndList.add(fixedKeywordSet); } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchEvents.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchEvents.java Fri Apr 10 20:22:54 2015 @@ -19,14 +19,13 @@ package org.ofbiz.content.content; 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 ContentSearchEvents { String searchSortOrderString = ContentSearchSession.searchGetSortOrderString(false, request); // ========== populate the result Map - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.put("contentIds", contentIds); result.put("viewIndex", Integer.valueOf(viewIndex)); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java Fri Apr 10 20:22:54 2015 @@ -19,6 +19,7 @@ package org.ofbiz.content.content; 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 ContentSearchSession { public static void addConstraint(ContentSearchConstraint contentSearchConstraint, HttpSession session) { ContentSearchOptions contentSearchOptions = getContentSearchOptions(session); if (contentSearchOptions.constraintList == null) { - contentSearchOptions.constraintList = FastList.newInstance(); + contentSearchOptions.constraintList = new LinkedList<ContentSearch.ContentSearchConstraint>(); } if (!contentSearchOptions.constraintList.contains(contentSearchConstraint)) { contentSearchOptions.constraintList.add(contentSearchConstraint); @@ -132,7 +131,7 @@ public class ContentSearchSession { public List<String> searchGetConstraintStrings(boolean detailed, Delegator delegator, Locale locale) { List<ContentSearchConstraint> contentSearchConstraintList = this.getConstraintList(); - List<String> constraintStrings = FastList.newInstance(); + List<String> constraintStrings = new LinkedList<String>(); if (contentSearchConstraintList == null) { return constraintStrings; } @@ -268,7 +267,7 @@ public class ContentSearchSession { public static List<ContentSearchOptions> getSearchOptionsHistoryList(HttpSession session) { List<ContentSearchOptions> optionsHistoryList = UtilGenerics.checkList(session.getAttribute("_CONTENT_SEARCH_OPTIONS_HISTORY_")); if (optionsHistoryList == null) { - optionsHistoryList = FastList.newInstance(); + optionsHistoryList = new LinkedList<ContentSearchSession.ContentSearchOptions>(); session.setAttribute("_CONTENT_SEARCH_OPTIONS_HISTORY_", optionsHistoryList); } return optionsHistoryList; Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java Fri Apr 10 20:22:54 2015 @@ -22,14 +22,13 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.sql.Timestamp; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.StringUtil; @@ -66,7 +65,7 @@ public class ContentServices { */ public static Map<String, Object> findRelatedContent(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); GenericValue currentContent = (GenericValue) context.get("currentContent"); String fromDate = (String) context.get("fromDate"); @@ -95,12 +94,12 @@ public class ContentServices { return results; } - Map<String, Object> serviceInMap = FastMap.newInstance(); + Map<String, Object> serviceInMap = new HashMap<String, Object>(); serviceInMap.put("userLogin", context.get("userLogin")); serviceInMap.put("targetOperationList", targetOperations); serviceInMap.put("entityOperation", context.get("entityOperation")); - List<GenericValue> permittedList = FastList.newInstance(); + List<GenericValue> permittedList = new LinkedList<GenericValue>(); Map<String, Object> permResults = null; for (GenericValue content : contentList) { serviceInMap.put("currentContent", content); @@ -125,8 +124,8 @@ public class ContentServices { * This is a generic service for traversing a Content tree, typical of a blog response tree. It calls the ContentWorker.traverse method. */ public static Map<String, Object> findContentParents(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = FastMap.newInstance(); - List<Object> parentList = FastList.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); + List<Object> parentList = new LinkedList<Object>(); results.put("parentList", parentList); LocalDispatcher dispatcher = dctx.getDispatcher(); String contentId = (String)context.get("contentId"); @@ -135,7 +134,7 @@ public class ContentServices { if (UtilValidate.isEmpty(direction)) { direction="To"; } - Map<String, Object> traversMap = FastMap.newInstance(); + Map<String, Object> traversMap = new HashMap<String, Object>(); traversMap.put("contentId", contentId); traversMap.put("direction", direction); traversMap.put("contentAssocTypeId", contentAssocTypeId); @@ -169,7 +168,7 @@ public class ContentServices { */ public static Map<String, Object> traverseContent(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); Locale locale = (Locale) context.get("locale"); String contentId = (String) context.get("contentId"); @@ -204,7 +203,7 @@ public class ContentServices { thruDate = UtilDateTime.toTimestamp(thruDateStr); } - Map<String, Object> whenMap = FastMap.newInstance(); + Map<String, Object> whenMap = new HashMap<String, Object>(); whenMap.put("followWhen", context.get("followWhen")); whenMap.put("pickWhen", context.get("pickWhen")); whenMap.put("returnBeforePickWhen", context.get("returnBeforePickWhen")); @@ -215,8 +214,8 @@ public class ContentServices { startContentAssocTypeId = "PUBLISH"; } - Map<String, Object> nodeMap = FastMap.newInstance(); - List<GenericValue> pickList = FastList.newInstance(); + Map<String, Object> nodeMap = new HashMap<String, Object>(); + List<GenericValue> pickList = new LinkedList<GenericValue>(); ContentWorker.traverse(delegator, content, fromDate, thruDate, whenMap, 0, nodeMap, startContentAssocTypeId, pickList, direction); results.put("nodeMap", nodeMap); @@ -258,7 +257,7 @@ public class ContentServices { context.put("contentPurposeList", contentPurposeList); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String contentId = (String) context.get("contentId"); @@ -359,7 +358,7 @@ public class ContentServices { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); // This section guesses how contentId should be used (From or To) if // only a contentIdFrom o contentIdTo is passed in @@ -390,7 +389,7 @@ public class ContentServices { /* String deactivateExisting = (String) context.get("deactivateExisting"); if (deactivateExisting != null && deactivateExisting.equalsIgnoreCase("true")) { - Map andMap = FastMap.newInstance(); + Map andMap = new HashMap<String, Object>(); andMap.put("contentIdTo", contentIdTo); andMap.put("contentAssocTypeId", context.get("contentAssocTypeId")); @@ -412,7 +411,7 @@ public class ContentServices { } */ - GenericValue contentAssoc = delegator.makeValue("ContentAssoc", FastMap.newInstance()); + GenericValue contentAssoc = delegator.makeValue("ContentAssoc"); contentAssoc.put("contentId", contentIdFrom); contentAssoc.put("contentIdTo", contentIdTo); contentAssoc.put("contentAssocTypeId", context.get("contentAssocTypeId")); @@ -463,7 +462,7 @@ public class ContentServices { contentAssoc.put("createdDate", createdDate); contentAssoc.put("lastModifiedDate", lastModifiedDate); - Map<String, Object> serviceInMap = FastMap.newInstance(); + Map<String, Object> serviceInMap = new HashMap<String, Object>(); String permissionStatus = null; serviceInMap.put("userLogin", context.get("userLogin")); serviceInMap.put("targetOperationList", targetOperationList); @@ -525,7 +524,7 @@ public class ContentServices { Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); context.put("entityOperation", "_UPDATE"); List<String> targetOperationList = ContentWorker.prepTargetOperationList(context, "_UPDATE"); @@ -607,7 +606,7 @@ public class ContentServices { Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); context.put("entityOperation", "_UPDATE"); List<String> targetOperationList = ContentWorker.prepTargetOperationList(context, "_UPDATE"); @@ -663,7 +662,7 @@ public class ContentServices { contentAssoc.put("lastModifiedDate", lastModifiedDate); String permissionStatus = null; - Map<String, Object> serviceInMap = FastMap.newInstance(); + Map<String, Object> serviceInMap = new HashMap<String, Object>(); serviceInMap.put("userLogin", context.get("userLogin")); serviceInMap.put("targetOperationList", targetOperationList); serviceInMap.put("contentPurposeList", contentPurposeList); @@ -720,7 +719,7 @@ public class ContentServices { Map<String, Object> context = UtilMisc.makeMapWritable(rcontext); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Locale locale = (Locale) context.get("locale"); context.put("entityOperation", "_UPDATE"); List<String> targetOperationList = ContentWorker.prepTargetOperationList(context, "_UPDATE"); @@ -760,7 +759,7 @@ public class ContentServices { contentAssoc.put("thruDate", UtilDateTime.nowTimestamp()); String permissionStatus = null; - Map<String, Object> serviceInMap = FastMap.newInstance(); + Map<String, Object> serviceInMap = new HashMap<String, Object>(); serviceInMap.put("userLogin", context.get("userLogin")); serviceInMap.put("targetOperationList", targetOperationList); serviceInMap.put("contentPurposeList", contentPurposeList); @@ -805,7 +804,7 @@ public class ContentServices { Locale locale = (Locale) context.get("locale"); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); String sequenceNum = null; - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); try { GenericValue activeAssoc = null; @@ -817,7 +816,7 @@ public class ContentServices { sequenceNum = (String) activeAssoc.get("sequenceNum"); } - List<EntityCondition> exprList = FastList.newInstance(); + List<EntityCondition> exprList = new LinkedList<EntityCondition>(); exprList.add(EntityCondition.makeCondition("mapKey", EntityOperator.EQUALS, mapKey)); if (sequenceNum != null) { exprList.add(EntityCondition.makeCondition("sequenceNum", EntityOperator.EQUALS, sequenceNum)); @@ -858,7 +857,7 @@ public class ContentServices { * matching content. */ public static Map<String, Object> renderSubContentAsText(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -895,7 +894,7 @@ public class ContentServices { Writer outWriter = new StringWriter(); if (templateContext == null) { - templateContext = FastMap.newInstance(); + templateContext = new HashMap<String, Object>(); } try { @@ -919,7 +918,7 @@ public class ContentServices { * matching content. */ public static Map<String, Object> renderContentAsText(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String,Object> results = FastMap.newInstance(); + Map<String,Object> results = new HashMap<String, Object>(); LocalDispatcher dispatcher = dctx.getDispatcher(); Delegator delegator = dctx.getDelegator(); Writer out = (Writer) context.get("outWriter"); @@ -940,7 +939,7 @@ public class ContentServices { } if (templateContext == null) { - templateContext = FastMap.newInstance(); + templateContext = new HashMap<String, Object>(); } Writer outWriter = new StringWriter(); @@ -964,7 +963,7 @@ public class ContentServices { } public static Map<String, Object> linkContentToPubPt(DispatchContext dctx, Map<String, ? extends Object> context) { - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); @@ -978,7 +977,7 @@ public class ContentServices { if (Debug.infoOn()) Debug.logInfo("in publishContent, statusId:" + statusId, module); if (Debug.infoOn()) Debug.logInfo("in publishContent, userLogin:" + userLogin, module); - Map<String, Object> mapIn = FastMap.newInstance(); + Map<String, Object> mapIn = new HashMap<String, Object>(); mapIn.put("contentId", contentId); mapIn.put("contentIdTo", contentIdTo); mapIn.put("contentAssocTypeId", contentAssocTypeId); @@ -1008,7 +1007,7 @@ public class ContentServices { content.put("statusId", statusId); content.store(); - mapIn = FastMap.newInstance(); + mapIn = new HashMap<String, Object>(); mapIn.put("contentId", contentId); mapIn.put("contentIdTo", contentIdTo); mapIn.put("contentAssocTypeId", contentAssocTypeId); @@ -1043,7 +1042,7 @@ public class ContentServices { } public static Map<String, Object> publishContent(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); GenericValue content = (GenericValue)context.get("content"); try { @@ -1057,10 +1056,10 @@ public class ContentServices { } public static Map<String, Object> getPrefixedMembers(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> mapIn = UtilGenerics.checkMap(context.get("mapIn")); String prefix = (String)context.get("prefix"); - Map<String, Object> mapOut = FastMap.newInstance(); + Map<String, Object> mapOut = new HashMap<String, Object>(); result.put("mapOut", mapOut); if (mapIn != null) { Set<Map.Entry<String, Object>> entrySet = mapIn.entrySet(); @@ -1077,8 +1076,8 @@ public class ContentServices { } public static Map<String, Object> splitString(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = FastMap.newInstance(); - List<String> outputList = FastList.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); + List<String> outputList = new LinkedList<String>(); String delimiter = UtilFormatOut.checkEmpty((String)context.get("delimiter"), "|"); String inputString = (String)context.get("inputString"); if (UtilValidate.isNotEmpty(inputString)) { @@ -1089,7 +1088,7 @@ public class ContentServices { } public static Map<String, Object> joinString(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); String outputString = null; String delimiter = UtilFormatOut.checkEmpty((String)context.get("delimiter"), "|"); List<String> inputList = UtilGenerics.checkList(context.get("inputList")); @@ -1101,8 +1100,8 @@ public class ContentServices { } public static Map<String, Object> urlEncodeArgs(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - Map<String, Object> result = FastMap.newInstance(); - Map<String, Object> mapFiltered = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); + Map<String, Object> mapFiltered = new HashMap<String, Object>(); Map<String, Object> mapIn = UtilGenerics.checkMap(context.get("mapIn")); if (mapIn != null) { Set<Map.Entry<String, Object>> entrySet = mapIn.entrySet(); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Fri Apr 10 20:22:54 2015 @@ -20,13 +20,12 @@ package org.ofbiz.content.content; import java.sql.Timestamp; import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilDateTime; @@ -81,7 +80,7 @@ public class ContentServicesComplex { } public static Map<String, Object> getAssocAndContentAndDataResourceMethod(Delegator delegator, String contentId, String mapKey, String direction, Timestamp fromDate, Timestamp thruDate, String fromDateStr, String thruDateStr, List<String> assocTypes, List<String> contentTypes) { - List<EntityCondition> exprList = FastList.newInstance(); + List<EntityCondition> exprList = new LinkedList<EntityCondition>(); EntityExpr joinExpr = null; String viewName = null; if (mapKey != null) { @@ -115,7 +114,7 @@ public class ContentServicesComplex { exprList.add(fromExpr); } if (thruDate != null) { - List<EntityExpr> thruList = FastList.newInstance(); + List<EntityExpr> thruList = new LinkedList<EntityExpr>(); //thruDate = UtilDateTime.getDayStart(thruDate, daysLater); EntityExpr thruExpr = EntityCondition.makeCondition("caThruDate", EntityOperator.LESS_THAN, thruDate); @@ -125,7 +124,7 @@ public class ContentServicesComplex { EntityConditionList<EntityExpr> thruExprList = EntityCondition.makeCondition(thruList, EntityOperator.OR); exprList.add(thruExprList); } else if (fromDate != null) { - List<EntityExpr> thruList = FastList.newInstance(); + List<EntityExpr> thruList = new LinkedList<EntityExpr>(); EntityExpr thruExpr = EntityCondition.makeCondition("caThruDate", EntityOperator.GREATER_THAN, fromDate); thruList.add(thruExpr); @@ -145,7 +144,7 @@ public class ContentServicesComplex { GenericValue a = relatedAssocs.get(i); Debug.logVerbose(" contentId:" + a.get("contentId") + " To:" + a.get("caContentIdTo") + " fromDate:" + a.get("caFromDate") + " thruDate:" + a.get("caThruDate") + " AssocTypeId:" + a.get("caContentAssocTypeId"), null); } - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); results.put("entityList", relatedAssocs); return results; } @@ -165,7 +164,7 @@ public class ContentServicesComplex { if (UtilValidate.isNotEmpty(assocTypesString)) { List<String> lst = StringUtil.split(assocTypesString, "|"); if (assocTypes == null) { - assocTypes = FastList.newInstance(); + assocTypes = new LinkedList<String>(); } assocTypes.addAll(lst); } @@ -174,7 +173,7 @@ public class ContentServicesComplex { if (UtilValidate.isNotEmpty(contentTypesString)) { List<String> lst = StringUtil.split(contentTypesString, "|"); if (contentTypes == null) { - contentTypes = FastList.newInstance(); + contentTypes = new LinkedList<String>(); } contentTypes.addAll(lst); } @@ -248,7 +247,7 @@ public class ContentServicesComplex { GenericValue contentAssocDataResourceView = null; GenericValue content = null; GenericValue dataResource = null; - List<GenericValue> contentAssocDataResourceList = FastList.newInstance(); + List<GenericValue> contentAssocDataResourceList = new LinkedList<GenericValue>(); Locale locale = Locale.getDefault(); // TODO: this needs to be passed in try{ for (GenericValue contentAssocView : contentAssocsTypeFiltered) { @@ -266,12 +265,12 @@ public class ContentServicesComplex { contentAssocDataResourceView = delegator.makeValue(viewName); contentAssocDataResourceView.setAllFields(content, true, null, null); } - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssoc, contentAssocDataResourceView, FastList.newInstance(), locale); + SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssoc, contentAssocDataResourceView, new LinkedList<Object>(), locale); String dataResourceId = content.getString("dataResourceId"); if (UtilValidate.isNotEmpty(dataResourceId)) dataResource = content.getRelatedOne("DataResource", true); if (dataResource != null) { - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceOut", dataResource, contentAssocDataResourceView, FastList.newInstance(), locale); + SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceOut", dataResource, contentAssocDataResourceView, new LinkedList<Object>(), locale); } contentAssocDataResourceList.add(contentAssocDataResourceView); } @@ -284,7 +283,7 @@ public class ContentServicesComplex { List<String> orderByList = StringUtil.split(orderBy, "|"); contentAssocDataResourceList = EntityUtil.orderBy(contentAssocDataResourceList, orderByList); } - Map<String, Object> results = FastMap.newInstance(); + Map<String, Object> results = new HashMap<String, Object>(); results.put("entityList", contentAssocDataResourceList); if (UtilValidate.isNotEmpty(contentAssocDataResourceList)) { results.put("view", contentAssocDataResourceList.get(0)); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Fri Apr 10 20:22:54 2015 @@ -24,15 +24,13 @@ import java.io.StringWriter; import java.io.Writer; import java.sql.Timestamp; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import javax.xml.parsers.ParserConfigurationException; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.BshUtil; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -220,7 +218,7 @@ public class ContentWorker implements or String contentId = content.getString("contentId"); if (templateContext == null) { - templateContext = FastMap.newInstance(); + templateContext = new HashMap<String, Object>(); } // create the content facade @@ -451,27 +449,27 @@ public class ContentWorker implements or contentId = (String) content.get("contentId"); contentTypeId = (String) content.get("contentTypeId"); List<GenericValue> topicList = content.getRelated("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "TOPIC"), null, false); - List<String> topics = FastList.newInstance(); + List<String> topics = new LinkedList<String>(); for (int i = 0; i < topicList.size(); i++) { GenericValue assoc = topicList.get(i); topics.add(assoc.getString("contentId")); } List<GenericValue> keywordList = content.getRelated("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "KEYWORD"), null, false); - List<String> keywords = FastList.newInstance(); + List<String> keywords = new LinkedList<String>(); for (int i = 0; i < keywordList.size(); i++) { GenericValue assoc = keywordList.get(i); keywords.add(assoc.getString("contentId")); } List<GenericValue> purposeValueList = content.getRelated("ContentPurpose", null, null, true); - List<String> purposes = FastList.newInstance(); + List<String> purposes = new LinkedList<String>(); for (int i = 0; i < purposeValueList.size(); i++) { GenericValue purposeValue = purposeValueList.get(i); purposes.add(purposeValue.getString("contentPurposeTypeId")); } - List<String> contentTypeAncestry = FastList.newInstance(); + List<String> contentTypeAncestry = new LinkedList<String>(); getContentTypeAncestry(delegator, contentTypeId, contentTypeAncestry); - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); context.put("content", content); context.put("contentAssocTypeId", contentAssocTypeId); //context.put("related", related); @@ -483,13 +481,13 @@ public class ContentWorker implements or boolean isReturnBefore = checkReturnWhen(context, (String) whenMap.get("returnBeforePickWhen")); Map<String, Object> thisNode = null; if (isPick || !isReturnBefore) { - thisNode = FastMap.newInstance(); + thisNode = new HashMap<String, Object>(); thisNode.put("contentId", contentId); thisNode.put("contentTypeId", contentTypeId); thisNode.put("contentAssocTypeId", contentAssocTypeId); List<Map<String, Object>> kids = UtilGenerics.checkList(masterNode.get("kids")); if (kids == null) { - kids = FastList.newInstance(); + kids = new LinkedList<Map<String,Object>>(); masterNode.put("kids", kids); } kids.add(thisNode); @@ -500,9 +498,9 @@ public class ContentWorker implements or } boolean isReturnAfter = checkReturnWhen(context, (String) whenMap.get("returnAfterPickWhen")); if (!isReturnAfter) { - List<String> assocTypes = FastList.newInstance(); + List<String> assocTypes = new LinkedList<String>(); List<GenericValue> relatedAssocs = getContentAssocsWithId(delegator, contentId, fromDate, thruDate, direction, assocTypes); - Map<String, Object> assocContext = FastMap.newInstance(); + Map<String, Object> assocContext = new HashMap<String, Object>(); assocContext.put("related", relatedAssocs); for (GenericValue assocValue : relatedAssocs) { contentAssocTypeId = (String) assocValue.get("contentAssocTypeId"); @@ -623,7 +621,7 @@ public class ContentWorker implements or } public static List<Object> getPurposes(GenericValue content) { - List<Object> purposes = FastList.newInstance(); + List<Object> purposes = new LinkedList<Object>(); try { List<GenericValue> purposeValueList = content.getRelated("ContentPurpose", null, null, true); for (int i = 0; i < purposeValueList.size(); i++) { @@ -637,7 +635,7 @@ public class ContentWorker implements or } public static List<Object> getSections(GenericValue content) { - List<Object> sections = FastList.newInstance(); + List<Object> sections = new LinkedList<Object>(); try { List<GenericValue> sectionValueList = content.getRelated("FromContentAssoc", null, null, true); for (int i = 0; i < sectionValueList.size(); i++) { @@ -654,7 +652,7 @@ public class ContentWorker implements or } public static List<Object> getTopics(GenericValue content) { - List<Object> topics = FastList.newInstance(); + List<Object> topics = new LinkedList<Object>(); try { List<GenericValue> topicValueList = content.getRelated("FromContentAssoc", null, null, true); for (int i = 0; i < topicValueList.size(); i++) { @@ -678,7 +676,7 @@ public class ContentWorker implements or String parentContentId = (String) parentContent.get("contentId"); //if (Debug.infoOn()) Debug.logInfo("traverse, contentAssocTypeId:" + contentAssocTypeId,null); Map<String, Object> whenMap = UtilGenerics.checkMap(ctx.get("whenMap")); - List<Map<String, Object>> kids = FastList.newInstance(); + List<Map<String, Object>> kids = new LinkedList<Map<String,Object>>(); currentNode.put("kids", kids); String direction = (String) ctx.get("direction"); if (UtilValidate.isEmpty(direction)) { @@ -766,7 +764,7 @@ public class ContentWorker implements or Debug.logInfo("assocList:" + assocList.size() + " contentId:" + currentContent.getString("contentId"), ""); } - List<GenericValue> contentList = FastList.newInstance(); + List<GenericValue> contentList = new LinkedList<GenericValue>(); String contentIdName = "contentId"; if (linkDir != null && linkDir.equalsIgnoreCase("TO")) { contentIdName = contentIdName.concat("To"); @@ -793,8 +791,7 @@ public class ContentWorker implements or } public static List<GenericValue> getAssociatedContentView(GenericValue currentContent, String linkDir, List<String> assocTypes, List<String> contentTypes, String fromDate, String thruDate) throws GenericEntityException { - List<GenericValue> contentList = FastList.newInstance(); - List<EntityExpr> exprListAnd = FastList.newInstance(); + List<EntityExpr> exprListAnd = new LinkedList<EntityExpr>(); String origContentId = (String) currentContent.get("contentId"); String contentIdName = "contentId"; @@ -846,9 +843,8 @@ public class ContentWorker implements or @SuppressWarnings("unchecked") public static List<GenericValue> getContentAssocsWithId(Delegator delegator, String contentId, Timestamp fromDate, Timestamp thruDate, String direction, List<String> assocTypes) throws GenericEntityException { - List exprList = FastList.newInstance(); + List<EntityCondition> exprList = new LinkedList<EntityCondition>(); EntityExpr joinExpr = null; - EntityExpr expr = null; if (direction != null && direction.equalsIgnoreCase("From")) { joinExpr = EntityCondition.makeCondition("contentIdTo", EntityOperator.EQUALS, contentId); } else { @@ -863,7 +859,7 @@ public class ContentWorker implements or exprList.add(fromExpr); } if (thruDate != null) { - List<EntityExpr> thruList = FastList.newInstance(); + List<EntityExpr> thruList = new LinkedList<EntityExpr>(); //thruDate = UtilDateTime.getDayStart(thruDate, daysLater); EntityExpr thruExpr = EntityCondition.makeCondition("thruDate", EntityOperator.LESS_THAN, thruDate); @@ -873,7 +869,7 @@ public class ContentWorker implements or EntityConditionList<EntityExpr> thruExprList = EntityCondition.makeCondition(thruList, EntityOperator.OR); exprList.add(thruExprList); } else if (fromDate != null) { - List<EntityExpr> thruList = FastList.newInstance(); + List<EntityExpr> thruList = new LinkedList<EntityExpr>(); EntityExpr thruExpr = EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN, fromDate); thruList.add(thruExpr); @@ -969,8 +965,8 @@ public class ContentWorker implements or } public static List<Map<String, Object>> getContentAncestryNodeTrail(Delegator delegator, String contentId, String contentAssocTypeId, String direction) throws GenericEntityException { - List<GenericValue> contentAncestorList = FastList.newInstance(); - List<Map<String, Object>> nodeTrail = FastList.newInstance(); + List<GenericValue> contentAncestorList = new LinkedList<GenericValue>(); + List<Map<String, Object>> nodeTrail = new LinkedList<Map<String,Object>>(); getContentAncestry(delegator, contentId, contentAssocTypeId, direction, contentAncestorList); for (GenericValue value : contentAncestorList) { Map<String, Object> thisNode = ContentWorker.makeNode(value); @@ -980,7 +976,7 @@ public class ContentWorker implements or } public static String getContentAncestryNodeTrailCsv(Delegator delegator, String contentId, String contentAssocTypeId, String direction) throws GenericEntityException { - List<GenericValue> contentAncestorList = FastList.newInstance(); + List<GenericValue> contentAncestorList = new LinkedList<GenericValue>(); getContentAncestry(delegator, contentId, contentAssocTypeId, direction, contentAncestorList); String csv = StringUtil.join(contentAncestorList, ","); return csv; @@ -1033,13 +1029,13 @@ public class ContentWorker implements or } public static Map<String, Object> callContentPermissionCheckResult(Delegator delegator, LocalDispatcher dispatcher, Map<String, Object> context) { - Map<String, Object> permResults = FastMap.newInstance(); + Map<String, Object> permResults = new HashMap<String, Object>(); String skipPermissionCheck = (String) context.get("skipPermissionCheck"); if (UtilValidate.isEmpty(skipPermissionCheck) || (!"true".equalsIgnoreCase(skipPermissionCheck) && !"granted".equalsIgnoreCase(skipPermissionCheck))) { GenericValue userLogin = (GenericValue) context.get("userLogin"); - Map<String, Object> serviceInMap = FastMap.newInstance(); + Map<String, Object> serviceInMap = new HashMap<String, Object>(); serviceInMap.put("userLogin", userLogin); serviceInMap.put("targetOperationList", context.get("targetOperationList")); serviceInMap.put("contentPurposeList", context.get("contentPurposeList")); @@ -1143,7 +1139,7 @@ public class ContentWorker implements or if (UtilValidate.isNotEmpty(trail)) { passedGlobalNodeTrail = UtilGenerics.checkList(UtilMisc.makeListWritable(trail)); } else { - passedGlobalNodeTrail = FastList.newInstance(); + passedGlobalNodeTrail = new LinkedList<Map<String,Object>>(); } //if (Debug.infoOn()) Debug.logInfo("in getCurrentContent, passedGlobalNodeTrail(3):" + passedGlobalNodeTrail , module); int sz = passedGlobalNodeTrail.size(); @@ -1208,7 +1204,7 @@ public class ContentWorker implements or } public static Map<String, Object> buildPickContext(Delegator delegator, String contentAssocTypeId, String assocContentId, String direction, GenericValue thisContent) throws GenericEntityException { - Map<String, Object> ctx = FastMap.newInstance(); + Map<String, Object> ctx = new HashMap<String, Object>(); ctx.put("contentAssocTypeId", contentAssocTypeId); ctx.put("contentId", assocContentId); // This needs to be the opposite @@ -1222,7 +1218,7 @@ public class ContentWorker implements or ctx.put("content", thisContent); List<Object> purposes = getPurposes(thisContent); ctx.put("purposes", purposes); - List<String> contentTypeAncestry = FastList.newInstance(); + List<String> contentTypeAncestry = new LinkedList<String>(); String contentTypeId = thisContent.getString("contentTypeId"); getContentTypeAncestry(delegator, contentTypeId, contentTypeAncestry); ctx.put("typeAncestry", contentTypeAncestry); @@ -1235,14 +1231,14 @@ public class ContentWorker implements or } public static void checkConditions(Delegator delegator, Map<String, Object> trailNode, Map<String, Object> contentAssoc, Map<String, Object> whenMap) { - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); GenericValue content = (GenericValue)trailNode.get("value"); // String contentId = (String)trailNode.get("contentId"); if (contentAssoc == null && content != null && (content.getEntityName().indexOf("Assoc") >= 0)) { contentAssoc = delegator.makeValue("ContentAssoc"); try { // TODO: locale needs to be gotten correctly - SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", content, contentAssoc, FastList.newInstance(), Locale.getDefault()); + SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", content, contentAssoc, new LinkedList(), Locale.getDefault()); context.put("contentAssocTypeId", contentAssoc.get("contentAssocTypeId")); context.put("contentAssocPredicateId", contentAssoc.get("contentAssocPredicateId")); context.put("mapKey", contentAssoc.get("mapKey")); @@ -1263,7 +1259,7 @@ public class ContentWorker implements or List<Object> topics = getTopics(content); context.put("topics", topics); String contentTypeId = (String)content.get("contentTypeId"); - List<String> contentTypeAncestry = FastList.newInstance(); + List<String> contentTypeAncestry = new LinkedList<String>(); try { getContentTypeAncestry(delegator, contentTypeId, contentTypeAncestry); } catch (GenericEntityException e) { @@ -1297,12 +1293,12 @@ public class ContentWorker implements or if (UtilValidate.isNotEmpty(targetOperationString)) { List<String> opsFromString = StringUtil.split(targetOperationString, "|"); if (UtilValidate.isEmpty(targetOperationList)) { - targetOperationList = FastList.newInstance(); + targetOperationList = new LinkedList<String>(); } targetOperationList.addAll(opsFromString); } if (UtilValidate.isEmpty(targetOperationList)) { - targetOperationList = FastList.newInstance(); + targetOperationList = new LinkedList<String>(); if (UtilValidate.isEmpty(md)) { md ="_CREATE"; } @@ -1329,12 +1325,12 @@ public class ContentWorker implements or if (UtilValidate.isNotEmpty(contentPurposeString)) { List<String> purposesFromString = StringUtil.split(contentPurposeString, "|"); if (UtilValidate.isEmpty(contentPurposeList)) { - contentPurposeList = FastList.newInstance(); + contentPurposeList = new LinkedList<String>(); } contentPurposeList.addAll(purposesFromString); } if (UtilValidate.isEmpty(contentPurposeList)) { - contentPurposeList = FastList.newInstance(); + contentPurposeList = new LinkedList<String>(); } if (Debug.infoOn()) { Debug.logInfo("in prepContentPurposeList, contentPurposeList(0):" + contentPurposeList, ""); @@ -1357,7 +1353,7 @@ public class ContentWorker implements or } public static List<GenericValue> getContentAssocViewList(Delegator delegator, String contentIdTo, String contentId, String contentAssocTypeId, String statusId, String privilegeEnumId) throws GenericEntityException { - List<EntityExpr> exprListAnd = FastList.newInstance(); + List<EntityExpr> exprListAnd = new LinkedList<EntityExpr>(); if (UtilValidate.isNotEmpty(contentIdTo)) { EntityExpr expr = EntityCondition.makeCondition("caContentIdTo", EntityOperator.EQUALS, contentIdTo); @@ -1406,7 +1402,7 @@ public class ContentWorker implements or return thisNode; } - thisNode = FastMap.newInstance(); + thisNode = new HashMap<String, Object>(); thisNode.put("value", thisContent); String contentId = (String)thisContent.get("contentId"); thisNode.put("contentId", contentId); @@ -1442,29 +1438,25 @@ public class ContentWorker implements or } public static List<List<String>> csvToList(String csv, Delegator delegator) { - List<List<String>> outList = FastList.newInstance(); + List<List<String>> outList = new LinkedList<List<String>>(); List<String> contentIdList = StringUtil.split(csv, ","); GenericValue content = null; String contentName = null; - List<String> values = null; for (String contentId : contentIdList) { try { content = EntityQuery.use(delegator).from("Content").where("contentId", contentId).cache().queryOne(); } catch (GenericEntityException e) { Debug.logError(e.getMessage(), module); - return FastList.newInstance(); + return new LinkedList<List<String>>(); } contentName = (String)content.get("contentName"); - values = FastList.newInstance(); - values.add(contentId); - values.add(contentName); - outList.add(values); + outList.add(UtilMisc.toList(contentId, contentName)); } return outList; } public static List<GenericValue> csvToContentList(String csv, Delegator delegator) { - List<GenericValue> trail = FastList.newInstance(); + List<GenericValue> trail = new LinkedList<GenericValue>(); if (csv == null) { return trail; } @@ -1475,7 +1467,7 @@ public class ContentWorker implements or content = EntityQuery.use(delegator).from("Content").where("contentId", contentId).cache().queryOne(); } catch (GenericEntityException e) { Debug.logError(e.getMessage(), module); - return FastList.newInstance(); + return new LinkedList<GenericValue>(); } trail.add(content); } @@ -1483,7 +1475,7 @@ public class ContentWorker implements or } public static List<Map<String, Object>> csvToTrail(String csv, Delegator delegator) { - List<Map<String, Object>> trail = FastList.newInstance(); + List<Map<String, Object>> trail = new LinkedList<Map<String,Object>>(); if (csv == null) { return trail; } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java Fri Apr 10 20:22:54 2015 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.content.content; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; @@ -42,7 +41,7 @@ public class PermissionRecorder { protected boolean isOn = false; protected GenericValue userLogin; - protected List<Map<String, Object>> permCheckResults = FastList.newInstance(); + protected List<Map<String, Object>> permCheckResults = new LinkedList<Map<String,Object>>(); protected boolean entityPermCheckResult = false; protected String currentContentId = ""; protected Map<String, Object> currentContentMap; @@ -127,10 +126,10 @@ public class PermissionRecorder { public void setCurrentContentId(String id) { if (!currentContentId.equals(id)) { - currentContentMap = FastMap.newInstance(); + currentContentMap = new HashMap<String, Object>(); permCheckResults.add(currentContentMap); currentContentMap.put("contentId", id); - currentContentMap.put("checkResults", FastList.newInstance()); + currentContentMap.put("checkResults", new LinkedList()); } currentContentId = id; } @@ -158,7 +157,7 @@ public class PermissionRecorder { } public void startMatchGroup(List<String> targetOperations, List<String> purposes, List<String> roles, List<String> targStatusList, String targPrivilegeEnumId, String contentId) { - currentContentMap = FastMap.newInstance(); + currentContentMap = new HashMap<String, Object>(); permCheckResults.add(currentContentMap); String s = null; if (targetOperations != null) { @@ -185,7 +184,7 @@ public class PermissionRecorder { //if (Debug.infoOn()) Debug.logInfo("startMatchGroup, targStatusList(string):" + s, module); currentContentMap.put("statusId", s); } - List<Map<String, Object>> checkResultList = FastList.newInstance(); + List<Map<String, Object>> checkResultList = new LinkedList<Map<String,Object>>(); currentContentMap.put("privilegeEnumId", privilegeEnumId); currentContentMap.put("contentId", contentId); currentContentMap.put("checkResultList", checkResultList); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Fri Apr 10 20:22:54 2015 @@ -18,6 +18,8 @@ *******************************************************************************/ package org.ofbiz.content.content; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -26,9 +28,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.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; @@ -95,7 +94,7 @@ public class UploadContentAndImage { return "error"; } - Map<String, Object> passedParams = FastMap.newInstance(); + Map<String, Object> passedParams = new HashMap<String, Object>(); FileItem fi = null; FileItem imageFi = null; byte[] imageBytes = {}; @@ -124,7 +123,7 @@ public class UploadContentAndImage { passedParams.put("targetOperationList", targetOperationList); // Create or update FTL template - Map<String, Object> ftlContext = FastMap.newInstance(); + Map<String, Object> ftlContext = new HashMap<String, Object>(); ftlContext.put("userLogin", userLogin); ftlContext.put("contentId", passedParams.get("ftlContentId")); ftlContext.put("ownerContentId", passedParams.get("ownerContentId")); @@ -155,7 +154,7 @@ public class UploadContentAndImage { } String ftlContentId = (String)ftlResults.get("contentId"); if (UtilValidate.isNotEmpty(contentIdTo)) { - Map<String, Object> map = FastMap.newInstance(); + Map<String, Object> map = new HashMap<String, Object>(); map.put("fromDate", UtilDateTime.nowTimestamp()); map.put("contentId", ftlContentId); map.put("contentIdTo", contentIdTo); @@ -198,7 +197,7 @@ public class UploadContentAndImage { //if (Debug.infoOn()) Debug.logInfo("[UploadContentAndImage]ftlDataResourceId:" + ftlDataResourceId, module); // Create or update summary text subContent if (passedParams.containsKey("summaryData")) { - Map<String, Object> sumContext = FastMap.newInstance(); + Map<String, Object> sumContext = new HashMap<String, Object>(); sumContext.put("userLogin", userLogin); sumContext.put("contentId", passedParams.get("sumContentId")); sumContext.put("ownerContentId", ftlContentId); @@ -228,7 +227,7 @@ public class UploadContentAndImage { // Create or update electronic text subContent if (passedParams.containsKey("textData")) { - Map<String, Object> txtContext = FastMap.newInstance(); + Map<String, Object> txtContext = new HashMap<String, Object>(); txtContext.put("userLogin", userLogin); txtContext.put("contentId", passedParams.get("txtContentId")); txtContext.put("ownerContentId", ftlContentId); @@ -257,7 +256,7 @@ public class UploadContentAndImage { } // Create or update image subContent - Map<String, Object> imgContext = FastMap.newInstance(); + Map<String, Object> imgContext = new HashMap<String, Object>(); if (imageBytes.length > 0) { imgContext.put("userLogin", userLogin); imgContext.put("contentId", passedParams.get("imgContentId")); @@ -362,7 +361,7 @@ public class UploadContentAndImage { return "error"; } - Map<String, Object> passedParams = FastMap.newInstance(); + Map<String, Object> passedParams = new HashMap<String, Object>(); FileItem fi = null; FileItem imageFi = null; byte[] imageBytes = {}; @@ -433,7 +432,7 @@ public class UploadContentAndImage { Delegator delegator = (Delegator)request.getAttribute("delegator"); HttpSession session = request.getSession(); GenericValue userLogin = (GenericValue)session.getAttribute("userLogin"); - Map<String, Object> ftlContext = FastMap.newInstance(); + Map<String, Object> ftlContext = new HashMap<String, Object>(); String contentPurposeString = (String)passedParams.get("contentPurposeString" + suffix); if (UtilValidate.isEmpty(contentPurposeString)) { @@ -463,8 +462,8 @@ public class UploadContentAndImage { ModelEntity modelEntity = delegator.getModelEntity("ContentAssocDataResourceViewFrom"); List<String> fieldNames = modelEntity.getAllFieldNames(); - Map<String, Object> ftlContext2 = FastMap.newInstance(); - Map<String, Object> ftlContext3 = FastMap.newInstance(); + Map<String, Object> ftlContext2 = new HashMap<String, Object>(); + Map<String, Object> ftlContext3 = new HashMap<String, Object>(); for (String keyName : fieldNames) { Object obj = passedParams.get(keyName + suffix); ftlContext2.put(keyName, obj); @@ -472,17 +471,17 @@ public class UploadContentAndImage { if (Debug.infoOn()) { Debug.logInfo("[UploadContentStuff]ftlContext2:" + ftlContext2, module); } - List<Object> errorMessages = FastList.newInstance(); + List<Object> errorMessages = new LinkedList<Object>(); Locale loc = Locale.getDefault(); try { SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentIn", ftlContext2, ftlContext3, errorMessages, loc); SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentOut", ftlContext3, ftlContext, errorMessages, loc); - ftlContext3 = FastMap.newInstance(); + ftlContext3 = new HashMap<String, Object>(); SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceIn", ftlContext2, ftlContext3, errorMessages, loc); SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "dataResourceOut", ftlContext3, ftlContext, errorMessages, loc); - ftlContext3 = FastMap.newInstance(); + ftlContext3 = new HashMap<String, Object>(); SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", ftlContext2, ftlContext3, errorMessages, loc); SimpleMapProcessor.runSimpleMapProcessor("component://content/script/org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", ftlContext3, ftlContext, errorMessages, loc); } catch (MiniLangException e) { @@ -512,7 +511,7 @@ public class UploadContentAndImage { Debug.logInfo("[UploadContentStuff]msg:" + msg, module); } if (errorMsgList == null) { - errorMsgList = FastList.newInstance(); + errorMsgList = new LinkedList<String>(); request.setAttribute("errorMessageList", errorMsgList); } errorMsgList.add(msg); @@ -523,7 +522,7 @@ public class UploadContentAndImage { request.setAttribute("_ERROR_MESSAGE_", msg); List<String> errorMsgList = UtilGenerics.checkList(request.getAttribute("_EVENT_MESSAGE_LIST_")); if (errorMsgList == null) { - errorMsgList = FastList.newInstance(); + errorMsgList = new LinkedList<String>(); request.setAttribute("errorMessageList", errorMsgList); } errorMsgList.add(msg); @@ -543,7 +542,7 @@ public class UploadContentAndImage { String caContentIdTo = (String)passedParams.get("caContentIdTo"); if (UtilValidate.isNotEmpty(caContentIdTo)) { - Map<String, Object> resequenceContext = FastMap.newInstance(); + Map<String, Object> resequenceContext = new HashMap<String, Object>(); resequenceContext.put("contentIdTo", caContentIdTo); resequenceContext.put("userLogin", userLogin); try { @@ -559,7 +558,7 @@ public class UploadContentAndImage { Debug.logInfo("[UploadContentStuff]msg:" + msg, module); } if (errorMsgList == null) { - errorMsgList = FastList.newInstance(); + errorMsgList = new LinkedList<String>(); request.setAttribute("errorMessageList", errorMsgList); } errorMsgList.add(msg); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |