svn commit: r1672752 [17/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1672752 [17/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original) +++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Fri Apr 10 20:22:54 2015 @@ -24,15 +24,14 @@ import java.io.OutputStream; import java.io.StringWriter; import java.io.Writer; import java.sql.Timestamp; +import java.util.HashMap; +import java.util.HashSet; +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 javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.StringUtil; @@ -91,7 +90,7 @@ public class OagisShipmentServices { LocalDispatcher dispatcher = ctx.getDispatcher(); Delegator delegator = ctx.getDelegator(); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); - List<Map<String, String>> errorMapList = FastList.newInstance(); + List<Map<String, String>> errorMapList = new LinkedList<Map<String,String>>(); GenericValue userLogin = null; try { @@ -244,7 +243,7 @@ public class OagisShipmentServices { if (UtilValidate.isNotEmpty(invItemElementList)) { // sort the INVITEM elements by ITEM so that all shipments are processed in the same order, avoids deadlocking problems we've seen with concurrently processed orders - List<Map<String, Object>> invitemMapList = FastList.newInstance(); + List<Map<String, Object>> invitemMapList = new LinkedList<Map<String,Object>>(); boolean foundBadProductId = false; for (Element invItemElement : invItemElementList) { String productId = UtilXml.childElementValue(invItemElement, "of:ITEM"); // of @@ -259,7 +258,7 @@ public class OagisShipmentServices { continue; } - Map<String, Object> invitemMap = FastMap.newInstance(); + Map<String, Object> invitemMap = new HashMap<String, Object>(); invitemMap.put("productId", productId); // support multiple INVITEM elements for a given productId UtilMisc.addToListInMap(invItemElement, invitemMap, "invItemElementList"); @@ -368,7 +367,7 @@ public class OagisShipmentServices { } } - List<String> serialNumberList = FastList.newInstance(); + List<String> serialNumberList = new LinkedList<String>(); List<? extends Element> invDetailElementList = UtilXml.childElementList(invItemElement, "ns:INVDETAIL"); //n for (Element invDetailElement : invDetailElementList) { String serialNumber = UtilXml.childElementValue(invDetailElement, "of:SERIALNUM"); // os @@ -531,7 +530,7 @@ public class OagisShipmentServices { oagisMsgInfoCtx.put("processingStatusId", "OAGMP_SYS_ERROR"); dispatcher.runSync("updateOagisMessageInfo", oagisMsgInfoCtx, 60, true); - Map<String, Object> saveErrorMapListCtx = FastMap.newInstance(); + Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>(); saveErrorMapListCtx.putAll(omiPkMap); saveErrorMapListCtx.put("errorMapList", errorMapList); saveErrorMapListCtx.put("userLogin", userLogin); @@ -547,7 +546,7 @@ public class OagisShipmentServices { } } - Map<String, Object> result = FastMap.newInstance(); + Map<String, Object> result = new HashMap<String, Object>(); result.putAll(omiPkMap); result.put("userLogin", userLogin); @@ -562,7 +561,7 @@ public class OagisShipmentServices { try { // call services createOagisMsgErrInfosFromErrMapList and for incoming messages oagisSendConfirmBod - Map<String, Object> saveErrorMapListCtx = FastMap.newInstance(); + Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>(); saveErrorMapListCtx.putAll(omiPkMap); saveErrorMapListCtx.put("errorMapList", errorMapList); saveErrorMapListCtx.put("userLogin", userLogin); @@ -573,7 +572,7 @@ public class OagisShipmentServices { } try { - Map<String, Object> sendConfirmBodCtx = FastMap.newInstance(); + Map<String, Object> sendConfirmBodCtx = new HashMap<String, Object>(); sendConfirmBodCtx.putAll(omiPkMap); sendConfirmBodCtx.put("errorMapList", errorMapList); sendConfirmBodCtx.put("userLogin", userLogin); @@ -737,7 +736,7 @@ public class OagisShipmentServices { } // check payment authorization - Map<String, Object> authServiceContext = FastMap.newInstance(); + Map<String, Object> authServiceContext = new HashMap<String, Object>(); authServiceContext.put("orderId", orderId); authServiceContext.put("userLogin", userLogin); authServiceContext.put("reAuth", true); @@ -759,7 +758,7 @@ public class OagisShipmentServices { // prepare map to Create Oagis Message Info try { - Map<String, Object> comiCtx = FastMap.newInstance(); + Map<String, Object> comiCtx = new HashMap<String, Object>(); comiCtx.putAll(omiPkMap); comiCtx.put("processingStatusId", "OAGMP_TRIGGERED"); comiCtx.put("outgoingMessage", "Y"); @@ -816,7 +815,7 @@ public class OagisShipmentServices { orderItemShipGroup = EntityQuery.use(delegator).from("OrderItemShipGroup").where("orderId", orderId).queryFirst(); bodyParameters.put("orderItemShipGroup", orderItemShipGroup); - Set<String> correspondingPoIdSet = FastSet.newInstance(); + Set<String> correspondingPoIdSet = new HashSet<String>(); List<GenericValue> orderItems = orderReadHelper.getOrderItems(); for (GenericValue orderItem : orderItems) { @@ -827,7 +826,7 @@ public class OagisShipmentServices { } bodyParameters.put("correspondingPoIdSet", correspondingPoIdSet); if (orderHeader.get("externalId") != null) { - Set<String> externalIdSet = FastSet.newInstance(); + Set<String> externalIdSet = new HashSet<String>(); externalIdSet.add(orderHeader.getString("externalId")); bodyParameters.put("externalIdSet", externalIdSet); } @@ -888,7 +887,7 @@ public class OagisShipmentServices { if (Debug.infoOn()) Debug.logInfo("Finished rendering oagisSendProcessShipment message for orderId [" + orderId + "]", module); try { - Map<String, Object> uomiCtx = FastMap.newInstance(); + Map<String, Object> uomiCtx = new HashMap<String, Object>(); uomiCtx.putAll(omiPkMap); uomiCtx.put("processingStatusId", "OAGMP_OGEN_SUCCESS"); uomiCtx.put("shipmentId", shipmentId); @@ -905,7 +904,7 @@ public class OagisShipmentServices { Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale, delegator); if (sendMessageReturn != null && ServiceUtil.isError(sendMessageReturn)) { try { - Map<String, Object> uomiCtx = FastMap.newInstance(); + Map<String, Object> uomiCtx = new HashMap<String, Object>(); uomiCtx.putAll(omiPkMap); uomiCtx.put("processingStatusId", "OAGMP_SEND_ERROR"); uomiCtx.put("userLogin", userLogin); @@ -919,7 +918,7 @@ public class OagisShipmentServices { if (Debug.infoOn()) Debug.logInfo("Message send done for oagisSendProcessShipment for orderId [" + orderId + "], sendToUrl=[" + sendToUrl + "], saveToDirectory=[" + saveToDirectory + "], saveToFilename=[" + saveToFilename + "]", module); try { - Map<String, Object> uomiCtx = FastMap.newInstance(); + Map<String, Object> uomiCtx = new HashMap<String, Object>(); uomiCtx.putAll(omiPkMap); uomiCtx.put("processingStatusId", "OAGMP_SENT"); uomiCtx.put("userLogin", userLogin); @@ -940,7 +939,7 @@ public class OagisShipmentServices { return ServiceUtil.returnError(errMsg); } - Map<String, Object> uomiCtx = FastMap.newInstance(); + Map<String, Object> uomiCtx = new HashMap<String, Object>(); uomiCtx.putAll(omiPkMap); uomiCtx.put("processingStatusId", "OAGMP_SYS_ERROR"); uomiCtx.put("bsrVerb", "PROCESS"); @@ -951,7 +950,7 @@ public class OagisShipmentServices { dispatcher.runSync("updateOagisMessageInfo", uomiCtx, 60, true); List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SystemError")); - Map<String, Object> saveErrorMapListCtx = FastMap.newInstance(); + Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>(); saveErrorMapListCtx.putAll(omiPkMap); saveErrorMapListCtx.put("errorMapList", errorMapList); saveErrorMapListCtx.put("userLogin", userLogin); @@ -1049,7 +1048,7 @@ public class OagisShipmentServices { // prepare map to Create Oagis Message Info try { - Map<String, Object> comiCtx = FastMap.newInstance(); + Map<String, Object> comiCtx = new HashMap<String, Object>(); comiCtx.putAll(omiPkMap); comiCtx.put("outgoingMessage", "Y"); comiCtx.put("confirmation", "1"); @@ -1080,7 +1079,7 @@ public class OagisShipmentServices { // calculate total qty of return items in a shipping unit received, order associated with return double totalQty = 0.0; - Map<String, List<String>> serialNumberListByReturnItemSeqIdMap = FastMap.newInstance(); + Map<String, List<String>> serialNumberListByReturnItemSeqIdMap = new HashMap<String, List<String>>(); bodyParameters.put("serialNumberListByReturnItemSeqIdMap", serialNumberListByReturnItemSeqIdMap); for (GenericValue returnItem : returnItems) { double itemQty = returnItem.getDouble("returnQuantity").doubleValue(); @@ -1095,7 +1094,7 @@ public class OagisShipmentServices { .where("orderId", orderItem.get("orderId"), "orderItemSeqId", orderItem.get("orderItemSeqId"), "inventoryItemTypeId", "SERIALIZED_INV_ITEM") .queryList(); if (itemIssuanceAndInventoryItemList.size() == itemQty) { - List<String> serialNumberList = FastList.newInstance(); + List<String> serialNumberList = new LinkedList<String>(); serialNumberListByReturnItemSeqIdMap.put(returnItem.getString("returnItemSeqId"), serialNumberList); for (GenericValue itemIssuanceAndInventoryItem : itemIssuanceAndInventoryItemList) { serialNumberList.add(itemIssuanceAndInventoryItem.getString("serialNumber")); @@ -1132,7 +1131,7 @@ public class OagisShipmentServices { String outText = writer.toString(); try { - Map<String, Object> uomiCtx = FastMap.newInstance(); + Map<String, Object> uomiCtx = new HashMap<String, Object>(); uomiCtx.putAll(omiPkMap); uomiCtx.put("processingStatusId", "OAGMP_OGEN_SUCCESS"); uomiCtx.put("userLogin", userLogin); @@ -1148,7 +1147,7 @@ public class OagisShipmentServices { Map<String, Object> sendMessageReturn = OagisServices.sendMessageText(outText, out, sendToUrl, saveToDirectory, saveToFilename, locale, delegator); if (sendMessageReturn != null && ServiceUtil.isError(sendMessageReturn)) { try { - Map<String, Object> uomiCtx = FastMap.newInstance(); + Map<String, Object> uomiCtx = new HashMap<String, Object>(); uomiCtx.putAll(omiPkMap); uomiCtx.put("processingStatusId", "OAGMP_SEND_ERROR"); uomiCtx.put("userLogin", userLogin); @@ -1161,7 +1160,7 @@ public class OagisShipmentServices { } try { - Map<String, Object> uomiCtx = FastMap.newInstance(); + Map<String, Object> uomiCtx = new HashMap<String, Object>(); uomiCtx.putAll(omiPkMap); uomiCtx.put("processingStatusId", "OAGMP_SENT"); uomiCtx.put("userLogin", userLogin); @@ -1182,7 +1181,7 @@ public class OagisShipmentServices { return ServiceUtil.returnError(errMsg); } - Map<String, Object> uomiCtx = FastMap.newInstance(); + Map<String, Object> uomiCtx = new HashMap<String, Object>(); uomiCtx.putAll(omiPkMap); uomiCtx.put("processingStatusId", "OAGMP_SYS_ERROR"); uomiCtx.put("bsrVerb", "RECEIVE"); @@ -1193,7 +1192,7 @@ public class OagisShipmentServices { dispatcher.runSync("updateOagisMessageInfo", uomiCtx, 60, true); List<Map<String, String>> errorMapList = UtilMisc.toList(UtilMisc.<String, String>toMap("description", errMsg, "reasonCode", "SystemError")); - Map<String, Object> saveErrorMapListCtx = FastMap.newInstance(); + Map<String, Object> saveErrorMapListCtx = new HashMap<String, Object>(); saveErrorMapListCtx.putAll(omiPkMap); saveErrorMapListCtx.put("errorMapList", errorMapList); saveErrorMapListCtx.put("userLogin", userLogin); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java Fri Apr 10 20:22:54 2015 @@ -18,11 +18,10 @@ *******************************************************************************/ package org.ofbiz.guiapp.xui; +import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilMisc; @@ -45,7 +44,7 @@ public class XuiSession { protected LocalDispatcher dispatcher = null; protected GenericValue userLogin = null; protected XuiContainer container = null; - protected Map<String, Object> attributes = FastMap.newInstance(); + protected Map<String, Object> attributes = new HashMap<String, Object>(); protected String id = null; protected final boolean IS_SAME_LOGIN = UtilProperties.propertyValueEqualsIgnoreCase("xui.properties", "isSameLogin", "true"); private Locale locale = Locale.getDefault(); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Fri Apr 10 20:22:54 2015 @@ -22,14 +22,14 @@ import java.io.PrintWriter; import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.Locale; import java.util.Map; -import javolution.util.FastList; -import javolution.util.FastMap; import net.xoetrope.xui.data.XModel; import net.xoetrope.xui.helper.SwingWorker; @@ -259,7 +259,7 @@ public class PosTransaction implements S public Map<String, Object> getItemInfo(int index) { ShoppingCartItem item = cart.findCartItem(index); - Map<String, Object> itemInfo = FastMap.newInstance(); + Map<String, Object> itemInfo = new HashMap<String, Object>(); itemInfo.put("productId", item.getProductId()); String description = item.getDescription(); if (UtilValidate.isEmpty(description)) { @@ -300,7 +300,7 @@ public class PosTransaction implements S pcw = item.getConfigWrapper(); List<ConfigOption> selected = pcw.getSelectedOptions(); for (ConfigOption configoption : selected) { - Map<String, Object> itemInfo = FastMap.newInstance(); + Map<String, Object> itemInfo = new HashMap<String, Object>(); if (configoption.isSelected() && !configoption.isDefault()) { itemInfo.put("productId", ""); itemInfo.put("sku", ""); @@ -320,7 +320,7 @@ public class PosTransaction implements S GenericValue infValue = inf.getValueObject(session.getDelegator()); GenericValue paymentPref = null; try { - Map<String, Object> fields = FastMap.newInstance(); + Map<String, Object> fields = new HashMap<String, Object>(); fields.put("paymentMethodTypeId", inf.paymentMethodTypeId); if (inf.paymentMethodId != null) { fields.put("paymentMethodId", inf.paymentMethodId); @@ -345,7 +345,7 @@ public class PosTransaction implements S } //Debug.logInfo("PaymentPref - " + paymentPref, module); - Map<String, Object> payInfo = FastMap.newInstance(); + Map<String, Object> payInfo = new HashMap<String, Object>(); // locate the auth info GenericValue authTrans = null; @@ -845,7 +845,7 @@ public class PosTransaction implements S UtilMisc.toMap("reasonEnumId", "EnumIdHere"), // TODO: where does this come from? "itemCommentMap", UtilMisc.toMap("changeComments", "change Comments here")); //TODO - Map<String, Object> svcCtx = FastMap.newInstance(); + Map<String, Object> svcCtx = new HashMap<String, Object>(); svcCtx.put("userLogin", session.getUserLogin()); svcCtx.put("orderId", orderId); svcCtx.put("shoppingCart", cart); @@ -1139,7 +1139,7 @@ public class PosTransaction implements S expYear = "20" + expYear; } - Map<String, Object> svcCtx = FastMap.newInstance(); + Map<String, Object> svcCtx = new HashMap<String, Object>(); svcCtx.put("userLogin", session.getUserLogin()); svcCtx.put("partyId", partyId); svcCtx.put("cardNumber", cardNumber); @@ -1249,10 +1249,10 @@ public class PosTransaction implements S private List<GenericValue> findOrders() { LocalDispatcher dispatcher = session.getDispatcher(); - Map<String, Object> svcCtx = FastMap.newInstance(); + Map<String, Object> svcCtx = new HashMap<String, Object>(); svcCtx.put("userLogin", session.getUserLogin()); svcCtx.put("partyId", partyId); - List<String> orderStatusIds = FastList.newInstance(); + List<String> orderStatusIds = new LinkedList<String>(); orderStatusIds.add("ORDER_CREATED"); svcCtx.put("orderStatusId", orderStatusIds); svcCtx.put("viewIndex", 1); @@ -1318,7 +1318,7 @@ public class PosTransaction implements S } public Map<String, String> createSalesMap(List<GenericValue> shoppingLists) { - Map<String, String> salesMap = FastMap.newInstance(); + Map<String, String> salesMap = new HashMap<String, String>(); for (GenericValue shoppingList : shoppingLists) { List<GenericValue> items = null; try { @@ -1336,7 +1336,7 @@ public class PosTransaction implements S } public Map<String, String> createOrderHash(List<GenericValue> orders) { - Map<String, String> hash = FastMap.newInstance(); + Map<String, String> hash = new HashMap<String, String>(); for (GenericValue order : orders) { String orderName = order.getString("orderName"); String orderId = order.getString("orderId"); @@ -1369,7 +1369,7 @@ public class PosTransaction implements S LocalDispatcher dispatcher = session.getDispatcher(); - Map<String, Object> svcCtx = FastMap.newInstance(); + Map<String, Object> svcCtx = new HashMap<String, Object>(); svcCtx.put("userLogin", session.getUserLogin()); svcCtx.put("orderId", orderId); svcCtx.put("skipInventoryChecks", Boolean.TRUE); @@ -1548,7 +1548,7 @@ public class PosTransaction implements S party.put(key, keyTypeValue); partyListIt.set(party); } else { - Map<String, String> partyClone = FastMap.newInstance(); + Map<String, String> partyClone = new HashMap<String, String>(); partyClone.putAll(party); partyClone.put(key, keyTypeValue); partyListIt.add(partyClone); @@ -1602,11 +1602,11 @@ public class PosTransaction implements S } // define the main condition & expression list - List<EntityCondition> andExprs = FastList.newInstance(); + List<EntityCondition> andExprs = new LinkedList<EntityCondition>(); EntityCondition mainCond = null; - List<String> orderBy = FastList.newInstance(); - List<String> fieldsToSelect = FastList.newInstance(); + List<String> orderBy = new LinkedList<String>(); + List<String> fieldsToSelect = new LinkedList<String>(); // fields we need to select; will be used to set distinct fieldsToSelect.add("partyId"); fieldsToSelect.add("lastName"); @@ -1692,9 +1692,9 @@ public class PosTransaction implements S } if (partyList != null) { - resultList = FastList.newInstance(); + resultList = new LinkedList<Map<String,String>>(); for (GenericValue party : partyList) { - Map<String, String> partyMap = FastMap.newInstance(); + Map<String, String> partyMap = new HashMap<String, String>(); partyMap.put("partyId", party.getString("partyId")); partyMap.put("lastName", party.getString("lastName")); partyMap.put("cardId", party.getString("cardId")); @@ -1721,7 +1721,7 @@ public class PosTransaction implements S resultList = searchContactMechs(delegator, pos, resultList, "", "EMAIL_ADDRESS"); } } else { - resultList = FastList.newInstance(); + resultList = new LinkedList<Map<String,String>>(); } return resultList; } @@ -1737,8 +1737,8 @@ public class PosTransaction implements S GenericValue partyUserLogin = null; String result = null; - Map<String, Object> svcCtx = FastMap.newInstance(); - Map<String, Object> svcRes = null; + Map<String, Object> svcCtx = new HashMap<String, Object>(); + Map<String, Object> svcRes = null; // Create if ("create".equals(editType)) { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java Fri Apr 10 20:22:54 2015 @@ -26,10 +26,10 @@ import java.math.BigDecimal; import java.net.URL; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import javolution.util.FastMap; import jpos.JposException; import jpos.POSPrinter; import jpos.POSPrinterConst; @@ -64,7 +64,7 @@ public class Receipt extends GenericDevi protected SimpleDateFormat[] dateFormat = null; protected String[] storeReceiptTmpl = null; protected String[] custReceiptTmpl = null; - protected Map<String, Object> reportTmpl = FastMap.newInstance(); + protected Map<String, Object> reportTmpl = new HashMap<String, Object>(); protected static final String[] dateFmtStr = { "EEE, d MMM yyyy HH:mm:ss z", "EEE, d MMM yyyy HH:mm:ss z", "EEE, d MMM yyyy HH:mm:ss z" }; protected static final int[] priceLength = { 7, 7, 7 }; @@ -458,7 +458,7 @@ public class Receipt extends GenericDevi } private Map<String, Object> makeCodeExpandMap(PosTransaction trans, int type) { - Map<String, Object> expandMap = FastMap.newInstance(); + Map<String, Object> expandMap = new HashMap<String, Object>(); SimpleDateFormat fmt = this.getDateFormat(type); String dateString = fmt.format(new Date()); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Fri Apr 10 20:22:54 2015 @@ -21,10 +21,10 @@ package org.ofbiz.pos.event; import java.math.BigDecimal; import java.sql.Timestamp; import java.text.DecimalFormat; +import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javolution.util.FastMap; import net.xoetrope.xui.XProjectManager; import org.ofbiz.base.util.Debug; @@ -545,7 +545,7 @@ public class ManagerEvents { } - Map<String, String> reportMap = FastMap.newInstance(); + Map<String, String> reportMap = new HashMap<String, String>(); String reportTemplate = "totals.txt"; // miscellaneous Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java Fri Apr 10 20:22:54 2015 @@ -18,10 +18,9 @@ *******************************************************************************/ package org.ofbiz.pos.jpos.service; +import java.util.LinkedList; import java.util.List; -import javolution.util.FastList; - import jpos.services.EventCallbacks; import jpos.JposException; import jpos.JposConst; @@ -37,7 +36,7 @@ public class BaseService implements jpos public static final String module = BaseService.class.getName(); protected static boolean claimed = false; - protected List<Object> eventQueue = FastList.newInstance(); + protected List<Object> eventQueue = new LinkedList<Object>(); protected JposEntry entry = null; protected boolean freezeEvents = false; @@ -184,8 +183,8 @@ public class BaseService implements jpos } private void fireQueuedEvents() { - List<Object> queuedList = new FastList<Object>(eventQueue); - this.eventQueue = FastList.newInstance(); + List<Object> queuedList = new LinkedList<Object>(eventQueue); + this.eventQueue = new LinkedList<Object>(); for (Object obj : queuedList) { this.fireEvent(obj); } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java Fri Apr 10 20:22:54 2015 @@ -20,13 +20,13 @@ package org.ofbiz.pos.screen; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import javax.swing.DefaultComboBoxModel; -import javolution.util.FastList; import net.xoetrope.swing.XButton; import net.xoetrope.swing.XComboBox; import net.xoetrope.swing.XDialog; @@ -67,7 +67,7 @@ public class ClientProfile extends XPage protected XEdit m_cardEdit = null; protected XLabel m_clientListLabel = null; protected XComboBox m_clientListCombo = null; - protected List<String> m_clientListBidingCombo = FastList.newInstance(); + protected List<String> m_clientListBidingCombo = new LinkedList<String>(); protected XLabel m_tipLoginPwdLabel = null; protected XButton m_search = null; protected XButton m_create = null; Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java Fri Apr 10 20:22:54 2015 @@ -20,6 +20,7 @@ package org.ofbiz.pos.screen; import java.util.ArrayList; import java.util.EventObject; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -31,7 +32,6 @@ import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import javolution.util.FastMap; import net.xoetrope.swing.XButton; import net.xoetrope.swing.XDialog; import net.xoetrope.swing.XList; @@ -176,7 +176,7 @@ public class ConfigureItem extends XPage private void displayQuestions() { QuestionFactory qf = new QuestionFactory(); - questionHashMap = FastMap.newInstance(); + questionHashMap = new HashMap<String, ConfigureItem.Question>(); List<ConfigItem> questions = m_pcw.getQuestions(); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java Fri Apr 10 20:22:54 2015 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.pos.screen; +import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import java.util.Map; @@ -25,7 +26,6 @@ import java.util.Map; import javax.swing.DefaultListModel; import javax.swing.ListSelectionModel; -import javolution.util.FastMap; import net.xoetrope.swing.XButton; import net.xoetrope.swing.XDialog; import net.xoetrope.swing.XList; @@ -47,7 +47,7 @@ public class LoadSale extends XPage { public static final String module = LoadSale.class.getName(); protected static PosScreen m_pos = null; protected XDialog m_dialog = null; - static protected Map<String, String> m_saleMap = FastMap.newInstance(); + static protected Map<String, String> m_saleMap = new HashMap<String, String>(); protected XList m_salesList = null; protected XButton m_cancel = null; protected XButton m_add = null; Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java Fri Apr 10 20:22:54 2015 @@ -19,13 +19,13 @@ package org.ofbiz.pos.screen; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import javax.swing.DefaultComboBoxModel; -import javolution.util.FastList; import net.xoetrope.swing.XButton; import net.xoetrope.swing.XComboBox; import net.xoetrope.swing.XDialog; @@ -94,7 +94,7 @@ public class PaidInOut extends XPage { XEventHelper.addMouseHandler(this, m_amountEdit, "editAmount"); m_comboModel = new DefaultComboBoxModel(); - List<GenericValue> posPaidReasons = FastList.newInstance(); + List<GenericValue> posPaidReasons = new LinkedList<GenericValue>(); if (m_type.equals("IN")) { m_dialog.setCaption(UtilProperties.getMessage(PosTransaction.resource, "PosPaidInTitle", locale)); try { Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy Fri Apr 10 20:22:54 2015 @@ -23,9 +23,6 @@ import org.ofbiz.entity.*; import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.*; import org.ofbiz.base.util.*; -import javolution.util.FastMap; -import javolution.util.FastList; - allProjects = select("workEffortId").from("WorkEffortAndPartyAssign").where("workEffortTypeId", "PROJECT", "partyId", parameters.partyId).orderBy("workEffortName").cache(true).queryList(); Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy Fri Apr 10 20:22:54 2015 @@ -21,7 +21,6 @@ import java.util.*; import java.lang.*; import org.ofbiz.entity.*; import org.ofbiz.base.util.*; -import javolution.util.FastMap; if (parameters.workEffortId) { workEffortId = parameters.workEffortId; Modified: ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml Fri Apr 10 20:22:54 2015 @@ -1301,8 +1301,7 @@ <condition-expr field-name="partyId" operator="in" from-field="partyIdAllInCompany" /> </condition-list> </entity-condition> - <call-class-method class-name="javolution.util.FastList" method-name="newInstance" ret-field="tasks"/> - <set field="isAddAll" value="${groovy:tasks.addAll(sprintTasks)}"/> + <set field="tasks" value="${groovy:sprintTasks as LinkedList}" type="List"/> <set field="isAddAll" value="${groovy:tasks.addAll(cancelledBacklogTasks)}"/> <set field="isAddAll" value="${groovy:tasks.addAll(unplannedTasks)}"/> <if-empty field="tasks"> Modified: ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java (original) +++ ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java Fri Apr 10 20:22:54 2015 @@ -20,6 +20,8 @@ package org.ofbiz.scrum; import java.io.IOException; import java.sql.Timestamp; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -28,9 +30,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.UtilDateTime; import org.ofbiz.base.util.UtilHttp; @@ -57,7 +56,7 @@ public class ScrumEvents { HttpSession session = request.getSession(); Delegator delegator = (Delegator) session.getAttribute("delegator"); GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - List<Map<String, Object>> noTimeEntryList = FastList.newInstance(); + List<Map<String, Object>> noTimeEntryList = new LinkedList<Map<String,Object>>(); String partyId = userLogin.getString("partyId"); Timestamp now = UtilDateTime.nowTimestamp(); Timestamp weekStart = UtilDateTime.getWeekStart(now); @@ -88,7 +87,7 @@ public class ScrumEvents { //check EmplLeave List<GenericValue> emplLeaveList = EntityQuery.use(delegator).from("EmplLeave").where("partyId", partyId, "fromDate", realTimeDate).cache(true).queryList(); if (UtilValidate.isEmpty(timeEntryList) && UtilValidate.isEmpty(emplLeaveList)) { - Map<String, Object> noEntryMap = FastMap.newInstance(); + Map<String, Object> noEntryMap = new HashMap<String, Object>(); noEntryMap.put("timesheetId", timesheetId); noTimeEntryList.add(noEntryMap); break; Modified: ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java (original) +++ ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java Fri Apr 10 20:22:54 2015 @@ -21,14 +21,13 @@ package org.ofbiz.scrum; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +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 javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; @@ -173,7 +172,7 @@ public class ScrumServices { Integer revision = Integer.parseInt(latestRevision.trim()); for (int i = 1; i <= revision; i++) { String logline = null; - List<String> logMessageList = FastList.newInstance(); + List<String> logMessageList = new LinkedList<String>(); String logCommand = "svn log -r" + i + " " + repositoryRoot; Process logProcess = Runtime.getRuntime().exec(logCommand); BufferedReader logIn = new BufferedReader(new InputStreamReader(logProcess.getInputStream())); @@ -205,10 +204,10 @@ public class ScrumServices { if (UtilValidate.isNotEmpty(taskId)) { String version = "R" + i; List <GenericValue> workeffContentList = EntityQuery.use(delegator).from("WorkEffortAndContentDataResource").where("contentName",version.trim() ,"drObjectInfo", revisionLink.trim()).queryList(); - List<EntityCondition> exprsAnd = FastList.newInstance(); + List<EntityCondition> exprsAnd = new LinkedList<EntityCondition>(); exprsAnd.add(EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, taskId)); - List<EntityCondition> exprsOr = FastList.newInstance(); + List<EntityCondition> exprsOr = new LinkedList<EntityCondition>(); exprsOr.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_ERROR")); exprsOr.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_TEST")); exprsOr.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_IMPL")); @@ -217,7 +216,7 @@ public class ScrumServices { List<GenericValue> workEffortList = EntityQuery.use(delegator).from("WorkEffort").where(exprsAnd).queryList(); if (UtilValidate.isEmpty(workeffContentList) && UtilValidate.isNotEmpty(workEffortList)) { - Map<String, Object> inputMap = FastMap.newInstance(); + Map<String, Object> inputMap = new HashMap<String, Object>(); inputMap.put("taskId", taskId); inputMap.put("user", user); inputMap.put("revisionNumber", Integer.toString(i)); @@ -260,7 +259,7 @@ public class ScrumServices { String repositoryRoot = (String) context.get("repositoryRoot"); Map<String, Object> result = ServiceUtil.returnSuccess(); try { - List<EntityCondition> exprsAnd = FastList.newInstance(); + List<EntityCondition> exprsAnd = new LinkedList<EntityCondition>(); String revisionLink = repositoryRoot.substring(repositoryRoot.lastIndexOf("svn/") + 4, repositoryRoot.length()) + "&revision="; exprsAnd.add(EntityCondition.makeCondition("workEffortContentTypeId", EntityOperator.EQUALS, "TASK_SUB_INFO")); exprsAnd.add(EntityCondition.makeCondition("contentTypeId", EntityOperator.EQUALS, "DOCUMENT")); @@ -268,8 +267,8 @@ public class ScrumServices { List<GenericValue> workEffortDataResourceList = EntityQuery.use(delegator).from("WorkEffortAndContentDataResource").where(exprsAnd).queryList(); if (UtilValidate.isNotEmpty(workEffortDataResourceList)) { Debug.logInfo("Total Content Size ============== >>>>>>>>>>> "+ workEffortDataResourceList.size(), module); - 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 : workEffortDataResourceList) { String drObjectInfo = workEffort.getString("drObjectInfo"); if (keys.contains(drObjectInfo)) { Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy Fri Apr 10 20:22:54 2015 @@ -19,7 +19,6 @@ import java.util.*; import java.lang.*; -import javolution.util.FastList; import org.ofbiz.base.util.*; import org.ofbiz.entity.*; import org.ofbiz.base.util.UtilMisc; @@ -35,10 +34,10 @@ backlogList=[]; custRequestList = from("CustRequestItem").where("productId", productId).queryList(); custRequestList.each { custRequestListMap -> custRequestId=custRequestListMap.custRequestId; - exprBldr = FastList.newInstance(); + exprBldr = []; exprBldr.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "CRQ_REOPENED")); exprBldr.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "CRQ_REVIEWED")); - andExprs = FastList.newInstance(); + andExprs = []; andExprs.add(EntityCondition.makeCondition("custRequestId", EntityOperator.EQUALS, custRequestId)); andExprs.add(EntityCondition.makeCondition(exprBldr, EntityOperator.OR)); custRequestTypeCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy Fri Apr 10 20:22:54 2015 @@ -19,7 +19,6 @@ import java.util.*; import java.lang.*; -import javolution.util.FastList; import org.apache.tools.ant.taskdefs.Parallel.TaskList; import org.ofbiz.base.util.*; import org.ofbiz.entity.*; @@ -56,7 +55,7 @@ if ((taskId != null)||(taskName != null) ||(partyId != null)||(viewIndex_1 > 0)||(viewIndex_2 > 0)||(viewIndex_3 > 0)||(viewIndex_4 > 0) ||(viewIndexNo_1 > 0)||(viewIndexNo_2 > 0)||(viewIndexNo_3 > 0)||(viewIndexNo_4 > 0)){ if ((taskId != null)||(taskName != null)||(taskTypeId != null)){ - exprBldr = FastList.newInstance(); + exprBldr = []; if (taskId) { exprBldr.add(EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, taskId)); } @@ -75,7 +74,7 @@ if ((taskId != null)||(taskName != null) unplannedTaskList = from("UnPlannedBacklogsAndTasks").orderBy("-createdDate").queryList(); } - exprBldr2 = FastList.newInstance(); + exprBldr2 = []; if (taskId) { exprBldr2.add(EntityCondition.makeCondition("taskId", EntityOperator.EQUALS, taskId)); } Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy Fri Apr 10 20:22:54 2015 @@ -22,13 +22,12 @@ import org.ofbiz.base.util.*; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityOperator; -import javolution.util.FastList; partyId = parameters.partyId; -andCond = FastList.newInstance(); -orCond = FastList.newInstance(); -combinedCondList = FastList.newInstance(); +andCond = []; +orCond = []; +combinedCondList = []; andCond.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId)); andCond.add(EntityCondition.makeCondition("partyStatusId", EntityOperator.EQUALS, "PARTY_ENABLED")); @@ -53,19 +52,19 @@ userPreferenceOutList = []; if (scrumUserLoginSecurityGroupList) { scrumUserLoginSecurityGroupList.each { scrumUserLoginSecurityGroupMap -> if (scrumUserLoginSecurityGroupMap.groupId == "SCRUM_PRODUCT_OWNER") { - ownerCond = FastList.newInstance(); + ownerCond = []; ownerCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE")); ownerCond.add(EntityCondition.makeCondition("enumId", EntityOperator.NOT_EQUAL, "MASTER_NOTIFY")); ownerConds = EntityCondition.makeCondition(ownerCond, EntityOperator.AND); userPreferenceList = from("Enumeration").where(ownerConds).queryList(); } else if (scrumUserLoginSecurityGroupMap.groupId == "SCRUM_MASTER") { - masterCond = FastList.newInstance(); + masterCond = []; masterCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE")); masterCond.add(EntityCondition.makeCondition("enumId", EntityOperator.EQUALS, "MASTER_NOTIFY")); masterConds = EntityCondition.makeCondition(masterCond, EntityOperator.AND); userPreferenceList = from("Enumeration").where(masterConds).queryList(); } /*else if (scrumUserLoginSecurityGroupMap.groupId == "SCRUM_TEAM") { - teamCond = FastList.newInstance(); + teamCond = []; teamCond.add(EntityCondition.makeCondition("enumTypeId", EntityOperator.EQUALS, "SCRUM_PREFERENCE")); teamCond.add(EntityCondition.makeCondition("enumId", EntityOperator.EQUALS, "INVITE_NOTIFI")); teamConds = EntityCondition.makeCondition(teamCond, EntityOperator.AND); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy Fri Apr 10 20:22:54 2015 @@ -23,8 +23,6 @@ import org.ofbiz.entity.*; import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.*; import org.ofbiz.base.util.*; -import javolution.util.FastMap; -import javolution.util.FastList; import org.ofbiz.entity.condition.EntityFunction; def module = "ListScrumResource.groovy"; Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy Fri Apr 10 20:22:54 2015 @@ -17,14 +17,13 @@ * under the License. */ -import javolution.util.FastList; import org.ofbiz.entity.condition.*; import org.ofbiz.base.util.*; taskStatusId = null; paraBacklogStatusId = backlogStatusId; -orStsExprs = FastList.newInstance(); +orStsExprs = []; if (backlogStatusId != "Any") { taskStatusId = "STS_CREATED"; orStsExprs.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "CRQ_REVIEWED")); @@ -32,12 +31,12 @@ orStsExprs = FastList.newInstance(); orStsExprs.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "CRQ_REVIEWED")); orStsExprs.add(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "CRQ_COMPLETED")); } -orCurentExprs = FastList.newInstance(); +orCurentExprs = []; if (taskStatusId) { orCurentExprs.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, taskStatusId)); orCurentExprs.add(EntityCondition.makeCondition("currentStatusId", EntityOperator.EQUALS, null)); } -andExprs = FastList.newInstance(); +andExprs = []; andExprs.add(EntityCondition.makeCondition("productId", EntityOperator.EQUALS, parameters.productId)); andExprs.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); andExprs.add(EntityCondition.makeCondition(orStsExprs, EntityOperator.OR)); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy Fri Apr 10 20:22:54 2015 @@ -17,7 +17,6 @@ * under the License. */ -import javolution.util.FastList; import org.ofbiz.entity.condition.*; import org.ofbiz.base.util.*; @@ -39,19 +38,19 @@ if ("SPRINT_CLOSED".equals(currentStatus taskStatusId = "STS_CREATED"; } } -orCurentExprs = FastList.newInstance(); +orCurentExprs = []; if (taskStatusId) { orCurentExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, taskStatusId)); orCurentExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, "SPRINT_ACTIVE")); } -orBacklogExprs = FastList.newInstance(); +orBacklogExprs = []; if (backlogStatusId) { orBacklogExprs.add(EntityCondition.makeCondition("backlogStatusId", EntityOperator.EQUALS, backlogStatusId)); } if (reopenedStatusId) { orBacklogExprs.add(EntityCondition.makeCondition("backlogStatusId", EntityOperator.EQUALS, reopenedStatusId)); } -andExprs = FastList.newInstance(); +andExprs = []; if (parameters.projectId) { andExprs.add(EntityCondition.makeCondition("projectId", EntityOperator.EQUALS, parameters.projectId)); } else { Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy Fri Apr 10 20:22:54 2015 @@ -19,7 +19,6 @@ import java.util.*; import java.lang.*; -import javolution.util.FastList; import org.apache.tools.ant.taskdefs.Parallel.TaskList; import org.ofbiz.base.util.*; import org.ofbiz.entity.*; @@ -63,10 +62,10 @@ taskUnplanList.each { taskUnplanMap -> taskListDropdown.add(unplanMap); } -exprBldr = FastList.newInstance(); +exprBldr = []; exprBldr.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_PROD_BACKLOG")); exprBldr.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_SCRUM_MEETINGS")); -andExprs = FastList.newInstance(); +andExprs = []; andExprs.add(EntityCondition.makeCondition("taskCurrentStatusId", EntityOperator.EQUALS, "STS_CREATED")); andExprs.add(EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId)); andExprs.add(EntityCondition.makeCondition(exprBldr, EntityOperator.OR)); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign Fri Apr 10 20:22:54 2015 @@ -22,7 +22,7 @@ under the License. <property name="units">in</property> <method name="initialize"><![CDATA[importPackage(Packages.java.math); importPackage(Packages.java.text); -importPackage(Packages.javolution.util); + importPackage(Packages.org.ofbiz.base.util); importPackage(Packages.org.ofbiz.entity.condition); module = "BacklogChart.rptdesign"; @@ -96,9 +96,9 @@ openData = 0; beingData = 0; finishData = 0; -inputOpenData = FastMap.newInstance(); -inputBeingData = FastMap.newInstance(); -inputFinishedData = FastMap.newInstance(); +inputOpenData = new HashMap(); +inputBeingData = new HashMap(); +inputFinishedData = new HashMap(); try{ Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign Fri Apr 10 20:22:54 2015 @@ -22,7 +22,7 @@ under the License. <property name="units">in</property> <method name="initialize"><![CDATA[importPackage(Packages.java.math); importPackage(Packages.java.text); -importPackage(Packages.javolution.util); + importPackage(Packages.org.ofbiz.base.util); importPackage(Packages.org.ofbiz.entity.condition); module = "BacklogByTypeChart.rptdesign"; Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign Fri Apr 10 20:22:54 2015 @@ -22,7 +22,7 @@ under the License. <property name="units">in</property> <method name="initialize"><![CDATA[importPackage(Packages.java.math); importPackage(Packages.java.text); -importPackage(Packages.javolution.util); + importPackage(Packages.org.ofbiz.base.util); importPackage(Packages.org.ofbiz.entity.condition); module = "BacklogChart.rptdesign"; @@ -96,9 +96,9 @@ openData = 0; beingData = 0; finishData = 0; -inputOpenData = FastMap.newInstance(); -inputBeingData = FastMap.newInstance(); -inputFinishedData = FastMap.newInstance(); +inputOpenData = new HashMap(); +inputBeingData = new HashMap(); +inputFinishedData = new HashMap(); try{ Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign Fri Apr 10 20:22:54 2015 @@ -23,7 +23,7 @@ under the License. <method name="initialize"><![CDATA[importPackage(Packages.java.math); importPackage(Packages.java.text); importPackage(Packages.java.sql); -importPackage(Packages.javolution.util); + importPackage(Packages.org.ofbiz.base.util); importPackage(Packages.org.ofbiz.entity.condition); @@ -45,7 +45,7 @@ var countHoliday = 0; while (countHoliday < dayNumber) { var conditionTimestampFrom = new Timestamp(actualStartDate.getTime() + (countHoliday*1000*60*60*24)); // get public holiday - var holidayConds = FastList.newInstance(); + var holidayConds = new LinkedkList(); holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS, "PUBLIC_HOLIDAY")); holidayConds.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.EQUALS, conditionTimestampFrom)); var fieldsToSelect = UtilMisc.toSet("workEffortId","estimatedStartDate"); @@ -61,7 +61,7 @@ while (countHoliday < dayNumber) { countHoliday ++; } // get plan hours -input = FastMap.newInstance(); +input = new HashMap(); input.put("userLogin",userLogin); input.put("sprintId",sprintId); result = dispatcher.runSync("getScrumPlanHour", input); @@ -234,7 +234,7 @@ remainActualHours = BigDecimal.ZERO; averageHours = previousAverageHours; -holidays = FastList.newInstance(); +holidays = new LinkedkList(); reportContext.getAppContext().put("holidays", holidays); ]]></method> <method name="fetch"><![CDATA[if (dayCount >= dayNumber || currentDay >= 0) return false; @@ -251,7 +251,7 @@ if (nowTimestamp.getTime() >= conditionT } // get public holiday -var holidayConds = FastList.newInstance(); +var holidayConds = new LinkedkList(); holidayConds.add(EntityCondition.makeCondition("workEffortTypeId",EntityOperator.EQUALS, "PUBLIC_HOLIDAY")); holidayConds.add(EntityCondition.makeCondition("estimatedStartDate", EntityOperator.EQUALS, conditionTimestampFrom)); var fieldsToSelect = UtilMisc.toSet("workEffortId","estimatedStartDate"); @@ -268,7 +268,7 @@ if (isHoliday) { holidays.add(sprintDay + ""); reportContext.getAppContext().put("holidays", holidays); } -input = FastMap.newInstance(); +input = new HashMap(); var plannedHours = BigDecimal.ZERO; var actualHours = BigDecimal.ZERO; @@ -279,7 +279,7 @@ for (i=0; i<backlogItems.size(); i++) { // get all task from backlog item var backlogItem = backlogItems.get(i); var custRequestId = backlogItem.get("custRequestId"); - var conds = FastList.newInstance(); + var conds = new LinkedkList(); conds.add(EntityCondition.makeCondition("custRequestId", custRequestId)); conds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.NOT_EQUAL, "SCRUM_SPRINT")); var tasks = delegator.findList("CustRequestAndWorkEffort", EntityCondition.makeCondition(conds), null, null, null, false); @@ -301,7 +301,7 @@ for (i=0; i<backlogItems.size(); i++) { } } // get all time entries from task - var timeEntryConds = FastList.newInstance(); + var timeEntryConds = new LinkedkList(); timeEntryConds.add(EntityCondition.makeCondition("workEffortId", workEffortId)); timeEntryConds.add(EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN_EQUAL_TO, conditionTimestampFrom)); timeEntryConds.add(EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, conditionTimestampTo)); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign Fri Apr 10 20:22:54 2015 @@ -23,7 +23,7 @@ under the License. <method name="initialize"><![CDATA[importPackage(Packages.java.math); importPackage(Packages.java.sql); importPackage(Packages.java.text); -importPackage(Packages.javolution.util); + importPackage(Packages.org.ofbiz.base.util); importPackage(Packages.org.ofbiz.entity.condition); module = "ProjectAndSprintChart.rptdesign"; @@ -124,13 +124,13 @@ productId = params["productId"].value; </list-property> </structure> <property name="dataSource">Data Source</property> - <method name="open"><![CDATA[resultList = FastList.newInstance(); + <method name="open"><![CDATA[resultList = new LinkedkList(); var projectList = null; try{ var projectList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId, "workEffortTypeId", "SCRUM_PROJECT"), null, false); if (projectList != null) { for (i = 0;i < projectList.size(); i++ ) { - var inputMap = FastMap.newInstance(); + var inputMap = new HashMap(); var projectId = projectList.get(i).getString("workEffortId"); inputMap.put("projectName",projectList.get(i).getString("workEffortName")); // time out sprint @@ -138,7 +138,7 @@ try{ var sqlDate = date.toString().substring(0,10); var thruDate = sqlDate + " " + "00:00:00.000"; //Debug.logInfo("-----------thruDate---------"+thruDate,module); - var timeOutConds = FastList.newInstance(); + var timeOutConds = new LinkedkList(); timeOutConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); timeOutConds.add(EntityCondition.makeCondition("sprintWorkEffortTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); timeOutConds.add(EntityCondition.makeCondition("sprintCurrentStatusId", EntityOperator.EQUALS, "SPRINT_ACTIVE")); @@ -153,7 +153,7 @@ try{ inputMap.put("timeOut",timeOutData); // active sprint - var activeConds = FastList.newInstance(); + var activeConds = new LinkedkList(); activeConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); activeConds.add(EntityCondition.makeCondition("sprintWorkEffortTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); activeConds.add(EntityCondition.makeCondition("sprintCurrentStatusId", EntityOperator.EQUALS, "SPRINT_ACTIVE")); @@ -167,7 +167,7 @@ try{ inputMap.put("active",activeData); // total sprint - var totalConds = FastList.newInstance(); + var totalConds = new LinkedkList(); totalConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); totalConds.add(EntityCondition.makeCondition("sprintWorkEffortTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); var totalList = delegator.findList("ProjectSprint", EntityCondition.makeCondition(totalConds), null, null, null, false); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign Fri Apr 10 20:22:54 2015 @@ -22,7 +22,7 @@ under the License. <property name="units">in</property> <method name="initialize"><![CDATA[importPackage(Packages.java.math); importPackage(Packages.java.text); -importPackage(Packages.javolution.util); + importPackage(Packages.org.ofbiz.base.util); importPackage(Packages.org.ofbiz.entity.condition); module = "BacklogByTypeChart.rptdesign"; Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign Fri Apr 10 20:22:54 2015 @@ -22,7 +22,7 @@ under the License. <property name="units">in</property> <method name="initialize"><![CDATA[importPackage(Packages.java.math); importPackage(Packages.java.text); -importPackage(Packages.javolution.util); + importPackage(Packages.org.ofbiz.base.util); importPackage(Packages.org.ofbiz.entity.condition); module = "TaskByStatusChart.rptdesign"; @@ -143,7 +143,7 @@ testCompleted = 0; try{ var workEffortErrorList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId,"workEffortTypeId","SCRUM_PROJECT"), null, false); // for implementation task - var unplannedImpleConds = FastList.newInstance(); + var unplannedImpleConds = new LinkedkList(); unplannedImpleConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedImpleConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedImpleConds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_IMPL")); @@ -151,7 +151,7 @@ try{ if (workEffortErrorList !=null) { for(j = 0; j < workEffortErrorList.size(); j++){ var projectId = workEffortErrorList.get(j).getString("workEffortId"); - var plannedImpleConds = FastList.newInstance(); + var plannedImpleConds = new LinkedkList(); plannedImpleConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedImpleConds.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedImpleConds.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_IMPL")); @@ -171,7 +171,7 @@ try{ implementationData = 0; } - var unplannedImpleConds2 = FastList.newInstance(); + var unplannedImpleConds2 = new LinkedkList(); unplannedImpleConds2.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedImpleConds2.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedImpleConds2.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_IMPL")); @@ -180,7 +180,7 @@ try{ if (workEffortErrorList !=null) { for(j = 0; j < workEffortErrorList.size(); j++){ var projectId = workEffortErrorList.get(j).getString("workEffortId"); - var plannedImpleConds2 = FastList.newInstance(); + var plannedImpleConds2 = new LinkedkList(); plannedImpleConds2.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedImpleConds2.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedImpleConds2.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_IMPL")); @@ -202,7 +202,7 @@ try{ } // for error task - var unplannedErrorConds = FastList.newInstance(); + var unplannedErrorConds = new LinkedkList(); unplannedErrorConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedErrorConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedErrorConds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_ERROR")); @@ -210,7 +210,7 @@ try{ if (workEffortErrorList !=null) { for(i = 0; i < workEffortErrorList.size(); i++){ var projectId = workEffortErrorList.get(i).getString("workEffortId"); - var plannedErrorConds = FastList.newInstance(); + var plannedErrorConds = new LinkedkList(); plannedErrorConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedErrorConds.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedErrorConds.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_ERROR")); @@ -228,7 +228,7 @@ try{ } else { errorData = 0; } - var unplannedErrorConds2 = FastList.newInstance(); + var unplannedErrorConds2 = new LinkedkList(); unplannedErrorConds2.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedErrorConds2.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedErrorConds2.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_ERROR")); @@ -237,7 +237,7 @@ try{ if (workEffortErrorList !=null) { for(i = 0; i < workEffortErrorList.size(); i++){ var projectId = workEffortErrorList.get(i).getString("workEffortId"); - var plannedErrorConds2 = FastList.newInstance(); + var plannedErrorConds2 = new LinkedkList(); plannedErrorConds2.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedErrorConds2.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedErrorConds2.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_ERROR")); @@ -258,7 +258,7 @@ try{ } // for installation task - var unplannedInstallConds = FastList.newInstance(); + var unplannedInstallConds = new LinkedkList(); unplannedInstallConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedInstallConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedInstallConds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_INST")); @@ -266,7 +266,7 @@ try{ if (workEffortErrorList !=null) { for(i = 0; i < workEffortErrorList.size(); i++){ var projectId = workEffortErrorList.get(i).getString("workEffortId"); - var plannedInstallConds = FastList.newInstance(); + var plannedInstallConds = new LinkedkList(); plannedInstallConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedInstallConds.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedInstallConds.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_INST")); @@ -284,7 +284,7 @@ try{ } else { installData = 0; } - var unplannedInstallConds2 = FastList.newInstance(); + var unplannedInstallConds2 = new LinkedkList(); unplannedInstallConds2.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedInstallConds2.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedInstallConds2.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_INST")); @@ -293,7 +293,7 @@ try{ if (workEffortErrorList !=null) { for(i = 0; i < workEffortErrorList.size(); i++){ var projectId = workEffortErrorList.get(i).getString("workEffortId"); - var plannedInstallConds2 = FastList.newInstance(); + var plannedInstallConds2 = new LinkedkList(); plannedInstallConds2.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedInstallConds2.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedInstallConds2.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_INST")); @@ -314,7 +314,7 @@ try{ } // for test task - var unplannedTestConds = FastList.newInstance(); + var unplannedTestConds = new LinkedkList(); unplannedTestConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedTestConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedTestConds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_TEST")); @@ -322,7 +322,7 @@ try{ if (workEffortErrorList !=null) { for(j = 0; j < workEffortErrorList.size(); j++){ var projectId = workEffortErrorList.get(j).getString("workEffortId"); - var plannedTestConds = FastList.newInstance(); + var plannedTestConds = new LinkedkList(); plannedTestConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedTestConds.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedTestConds.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_TEST")); @@ -340,7 +340,7 @@ try{ } else { testData = 0; } - var unplannedTestConds2 = FastList.newInstance(); + var unplannedTestConds2 = new LinkedkList(); unplannedTestConds2.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedTestConds2.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedTestConds2.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_TEST")); @@ -349,7 +349,7 @@ try{ if (workEffortErrorList !=null) { for(j = 0; j < workEffortErrorList.size(); j++){ var projectId = workEffortErrorList.get(j).getString("workEffortId"); - var plannedTestConds2 = FastList.newInstance(); + var plannedTestConds2 = new LinkedkList(); plannedTestConds2.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedTestConds2.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedTestConds2.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_TEST")); Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign Fri Apr 10 20:22:54 2015 @@ -22,7 +22,7 @@ under the License. <property name="units">in</property> <method name="initialize"><![CDATA[importPackage(Packages.java.math); importPackage(Packages.java.text); -importPackage(Packages.javolution.util); + importPackage(Packages.org.ofbiz.base.util); importPackage(Packages.org.ofbiz.entity.condition); module = "TasksChart.rptdesign"; @@ -104,7 +104,7 @@ testData = 0; try{ var workEffortErrorList = delegator.findByAnd("WorkEffortAndProduct", UtilMisc.toMap("productId", productId,"workEffortTypeId","SCRUM_PROJECT"), null, false); // for implementation task - var unplannedImpleConds = FastList.newInstance(); + var unplannedImpleConds = new LinkedkList(); unplannedImpleConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedImpleConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedImpleConds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_IMPL")); @@ -112,7 +112,7 @@ try{ if (workEffortErrorList !=null) { for(j = 0; j < workEffortErrorList.size(); j++){ var projectId = workEffortErrorList.get(j).getString("workEffortId"); - var plannedImpleConds = FastList.newInstance(); + var plannedImpleConds = new LinkedkList(); plannedImpleConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedImpleConds.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedImpleConds.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_IMPL")); @@ -133,7 +133,7 @@ try{ } // for error task - var unplannedErrorConds = FastList.newInstance(); + var unplannedErrorConds = new LinkedkList(); unplannedErrorConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedErrorConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedErrorConds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_ERROR")); @@ -141,7 +141,7 @@ try{ if (workEffortErrorList !=null) { for(i = 0; i < workEffortErrorList.size(); i++){ var projectId = workEffortErrorList.get(i).getString("workEffortId"); - var plannedErrorConds = FastList.newInstance(); + var plannedErrorConds = new LinkedkList(); plannedErrorConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedErrorConds.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedErrorConds.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_ERROR")); @@ -163,7 +163,7 @@ try{ } // for installation task - var unplannedInstallConds = FastList.newInstance(); + var unplannedInstallConds = new LinkedkList(); unplannedInstallConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedInstallConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedInstallConds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_INST")); @@ -171,7 +171,7 @@ try{ if (workEffortErrorList !=null) { for(i = 0; i < workEffortErrorList.size(); i++){ var projectId = workEffortErrorList.get(i).getString("workEffortId"); - var plannedInstallConds = FastList.newInstance(); + var plannedInstallConds = new LinkedkList(); plannedInstallConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedInstallConds.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedInstallConds.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_INST")); @@ -191,7 +191,7 @@ try{ } // for test task - var unplannedTestConds = FastList.newInstance(); + var unplannedTestConds = new LinkedkList(); unplannedTestConds.add(EntityCondition.makeCondition("productId",EntityOperator.EQUALS, productId)); unplannedTestConds.add(EntityCondition.makeCondition("custRequestTypeId", EntityOperator.EQUALS, "RF_UNPLAN_BACKLOG")); unplannedTestConds.add(EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "SCRUM_TASK_TEST")); @@ -199,7 +199,7 @@ try{ if (workEffortErrorList !=null) { for(j = 0; j < workEffortErrorList.size(); j++){ var projectId = workEffortErrorList.get(j).getString("workEffortId"); - var plannedTestConds = FastList.newInstance(); + var plannedTestConds = new LinkedkList(); plannedTestConds.add(EntityCondition.makeCondition("projectId",EntityOperator.EQUALS, projectId)); plannedTestConds.add(EntityCondition.makeCondition("sprintTypeId", EntityOperator.EQUALS, "SCRUM_SPRINT")); plannedTestConds.add(EntityCondition.makeCondition("taskTypeId", EntityOperator.EQUALS, "SCRUM_TASK_TEST")); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |