You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/04/10 22:22:59 UTC
svn commit: r1672752 [14/18] - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/agreement/
applications/accounting/src/org/ofbiz/accounting/finaccount/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/s...
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy Fri Apr 10 20:22:54 2015
@@ -44,18 +44,14 @@ import org.ofbiz.base.util.Debug;
import java.sql.Timestamp;
import java.sql.Date;
import java.sql.Time;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-import javolution.util.FastSet;
-
entityName = parameters.entityName;
ModelReader reader = delegator.getModelReader();
ModelEntity modelEntity = reader.getModelEntity(entityName);
-groupByFields = FastList.newInstance();
-functionFields = FastList.newInstance();
+groupByFields = [];
+functionFields = [];
if (modelEntity instanceof ModelViewEntity) {
aliases = modelEntity.getAliasesCopy()
@@ -89,7 +85,7 @@ if (find == null) {
String curFindString = "entityName=" + entityName + "&find=" + find;
GenericEntity findByEntity = delegator.makeValue(entityName);
-List errMsgList = FastList.newInstance();
+List errMsgList = [];
Iterator fieldIterator = modelEntity.getFieldsIterator();
while (fieldIterator.hasNext()) {
ModelField field = fieldIterator.next();
@@ -143,7 +139,7 @@ if ("true".equals(find)) {
//EntityCondition condition = EntityCondition.makeCondition(findByEntity, EntityOperator.AND);
// small variation to support LIKE if a wildcard (%) is found in a String
- conditionList = FastList.newInstance();
+ conditionList = [];
findByKeySet = findByEntity.keySet();
fbksIter = findByKeySet.iterator();
while (fbksIter.hasNext()) {
@@ -168,7 +164,7 @@ if ("true".equals(find)) {
fieldsToSelect = null;
if (groupByFields || functionFields) {
- fieldsToSelect = FastSet.newInstance();
+ fieldsToSelect = [];
for (String groupByField : groupByFields) {
fieldsToSelect.add(groupByField);
@@ -178,7 +174,7 @@ if ("true".equals(find)) {
fieldsToSelect.add(functionField)
}
}
- Collection pkNames = FastList.newInstance();
+ Collection pkNames = [];
Iterator iter = modelEntity.getPksIterator();
while (iter != null && iter.hasNext()) {
ModelField curField = (ModelField) iter.next();
@@ -216,13 +212,13 @@ context.resultPartialList = resultPartia
viewIndexLast = UtilMisc.getViewLastIndex(arraySize, viewSize);
context.viewIndexLast = viewIndexLast;
-List fieldList = FastList.newInstance();
+List fieldList = [];
fieldIterator = modelEntity.getFieldsIterator();
while (fieldIterator.hasNext()) {
ModelField field = fieldIterator.next();
ModelFieldType type = delegator.getEntityFieldType(modelEntity, field.getType());
- Map fieldMap = FastMap.newInstance();
+ Map fieldMap = [:];
fieldMap.put("name", field.getName());
fieldMap.put("isPk", (field.getIsPk() == true) ? "Y" : "N");
fieldMap.put("javaType", type.getJavaType());
@@ -234,11 +230,11 @@ while (fieldIterator.hasNext()) {
context.fieldList = fieldList;
context.columnCount = fieldList.size()+2;
-List records = FastList.newInstance();
+List records = [];
if (resultPartialList != null) {
Iterator resultPartialIter = resultPartialList.iterator();
while (resultPartialIter.hasNext()) {
- Map record = FastMap.newInstance();
+ Map record = [:];
GenericValue value = (GenericValue)resultPartialIter.next();
String findString = "entityName=" + entityName;
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy Fri Apr 10 20:22:54 2015
@@ -32,8 +32,6 @@ import org.ofbiz.base.util.UtilValidate;
import java.sql.Timestamp;
import java.sql.Date;
import java.sql.Time;
-import javolution.util.FastList;
-import javolution.util.FastMap;
String entityName = parameters.get("entityName");
context.put("entityName", entityName);
@@ -92,10 +90,10 @@ if (value == null) {
}
if (value != null) {
- List fieldList = FastList.newInstance();
+ List fieldList = [];
Iterator fieldIterator = entity.getFieldsIterator();
while (fieldIterator.hasNext()) {
- Map mapField = FastMap.newInstance();
+ Map mapField = [:];
ModelField field = fieldIterator.next();
ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());
@@ -146,10 +144,10 @@ if ((session.getAttribute("_ERROR_MESSAG
}
context.put("useValue", useValue);
-List newFieldPkList = FastList.newInstance();
+List newFieldPkList = [];
pkIterator = entity.getPksIterator();
while (pkIterator.hasNext()) {
- Map mapField = FastMap.newInstance();
+ Map mapField = [:];
ModelField field = pkIterator.next();
ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());
@@ -223,10 +221,10 @@ while (pkIterator.hasNext()) {
}
context.put("newFieldPkList", newFieldPkList);
-List newFieldNoPkList = FastList.newInstance();
+List newFieldNoPkList = [];
Iterator noPkIterator = entity.getNopksIterator();
while (noPkIterator.hasNext()) {
- Map mapField = FastMap.newInstance();
+ Map mapField = [:];
ModelField field = noPkIterator.next();
ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());
@@ -303,9 +301,9 @@ while (noPkIterator.hasNext()) {
}
context.put("newFieldNoPkList", newFieldNoPkList);
-List relationFieldList = FastList.newInstance();
+List relationFieldList = [];
for (int relIndex = 0; relIndex < entity.getRelationsSize(); relIndex++) {
- Map mapRelation = FastMap.newInstance();
+ Map mapRelation = [:];
ModelRelation relation = entity.getRelation(relIndex);
ModelEntity relatedEntity = reader.getModelEntity(relation.getRelEntityName());
@@ -331,10 +329,10 @@ for (int relIndex = 0; relIndex < entity
valueRelated = (GenericValue) tempIter.next();
}
- List relatedFieldsList = FastList.newInstance();
+ List relatedFieldsList = [];
Iterator relFieldIterator = relatedEntity.getFieldsIterator();
while (relFieldIterator.hasNext()) {
- Map mapRelatedFields = FastMap.newInstance();
+ Map mapRelatedFields = [:];
ModelField field = relFieldIterator.next();
ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/ServiceResult.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/ServiceResult.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/ServiceResult.groovy (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/ServiceResult.groovy Fri Apr 10 20:22:54 2015
@@ -29,11 +29,8 @@ import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.Debug;
import org.ofbiz.webapp.event.CoreEvents;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
if (session.getAttribute("_RUN_SYNC_RESULT_")) {
- serviceResultList = FastList.newInstance();
+ serviceResultList = [];
serviceResult = session.getAttribute("_RUN_SYNC_RESULT_");
if (parameters.servicePath) {
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy Fri Apr 10 20:22:54 2015
@@ -22,8 +22,6 @@ import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.security.Security;
import org.ofbiz.webapp.stats.*;
-import javolution.util.FastList;
-import javolution.util.FastMap;
clearBins = parameters.clear;
if ("true".equals(clearBins)) {
@@ -34,9 +32,9 @@ if ("true".equals(clearBins)) {
// Requests
iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.requestSinceStarted.keySet()));
-requestList = FastList.newInstance();
+requestList = [];
while (iterator.hasNext()) {
- requestIdMap = FastMap.newInstance();
+ requestIdMap = [:];
statsId = iterator.next();
bin = ServerHitBin.requestSinceStarted.get(statsId);
if (bin) {
@@ -57,9 +55,9 @@ context.requestList = requestList;
// Events
iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.eventSinceStarted.keySet()));
-eventList = FastList.newInstance();
+eventList = [];
while (iterator.hasNext()) {
- requestIdMap = FastMap.newInstance();
+ requestIdMap = [:];
statsId = iterator.next();
bin = ServerHitBin.eventSinceStarted.get(statsId);
if (bin) {
@@ -81,9 +79,9 @@ context.eventList = eventList;
// Views
iterator = UtilMisc.toIterator(new TreeSet(ServerHitBin.viewSinceStarted.keySet()));
-viewList = FastList.newInstance();
+viewList = [];
while (iterator.hasNext()) {
- requestIdMap = FastMap.newInstance();
+ requestIdMap = [:];
statsId = iterator.next();
bin = ServerHitBin.viewSinceStarted.get(statsId);
if (bin) {
Modified: ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java Fri Apr 10 20:22:54 2015
@@ -18,13 +18,12 @@ under the License.
**/
package org.ofbiz.assetmaint;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
@@ -96,7 +95,7 @@ public class FixedAssetMaintServices {
} else {
issueQuantity = new Double(requestedQty);
}
- Map<String, Object> itemIssuanceCtx = FastMap.newInstance();
+ Map<String, Object> itemIssuanceCtx = new HashMap<String, Object>();
itemIssuanceCtx.put("userLogin", userLogin);
itemIssuanceCtx.put("inventoryItemId", inventoryItemId);
itemIssuanceCtx.put("fixedAssetId", fixedAssetId);
Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy (original)
+++ ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy Fri Apr 10 20:22:54 2015
@@ -29,12 +29,9 @@ import org.ofbiz.entity.model.ModelField
import org.ofbiz.entity.model.ModelViewEntity;
import org.ofbiz.entity.model.ModelViewEntity.ModelAlias;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
starSchemaName = parameters.starSchemaName;
-starSchemaFields = FastList.newInstance();
+starSchemaFields = [];
if (starSchemaName) {
reader = delegator.getModelReader();
starSchema = reader.getModelEntity(starSchemaName);
@@ -42,7 +39,7 @@ if (starSchemaName) {
fieldsIt = starSchema.getAliasesIterator();
while (fieldsIt.hasNext()) {
field = fieldsIt.next();
- fieldMap = FastMap.newInstance();
+ fieldMap = [:];
fieldMap.name = field.getName();
description = field.getDescription();
if (!description) {
Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy (original)
+++ ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy Fri Apr 10 20:22:54 2015
@@ -26,15 +26,12 @@ import org.ofbiz.entity.model.ModelReade
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.model.ModelViewEntity;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
reader = delegator.getModelReader();
ec = reader.getEntityNames();
entities = new TreeSet(ec);
entitiesIt = entities.iterator();
-List starSchemas = FastList.newInstance();
+List starSchemas = [];
while (entitiesIt.hasNext()) {
entity = reader.getModelEntity(entitiesIt.next());
@@ -43,7 +40,7 @@ while (entitiesIt.hasNext()) {
continue;
}
- entityMap = FastMap.newInstance();
+ entityMap = [:];
entityMap.name = entity.getEntityName();
entityMap.title = entity.getTitle();
Modified: ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/RunStarSchemaQuery.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/RunStarSchemaQuery.groovy?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/RunStarSchemaQuery.groovy (original)
+++ ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/RunStarSchemaQuery.groovy Fri Apr 10 20:22:54 2015
@@ -29,19 +29,15 @@ import org.ofbiz.entity.model.ModelField
import org.ofbiz.entity.model.ModelViewEntity;
import org.ofbiz.entity.model.ModelViewEntity.ModelAlias;
-import javolution.util.FastSet;
-import javolution.util.FastList;
-import javolution.util.FastMap;
-
starSchemaName = parameters.starSchemaName;
selectedFieldList = UtilHttp.parseMultiFormData(parameters);
-columnNames = FastSet.newInstance();
+columnNames = [];
selectedFieldList.each { selectedField ->
columnNames.add(selectedField.selectedFieldName);
}
context.columnNames = columnNames;
-List records = FastList.newInstance();
+List records = [];
records = select(context.columnNames).from(starSchemaName).distinct(false).queryList();
context.records = records;
Modified: ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java (original)
+++ ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java Fri Apr 10 20:22:54 2015
@@ -24,15 +24,13 @@ import java.io.InputStream;
import java.io.StringWriter;
import java.sql.SQLException;
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.apache.fop.apps.FOPException;
import org.eclipse.birt.report.engine.api.EngineException;
import org.eclipse.birt.report.engine.api.IReportEngine;
@@ -143,7 +141,7 @@ public class BirtEmailServices {
// create the output stream for the generation
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- Map<String, Object> birtContext = FastMap.newInstance();
+ Map<String, Object> birtContext = new HashMap<String, Object>();
if (birtLocale == null) {
birtLocale = locale;
}
@@ -171,7 +169,7 @@ public class BirtEmailServices {
baos.close();
// store in the list of maps for sendmail....
- List<Map<String, ? extends Object>> bodyParts = FastList.newInstance();
+ List<Map<String, ? extends Object>> bodyParts = new LinkedList<Map<String,? extends Object>>();
if (bodyText != null) {
bodyText = FlexibleStringExpander.expandString(bodyText, screenContext, locale);
bodyParts.add(UtilMisc.toMap("content", bodyText, "type", "text/html"));
Modified: ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java (original)
+++ ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java Fri Apr 10 20:22:54 2015
@@ -21,6 +21,7 @@ package org.ofbiz.birt.webapp.view;
import java.io.IOException;
import java.io.InputStream;
import java.sql.SQLException;
+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.xml.parsers.ParserConfigurationException;
-import javolution.util.FastMap;
-
import org.eclipse.birt.core.exception.BirtException;
import org.eclipse.birt.report.engine.api.IReportEngine;
import org.eclipse.birt.report.engine.api.IReportRunnable;
@@ -86,7 +85,7 @@ public class BirtViewHandler implements
Map<String, Object> appContext = UtilGenerics.cast(engine.getConfig().getAppContext());
BirtWorker.setWebContextObjects(appContext, request, response);
- Map<String, Object> context = FastMap.newInstance();
+ Map<String, Object> context = new HashMap<String, Object>();
// set parameters from request
Map<String, Object> parameters = UtilGenerics.cast(request.getAttribute(BirtWorker.BIRT_PARAMETERS));
if (parameters != null) {
Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign Fri Apr 10 20:22:54 2015
@@ -20,8 +20,7 @@ under the License.
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property>
<property name="units">in</property>
- <method name="initialize"><![CDATA[importPackage(Packages.javolution.util)
-importPackage(Packages.org.ofbiz.base.util)
+ <method name="initialize"><![CDATA[importPackage(Packages.org.ofbiz.base.util)
importPackage(Packages.org.ofbiz.base.util.collections)
importPackage(Packages.org.ofbiz.entity.util)
importPackage(Packages.org.ofbiz.entity.condition)
@@ -42,7 +41,7 @@ if (!logoImageUrl) {
dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
// prepare uiLabelMap
-uiLabelMap = FastMap.newInstance();
+uiLabelMap = new HashMap();
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("CommonUiLabels", reportContext.getLocale()));
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("AccountingUiLabels", reportContext.getLocale()));
@@ -525,7 +524,7 @@ var thruDate = params["thruDate"].value;
acctgTransAndEntries = null;
try {
- var conds = FastList.newInstance();
+ var conds = new LinkedkList();
if (glAccountId) conds.add(EntityCondition.makeCondition("glAccountId", EntityOperator.EQUALS, glAccountId));
if (acctgTransTypeId) conds.add(EntityCondition.makeCondition("acctgTransTypeId", EntityOperator.EQUALS, acctgTransTypeId));
if (glFiscalTypeId) conds.add(EntityCondition.makeCondition("glFiscalTypeId", EntityOperator.EQUALS, glFiscalTypeId));
@@ -831,8 +830,8 @@ return true;]]></method>
countOfRow = 0;]]></method>
<method name="fetch"><![CDATA[if (countOfRow >= totalRows) return false;
-var context = FastMap.newInstance();
-var parameters = FastMap.newInstance();
+var context = new HashMap();
+var parameters = new HashMap();
context.put("partyId", organizationPartyId);
context.put("nowTimestamp", UtilDateTime.nowTimestamp());
context.put("locale", reportContext.getLocale());
Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign Fri Apr 10 20:22:54 2015
@@ -20,7 +20,7 @@ under the License.
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property>
<property name="units">in</property>
- <method name="initialize"><![CDATA[importPackage(Packages.javolution.util)
+ <method name="initialize"><![CDATA[
importPackage(Packages.org.ofbiz.base.util)
importPackage(Packages.org.ofbiz.entity.util)
@@ -28,7 +28,7 @@ module = "BalanceSheet.rptdesign";
dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
// prepare uiLabelMap
-uiLabelMap = FastMap.newInstance();
+uiLabelMap = new HashMap();
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("CommonUiLabels", reportContext.getLocale()));
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("AccountingUiLabels", reportContext.getLocale()));
@@ -67,7 +67,7 @@ if (!params["glFiscalTypeId"].value) {
}
// call BalanceSheet.groovy script
-context = FastMap.newInstance();
+context = new HashMap();
context.put("organizationPartyId", organizationPartyId);
context.put("fromDate", fromDate);
context.put("thruDate", thruDate);
Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign Fri Apr 10 20:22:54 2015
@@ -20,7 +20,7 @@ under the License.
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property>
<property name="units">in</property>
- <method name="initialize"><![CDATA[importPackage(Packages.javolution.util)
+ <method name="initialize"><![CDATA[
importPackage(Packages.org.ofbiz.base.util)
importPackage(Packages.org.ofbiz.entity.util)
@@ -28,7 +28,7 @@ module = "IncomeStatement.rptdesign";
dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
// prepare uiLabelMap
-uiLabelMap = FastMap.newInstance();
+uiLabelMap = new HashMap();
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("CommonUiLabels", reportContext.getLocale()));
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("AccountingUiLabels", reportContext.getLocale()));
@@ -67,7 +67,7 @@ if (!params["glFiscalTypeId"].value) {
}
// call IncomeStatement.groovy script
-context = FastMap.newInstance();
+context = new HashMap();
context.put("organizationPartyId", organizationPartyId);
context.put("fromDate", fromDate);
context.put("thruDate", thruDate);
Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign Fri Apr 10 20:22:54 2015
@@ -20,7 +20,7 @@ under the License.
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property>
<property name="units">in</property>
- <method name="initialize"><![CDATA[importPackage(Packages.javolution.util)
+ <method name="initialize"><![CDATA[
importPackage(Packages.org.ofbiz.base.util)
importPackage(Packages.org.ofbiz.entity.util)
importPackage(Packages.org.ofbiz.entity.condition)
@@ -28,14 +28,14 @@ importPackage(Packages.org.ofbiz.entity.
module = "InvoiceAcctgTransEntry.rptdesign";
// prepare uiLabelMap
-uiLabelMap = FastMap.newInstance();
+uiLabelMap = new HashMap();
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("CommonUiLabels", reportContext.getLocale()));
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("AccountingUiLabels", reportContext.getLocale()));
invoiceId = params["invoiceId"].value;
userLoginId = params["userLoginId"].value;
-parameters = FastMap.newInstance();
+parameters = new HashMap();
parameters.put("invoiceId", invoiceId);
parameters.put("userLoginId", userLoginId);
@@ -53,7 +53,7 @@ if ("PURCHASE_INVOICE".equals(invoice.ge
}
// get company header
-var companyLogoCtx = FastMap.newInstance();
+var companyLogoCtx = new HashMap();
companyLogoCtx.put("invoice", invoice);
companyLogoCtx.put("nowTimestamp", UtilDateTime.nowTimestamp());
companyLogoCtx.put("locale", reportContext.getLocale());
@@ -66,7 +66,7 @@ if (!logoImageUrl) {
}
// create application list
-var context = FastMap.newInstance();
+var context = new HashMap();
context.put("invoice", invoice);
GroovyUtil.runScriptAtLocation("component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy", context);
invoiceApplications = context.get("invoiceApplications");
@@ -364,13 +364,13 @@ creditTotal = 0;]]></method>
</list-property>
</structure>
<property name="dataSource">OFBiz</property>
- <method name="open"><![CDATA[acctgTransAndEntries = FastList.newInstance();
+ <method name="open"><![CDATA[acctgTransAndEntries = new LinkedkList();
// get acctg trans entry of invoice
-invoiceAcctgTransAndEntries = FastList.newInstance();
+invoiceAcctgTransAndEntries = new LinkedkList();
var orderBy = UtilMisc.toList("acctgTransId", "acctgTransEntrySeqId");
try {
- var conds = FastList.newInstance();
+ var conds = new LinkedkList();
conds.add(EntityCondition.makeCondition("invoiceId", EntityOperator.EQUALS, invoiceId));
conds.add(EntityCondition.makeCondition("paymentId", EntityOperator.EQUALS, null));
invoiceAcctgTransAndEntries = delegator.findList("AcctgTransAndEntries", EntityCondition.makeCondition(conds), null, orderBy, null, false);
Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign Fri Apr 10 20:22:54 2015
@@ -20,7 +20,7 @@ under the License.
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property>
<property name="units">in</property>
- <method name="initialize"><![CDATA[importPackage(Packages.javolution.util)
+ <method name="initialize"><![CDATA[
importPackage(Packages.org.ofbiz.base.util)
importPackage(Packages.org.ofbiz.entity.util)
importPackage(Packages.org.ofbiz.entity.condition)
@@ -28,7 +28,7 @@ importPackage(Packages.org.ofbiz.entity.
module = "PaymentAcctgTransEntry.rptdesign";
// prepare uiLabelMap
-uiLabelMap = FastMap.newInstance();
+uiLabelMap = new HashMap();
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("CommonUiLabels", reportContext.getLocale()));
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("AccountingUiLabels", reportContext.getLocale()));
@@ -349,7 +349,7 @@ creditTotal = 0;]]></method>
</structure>
<property name="dataSource">OFBiz</property>
<method name="open"><![CDATA[// get acctg trans entries of payment
-acctgTransAndEntries = FastList.newInstance();
+acctgTransAndEntries = new LinkedkList();
var orderBy = UtilMisc.toList("acctgTransId", "acctgTransEntrySeqId");
try {
acctgTransAndEntries = delegator.findList("AcctgTransAndEntries", EntityCondition.makeCondition("paymentId", EntityOperator.EQUALS, paymentId), null, orderBy, null, false);
Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentReport.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentReport.rptdesign Fri Apr 10 20:22:54 2015
@@ -36,7 +36,7 @@ under the License.
<property name="Payment.Payments.y">80</property>
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.org.ofbiz.base.util)
-importPackage(Packages.javolution.util)
+
importPackage(Packages.org.ofbiz.entity.util)
module = "PaymentReport.rptdesign";]]></method>
<property name="iconFile">/templates/blank_report.gif</property>
@@ -331,8 +331,8 @@ try {
} catch(e) {
Debug.logError(e,"");
}
-input = FastMap.newInstance();
-inputFields = FastMap.newInstance();
+input = new HashMap();
+inputFields = new HashMap();
if(params!=null){
inputFields.put("partyIdTo", params["partyIdTo"]);
inputFields.put("paymentId", params["paymentId"]);
Modified: ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign Fri Apr 10 20:22:54 2015
@@ -20,7 +20,7 @@ under the License.
<report xmlns="http://www.eclipse.org/birt/2005/design" version="3.2.21" id="1">
<property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build <2.6.0.v20100609-1613></property>
<property name="units">in</property>
- <method name="initialize"><![CDATA[importPackage(Packages.javolution.util)
+ <method name="initialize"><![CDATA[
importPackage(Packages.org.ofbiz.base.util)
importPackage(Packages.org.ofbiz.entity.condition)
importPackage(Packages.org.ofbiz.entity.util)
@@ -28,7 +28,7 @@ importPackage(Packages.org.ofbiz.entity.
module = "TrialBalance.rptdesign";
// prepare uiLabelMap
-uiLabelMap = FastMap.newInstance();
+uiLabelMap = new HashMap();
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("CommonUiLabels", reportContext.getLocale()));
uiLabelMap.putAll(UtilProperties.getResourceBundleMap("AccountingUiLabels", reportContext.getLocale()));
@@ -50,7 +50,7 @@ if (!logoImageUrl) {
// prepare parties list
partyIds = org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator, organizationPartyId, "GROUP_ROLLUP");
-parties = FastList.newInstance();
+parties = new LinkedkList();
try {
var
parties = delegator.findList("Party", EntityCondition.makeCondition("partyId", EntityOperator.IN, partyIds), null, null, null, false);
@@ -60,7 +60,7 @@ try {
partyIds.add(organizationPartyId);
// call TrialBalance.groovy script
-context = FastMap.newInstance();
+context = new HashMap();
context.put("parties", parties);
context.put("delegator", delegator);
context.put("dispatcher", dispatcher);
@@ -69,12 +69,12 @@ GroovyUtil.runScriptAtLocation("componen
partyNameList = context.partyNameList;
// get grand totoal posted
-var condList = FastList.newInstance();
+var condList = new LinkedkList();
condList.add(EntityCondition.makeCondition("organizationPartyId", EntityOperator.IN, partyIds));
condList.add(EntityCondition.makeCondition("customTimePeriodId", EntityOperator.EQUALS, customTimePeriodId));
var cond = EntityCondition.makeCondition(condList);
var fieldsToSelect = UtilMisc.toSet("totalPostedDebits", "totalPostedCredits");
-grandTotalPosted = FastList.newInstance();
+grandTotalPosted = new LinkedkList();
try {
grandTotalPosted = delegator.findList("GlAccountAndHistoryTotals", cond, fieldsToSelect, null, null, false);
} catch (e) {
@@ -214,13 +214,13 @@ grandTotalPostedRecord = grandTotalPoste
</structure>
<property name="dataSource">OFBiz</property>
<method name="open"><![CDATA[// get Gl account history totals
-var condList = FastList.newInstance();
+var condList = new LinkedkList();
condList.add(EntityCondition.makeCondition("organizationPartyId", EntityOperator.IN, partyIds));
condList.add(EntityCondition.makeCondition("customTimePeriodId", EntityOperator.EQUALS, customTimePeriodId));
var cond = EntityCondition.makeCondition(condList);
var fieldsToSelect = UtilMisc.toSet("glAccountId", "accountCode", "accountName", "totalPostedDebits", "totalPostedCredits", "totalEndingBalance");
var orderBy = UtilMisc.toList("accountCode");
-glAccountAndHistories = FastList.newInstance();
+glAccountAndHistories = new LinkedkList();
try {
glAccountAndHistories = delegator.findList("GlAccountAndHistoryTotals", cond, fieldsToSelect, orderBy, null, false);
} catch (e) {
Modified: ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign Fri Apr 10 20:22:54 2015
@@ -61,7 +61,7 @@ under the License.
<property name="Data Cube.Inventory.width">150</property>
<property name="Data Cube.Inventory.height">200</property>
<method name="initialize"><![CDATA[importPackage(Packages.org.ofbiz.base.util)
-importPackage(Packages.javolution.util)
+
module = "InventoryReport.rptdesign";]]></method>
<text-property name="displayName">Blank Report</text-property>
@@ -179,8 +179,8 @@ try {
Debug.logError(e,"");
}
-inputInvent = FastMap.newInstance();
-inputInventFields = FastMap.newInstance();
+inputInvent = new HashMap();
+inputInventFields = new HashMap();
if(params!=null){
inputInventFields.put("facilityId", params["facilityId"]);
inputInventFields.put("noConditionFind", "Y");
@@ -274,14 +274,14 @@ if(inventory = inventories.next()){
</list-property>
</structure>
<property name="dataSource">OFBiz</property>
- <method name="open"><![CDATA[inputOrder = FastMap.newInstance();
+ <method name="open"><![CDATA[inputOrder = new HashMap();
userLogin = null;
try {
userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
} catch(e) {
Debug.logError(e,"");
}
-inputOrderFields = FastMap.newInstance();
+inputOrderFields = new HashMap();
if(params!=null){
inputOrderFields.put("orderDateDateValue_fld0_op", params["orderDateDateValue_fld0_op"]);
inputOrderFields.put("noConditionFind", "Y");
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign Fri Apr 10 20:22:54 2015
@@ -21,7 +21,7 @@ under the License.
<property name="createdBy">Eclipse BIRT Designer Version 2.5.1.v20090903 Build <2.5.1.v20090917-1447></property>
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.org.ofbiz.base.util)
-importPackage(Packages.javolution.util)
+
importPackage(Packages.org.ofbiz.entity.util)
importPackage(Packages.java.util)
importPackage(Packages.java.lang)
@@ -149,7 +149,7 @@ if (couponSalesOrders) {
}]]></method>
<method name="fetch"><![CDATA[if (countOfRow == totalRow - 1) return false;
userLogin = null;
-input = FastMap.newInstance();
+input = new HashMap();
try {
userLogin = delegator.findOne("UserLogin",UtilMisc.toMap("userLoginId","admin"), false);
} catch(e) {
@@ -179,7 +179,7 @@ if(productPromoCodes.size()>0){
amount = orderInfo.get("grandTotal");
totalOrdersAmount = totalOrdersAmount + amount;
//Shipping Total
- cond = FastList.newInstance();
+ cond = new LinkedkList();
cond.add(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId));
cond.add(EntityCondition.makeCondition("orderAdjustmentTypeId", EntityOperator.EQUALS, "SHIPPING_CHARGES"));
orderAdjustments = delegator.findList("OrderAdjustment", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign Fri Apr 10 20:22:54 2015
@@ -21,7 +21,7 @@ under the License.
<property name="createdBy">Eclipse BIRT Designer Version 3.7.2.v20120213 Build <3.7.2.v20120214-1408></property>
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.org.ofbiz.base.util)
-importPackage(Packages.javolution.util)
+
importPackage(Packages.org.ofbiz.entity.util)
importPackage(Packages.java.util)
importPackage(Packages.java.lang)
@@ -216,7 +216,7 @@ module = "Last3MonthsSalesReport.rptdesi
userLogin = null;
try {
userLogin = delegator.findByPrimaryKey("UserLogin",UtilMisc.toMap("userLoginId","admin"));
- months = FastList.newInstance();
+ months = new LinkedkList();
thisMonth = 0;
thisMonth = UtilDateTime.getMonth(UtilDateTime.nowTimestamp(), TimeZone.getDefault(), Locale.getDefault())+1;
thisYear = UtilDateTime.getYear(UtilDateTime.nowTimestamp(), TimeZone.getDefault(), Locale.getDefault())
@@ -265,7 +265,7 @@ try {
}
month = month - 1
}
- cond = FastList.newInstance();
+ cond = new LinkedkList();
cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months));
cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, UtilMisc.toLongObject(thisYear)));
salesOrderItemStarSchemas = delegator.findList("SalesOrderItemStarSchema", EntityCondition.makeCondition(cond, EntityOperator.AND), null, null, null, false);
@@ -280,7 +280,7 @@ if (salesOrderItemStarSchemas) {
]]></method>
<method name="fetch"><![CDATA[if (countOfRow == totalRow - 1) return false;
salesOrderItemStarSchema = salesOrderItemStarSchemas.get(countOfRow);
-input = FastMap.newInstance();
+input = new HashMap();
input.put("productId", salesOrderItemStarSchema.getString("productProductId"));
input.put("userLogin", userLogin);
QOH = 0;
@@ -295,7 +295,7 @@ try {
price = 0;
internalName = "None";
-input = FastMap.newInstance();
+input = new HashMap();
try {
product = delegator.findByPrimaryKey("Product",UtilMisc.toMap("productId", salesOrderItemStarSchema.getString("productProductId")));
if(product!=null){
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign Fri Apr 10 20:22:54 2015
@@ -21,7 +21,7 @@ under the License.
<property name="createdBy">Eclipse BIRT Designer Version 2.5.1.v20090903 Build <2.5.1.v20090917-1447></property>
<property name="units">in</property>
<method name="initialize"><![CDATA[importPackage(Packages.org.ofbiz.base.util)
-importPackage(Packages.javolution.util)
+
importPackage(Packages.org.ofbiz.entity.util)
module = "OrderByReferrer.rptdesign";]]></method>
<property name="iconFile">/templates/blank_report.gif</property>
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign Fri Apr 10 20:22:54 2015
@@ -23,7 +23,7 @@ under the License.
<property name="comments">Copyright (c) 2007 <<Your Company Name here>></property>
<html-property name="description">Creates a blank report with no predefined content.</html-property>
<method name="initialize"><![CDATA[importPackage(Packages.org.ofbiz.base.util)
-importPackage(Packages.javolution.util)
+
module = "OrderDiscountCodeReport.rptdesign";]]></method>
<text-property name="displayName">Blank Report</text-property>
@@ -115,8 +115,8 @@ try {
Debug.logError(e,"");
}
-input = FastMap.newInstance();
-inputFields = FastMap.newInstance();
+input = new HashMap();
+inputFields = new HashMap();
if(params!=null){
inputFields.put("noConditionFind", "Y");
}
Modified: ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign (original)
+++ ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign Fri Apr 10 20:22:54 2015
@@ -154,7 +154,7 @@ under the License.
<property name="DataCube.Group1.NewTabularHierarchy1.height">200</property>
<property name="Channel.SalesOrderItemFact.x">135</property>
<property name="Channel.SalesOrderItemFact.y">80</property>
- <method name="initialize"><![CDATA[importPackage(Packages.javolution.util);
+ <method name="initialize"><![CDATA[
importPackage(Packages.org.ofbiz.base.util);
importPackage(Packages.org.ofbiz.entity.util);
module = "OrdersByChannel.rptdesign";]]></method>
Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Fri Apr 10 20:22:54 2015
@@ -32,13 +32,12 @@ import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
@@ -64,7 +63,7 @@ public class EbayHelper {
public static final String resource = "EbayUiLabels";
public static Map<String, Object> buildEbayConfig(Map<String, Object> context, Delegator delegator) {
- Map<String, Object> buildEbayConfigContext = FastMap.newInstance();
+ Map<String, Object> buildEbayConfigContext = new HashMap<String, Object>();
Locale locale = (Locale) context.get("locale");
String productStoreId = (String) context.get("productStoreId");
if (UtilValidate.isNotEmpty(productStoreId)) {
@@ -126,7 +125,7 @@ public class EbayHelper {
int responseCode = connection.getResponseCode();
InputStream inputStream = null;
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
String response = null;
if (responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_OK) {
@@ -324,7 +323,7 @@ public class EbayHelper {
Debug.logInfo("Creating postal address with input map: " + address, module);
String contactMechId = null;
try {
- Map<String, Object> context = FastMap.newInstance();
+ Map<String, Object> context = new HashMap<String, Object>();
context.put("partyId", partyId);
context.put("toName", address.get("buyerName"));
context.put("address1", address.get("shippingAddressStreet1"));
@@ -341,7 +340,7 @@ public class EbayHelper {
Map<String, Object> summaryResult = dispatcher.runSync("createPartyPostalAddress", context);
contactMechId = (String) summaryResult.get("contactMechId");
// Set also as a billing address
- context = FastMap.newInstance();
+ context = new HashMap<String, Object>();
context.put("partyId", partyId);
context.put("contactMechId", contactMechId);
context.put("contactMechPurposeTypeId", "BILLING_LOCATION");
@@ -392,8 +391,8 @@ public class EbayHelper {
public static String createPartyPhone(LocalDispatcher dispatcher, String partyId, String phoneNumber,
GenericValue userLogin) {
- Map<String, Object> summaryResult = FastMap.newInstance();
- Map<String, Object> context = FastMap.newInstance();
+ Map<String, Object> summaryResult = new HashMap<String, Object>();
+ Map<String, Object> context = new HashMap<String, Object>();
String phoneContactMechId = null;
try {
@@ -410,8 +409,8 @@ public class EbayHelper {
}
public static String createPartyEmail(LocalDispatcher dispatcher, String partyId, String email, GenericValue userLogin) {
- Map<String, Object> context = FastMap.newInstance();
- Map<String, Object> summaryResult = FastMap.newInstance();
+ Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> summaryResult = new HashMap<String, Object>();
String emailContactMechId = null;
try {
@@ -438,8 +437,8 @@ public class EbayHelper {
public static void createEbayCustomer(LocalDispatcher dispatcher, String partyId, String ebayUserIdBuyer, String eias,
GenericValue userLogin) {
- Map<String, Object> context = FastMap.newInstance();
- Map<String, Object> summaryResult = FastMap.newInstance();
+ Map<String, Object> context = new HashMap<String, Object>();
+ Map<String, Object> summaryResult = new HashMap<String, Object>();
if (UtilValidate.isNotEmpty(eias)) {
try {
context.put("partyId", partyId);
Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Fri Apr 10 20:22:54 2015
@@ -23,13 +23,11 @@ import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.HashMap;
import java.util.Iterator;
+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.UtilDateTime;
@@ -64,10 +62,10 @@ public class EbayOrderServices {
private static boolean isGetSellerTransactionsCall = false;
private static boolean isGetOrdersCall = false;
private static boolean isGetMyeBaySellingCall = false;
- private static List<Map<String, Object>> orderList = FastList.newInstance();
- private static List<String> getSellerTransactionsContainingOrderList = FastList.newInstance();
- private static List<String> orderImportSuccessMessageList = FastList.newInstance();
- private static List<String> orderImportFailureMessageList = FastList.newInstance();
+ private static List<Map<String, Object>> orderList = new LinkedList<Map<String,Object>>();
+ private static List<String> getSellerTransactionsContainingOrderList = new LinkedList<String>();
+ private static List<String> orderImportSuccessMessageList = new LinkedList<String>();
+ private static List<String> orderImportFailureMessageList = new LinkedList<String>();
public static Map<String, Object> getEbayOrders(DispatchContext dctx, Map<String, Object> context) {
Delegator delegator = dctx.getDelegator();
@@ -77,7 +75,7 @@ public class EbayOrderServices {
orderImportFailureMessageList.clear();
getSellerTransactionsContainingOrderList.clear();
orderList.clear();
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
try {
Map<String, Object> eBayConfigResult = EbayHelper.buildEbayConfig(context, delegator);
if (UtilValidate.isEmpty(eBayConfigResult)) {
@@ -125,7 +123,7 @@ public class EbayOrderServices {
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>();
String externalId = (String) context.get("externalId");
List<Map<String, Object>> orderList = UtilGenerics.checkList(context.get("orderList"));
try {
@@ -263,7 +261,7 @@ public class EbayOrderServices {
private static Map<String, Object> checkOrders(Delegator delegator, LocalDispatcher dispatcher, Locale locale, Map<String, Object> context, String responseMsg) {
StringBuffer errorMessage = new StringBuffer();
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
GenericValue userLogin = (GenericValue) context.get("userLogin");
if (isGetSellerTransactionsCall) {
List<Map<String, Object>> getSellerTransactionList = readGetSellerTransactionResponse(responseMsg, locale, (String) context.get("productStoreId"), delegator, dispatcher, errorMessage, userLogin);
@@ -425,7 +423,7 @@ public class EbayOrderServices {
private static List<Map<String, Object>> readGetOrdersResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) {
- List<Map<String, Object>> fetchedOrders = FastList.newInstance();
+ List<Map<String, Object>> fetchedOrders = new LinkedList<Map<String,Object>>();
try {
Document docResponse = UtilXml.readXmlDocument(responseMsg, true);
//Debug.logInfo("The generated string is ======= " + UtilXml.writeXmlDocument(docResponse), module);
@@ -450,7 +448,7 @@ public class EbayOrderServices {
Iterator<? extends Element> ordersElemIter = orders.iterator();
while (ordersElemIter.hasNext()) {
- Map<String, Object> orderCtx = FastMap.newInstance();
+ Map<String, Object> orderCtx = new HashMap<String, Object>();
Element ordersElement = ordersElemIter.next();
String externalOrderId = UtilXml.childElementValue(ordersElement, "OrderID");
orderCtx.put("externalId", "EBO_" + externalOrderId);
@@ -473,7 +471,7 @@ public class EbayOrderServices {
orderCtx.put("productStoreId", productStoreId);
// Retrieve shipping address
- Map<String, Object> shippingAddressCtx = FastMap.newInstance();
+ Map<String, Object> shippingAddressCtx = new HashMap<String, Object>();
List<? extends Element> shippingAddressList = UtilXml.childElementList(ordersElement, "ShippingAddress");
Iterator<? extends Element> shippingAddressElemIter = shippingAddressList.iterator();
while (shippingAddressElemIter.hasNext()) {
@@ -496,7 +494,7 @@ public class EbayOrderServices {
}
// Retrieve shipping service selected
- Map<String, Object> shippingServiceSelectedCtx = FastMap.newInstance();
+ Map<String, Object> shippingServiceSelectedCtx = new HashMap<String, Object>();
List<? extends Element> shippingServiceSelectedList = UtilXml.childElementList(ordersElement, "ShippingServiceSelected");
Iterator<? extends Element> shippingServiceSelectedElemIter = shippingServiceSelectedList.iterator();
while (shippingServiceSelectedElemIter.hasNext()) {
@@ -516,7 +514,7 @@ public class EbayOrderServices {
}
// Retrieve shipping details
- Map<String, Object> shippingDetailsCtx = FastMap.newInstance();
+ Map<String, Object> shippingDetailsCtx = new HashMap<String, Object>();
List<? extends Element> shippingDetailsList = UtilXml.childElementList(ordersElement, "ShippingDetails");
Iterator<? extends Element> shippingDetailsElemIter = shippingDetailsList.iterator();
while (shippingDetailsElemIter.hasNext()) {
@@ -539,7 +537,7 @@ public class EbayOrderServices {
orderCtx.put("shippingDetailsCtx", shippingDetailsCtx);
// Retrieve checkout status
- Map<String, Object> checkoutStatusCtx = FastMap.newInstance();
+ Map<String, Object> checkoutStatusCtx = new HashMap<String, Object>();
List<? extends Element> checkoutStatusList = UtilXml.childElementList(ordersElement, "CheckoutStatus");
Iterator<? extends Element> checkoutStatusElemIter = checkoutStatusList.iterator();
while (checkoutStatusElemIter.hasNext()) {
@@ -551,7 +549,7 @@ public class EbayOrderServices {
orderCtx.put("checkoutStatusCtx", checkoutStatusCtx);
// Retrieve external transaction
- Map<String, Object> externalTransactionCtx = FastMap.newInstance();
+ Map<String, Object> externalTransactionCtx = new HashMap<String, Object>();
List<? extends Element> externalTransactionList = UtilXml.childElementList(ordersElement, "ExternalTransaction");
Iterator<? extends Element> externalTransactionElemIter = externalTransactionList.iterator();
while (externalTransactionElemIter.hasNext()) {
@@ -564,7 +562,7 @@ public class EbayOrderServices {
orderCtx.put("externalTransactionCtx", externalTransactionCtx);
// Retrieve Transactions Array --> Transactions | Order Items
- List<Map<String, Object>> orderItemList = FastList.newInstance();
+ List<Map<String, Object>> orderItemList = new LinkedList<Map<String,Object>>();
String buyersEmailId = null;
List<? extends Element> transactionArrayList = UtilXml.childElementList(ordersElement, "TransactionArray");
Iterator<? extends Element> transactionArrayElemIter = transactionArrayList.iterator();
@@ -575,7 +573,7 @@ public class EbayOrderServices {
List<? extends Element> transactionList = UtilXml.childElementList(transactionArrayElement, "Transaction");
Iterator<? extends Element> transactionElemIter = transactionList.iterator();
while (transactionElemIter.hasNext()) {
- Map<String, Object> transactionCtx = FastMap.newInstance();
+ Map<String, Object> transactionCtx = new HashMap<String, Object>();
Element transactionElement = transactionElemIter.next();
// Retrieve Buyer email
@@ -634,7 +632,7 @@ public class EbayOrderServices {
}
private static List<Map<String, Object>> readGetSellerTransactionResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) {
- List<Map<String, Object>> fetchedOrders = FastList.newInstance();
+ List<Map<String, Object>> fetchedOrders = new LinkedList<Map<String,Object>>();
try {
Document docResponse = UtilXml.readXmlDocument(responseMsg, true);
//Debug.logInfo("The generated string is ======= " + UtilXml.writeXmlDocument(docResponse), module);
@@ -663,7 +661,7 @@ public class EbayOrderServices {
Iterator<? extends Element> transactionElemIter = transaction.iterator();
while (transactionElemIter.hasNext()) {
Element transactionElement = transactionElemIter.next();
- Map<String, Object> orderCtx = FastMap.newInstance();
+ Map<String, Object> orderCtx = new HashMap<String, Object>();
orderCtx.put("amountPaid", UtilXml.childElementValue(transactionElement, "AmountPaid", "0"));
String createdDate = UtilXml.childElementValue(transactionElement, "CreatedDate");
@@ -690,8 +688,8 @@ public class EbayOrderServices {
}
// retrieve buyer
- Map<String, Object> shippingAddressCtx = FastMap.newInstance();
- Map<String, Object> buyerCtx = FastMap.newInstance();
+ Map<String, Object> shippingAddressCtx = new HashMap<String, Object>();
+ Map<String, Object> buyerCtx = new HashMap<String, Object>();
List<? extends Element> buyer = UtilXml.childElementList(transactionElement, "Buyer");
Iterator<? extends Element> buyerElemIter = buyer.iterator();
while (buyerElemIter.hasNext()) {
@@ -728,7 +726,7 @@ public class EbayOrderServices {
orderCtx.put("shippingAddressCtx", shippingAddressCtx);
// retrieve shipping service selected
- Map<String, Object> shippingServiceSelectedCtx = FastMap.newInstance();
+ Map<String, Object> shippingServiceSelectedCtx = new HashMap<String, Object>();
List<? extends Element> shippingServiceSelected = UtilXml.childElementList(transactionElement, "ShippingServiceSelected");
Iterator<? extends Element> shippingServiceSelectedElemIter = shippingServiceSelected.iterator();
while (shippingServiceSelectedElemIter.hasNext()) {
@@ -760,7 +758,7 @@ public class EbayOrderServices {
orderCtx.put("shippingServiceSelectedCtx", shippingServiceSelectedCtx);
// retrieve shipping details
- Map<String, Object> shippingDetailsCtx = FastMap.newInstance();
+ Map<String, Object> shippingDetailsCtx = new HashMap<String, Object>();
List<? extends Element> shippingDetails = UtilXml.childElementList(transactionElement, "ShippingDetails");
Iterator<? extends Element> shippingDetailsElemIter = shippingDetails.iterator();
while (shippingDetailsElemIter.hasNext()) {
@@ -800,7 +798,7 @@ public class EbayOrderServices {
orderCtx.put("shippingDetailsCtx", shippingDetailsCtx);
// retrieve status
- Map<String, Object> checkoutStatusCtx = FastMap.newInstance();
+ Map<String, Object> checkoutStatusCtx = new HashMap<String, Object>();
List<? extends Element> status = UtilXml.childElementList(transactionElement, "Status");
Iterator<? extends Element> statusElemIter = status.iterator();
while (statusElemIter.hasNext()) {
@@ -814,7 +812,7 @@ public class EbayOrderServices {
orderCtx.put("checkoutStatusCtx", checkoutStatusCtx);
// retrieve external transaction
- Map<String, Object> externalTransactionCtx = FastMap.newInstance();
+ Map<String, Object> externalTransactionCtx = new HashMap<String, Object>();
List<? extends Element> externalTransaction = UtilXml.childElementList(transactionElement, "ExternalTransaction");
Iterator<? extends Element> externalTransactionElemIter = externalTransaction.iterator();
while (externalTransactionElemIter.hasNext()) {
@@ -828,12 +826,12 @@ public class EbayOrderServices {
String quantityPurchased = UtilXml.childElementValue(transactionElement, "QuantityPurchased", "");
// retrieve item
- List<Map<String, Object>> orderItemList = FastList.newInstance();
+ List<Map<String, Object>> orderItemList = new LinkedList<Map<String,Object>>();
String itemId = "";
List<? extends Element> item = UtilXml.childElementList(transactionElement, "Item");
Iterator<? extends Element> itemElemIter = item.iterator();
while (itemElemIter.hasNext()) {
- Map<String, Object> orderItemCtx = FastMap.newInstance();
+ Map<String, Object> orderItemCtx = new HashMap<String, Object>();
Element itemElement = itemElemIter.next();
itemId = UtilXml.childElementValue(itemElement, "ItemID", "");
orderItemCtx.put("paymentMethods", UtilXml.childElementValue(itemElement, "PaymentMethods", ""));
@@ -917,7 +915,7 @@ public class EbayOrderServices {
}
private static List<String> readGetMyeBaySellingResponse(String responseMsg, Locale locale, String productStoreId, Delegator delegator, LocalDispatcher dispatcher, StringBuffer errorMessage, GenericValue userLogin) {
- List<String> fetchDeletedOrdersAndTransactions = FastList.newInstance();
+ List<String> fetchDeletedOrdersAndTransactions = new LinkedList<String>();
try {
Document docResponse = UtilXml.readXmlDocument(responseMsg, true);
//Debug.logInfo("The generated string is ======= " + UtilXml.writeXmlDocument(docResponse), module);
Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Fri Apr 10 20:22:54 2015
@@ -22,14 +22,13 @@ import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.Iterator;
+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.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
@@ -61,7 +60,7 @@ public class ImportOrdersFromEbay {
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>();
try {
Map<String, Object> eBayConfigResult = EbayHelper.buildEbayConfig(context, delegator);
StringBuffer sellerTransactionsItemsXml = new StringBuffer();
@@ -85,8 +84,8 @@ public class ImportOrdersFromEbay {
Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
Locale locale = (Locale) context.get("locale");
- Map<String, Object> order = FastMap.newInstance();
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> order = new HashMap<String, Object>();
+ Map<String, Object> result = new HashMap<String, Object>();
try {
order.put("productStoreId", context.get("productStoreId"));
order.put("userLogin", context.get("userLogin"));
@@ -130,7 +129,7 @@ public class ImportOrdersFromEbay {
String orderId = (String) context.get("orderId");
String externalId = (String) context.get("externalId");
String transactionId = "";
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
try {
if (orderId == null && externalId == null) {
Debug.logError("orderId or externalId must be filled", module);
@@ -205,7 +204,7 @@ public class ImportOrdersFromEbay {
order.put("errorMessage", "");
}
}
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
result.put("responseMessage", ModelService.RESPOND_SUCCESS);
result.put("orderList", orders);
return result;
@@ -353,7 +352,7 @@ public class ImportOrdersFromEbay {
}
if (ack != null && "Success".equals(ack)) {
- orders = FastList.newInstance();
+ orders = new LinkedList<Map<String,Object>>();
if (totalOrders > 0) {
// retrieve transaction array
List<? extends Element> transactions = UtilXml.childElementList(elemResponse, "TransactionArray");
@@ -365,7 +364,7 @@ public class ImportOrdersFromEbay {
List<? extends Element> transaction = UtilXml.childElementList(transactionsElement, "Transaction");
Iterator<? extends Element> transactionElemIter = transaction.iterator();
while (transactionElemIter.hasNext()) {
- Map<String, Object> order = FastMap.newInstance();
+ Map<String, Object> order = new HashMap<String, Object>();
String itemId = "";
Element transactionElement = transactionElemIter.next();
Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java Fri Apr 10 20:22:54 2015
@@ -25,13 +25,12 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+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.UtilCodec;
@@ -60,8 +59,8 @@ public class ProductsExportToEbay {
private static final String resource = "EbayUiLabels";
private static final String configFileName = "ebayExport.properties";
private static final String module = ProductsExportToEbay.class.getName();
- private static List<String> productExportSuccessMessageList = FastList.newInstance();
- private static List<String> productExportFailureMessageList = FastList.newInstance();
+ private static List<String> productExportSuccessMessageList = new LinkedList<String>();
+ private static List<String> productExportFailureMessageList = new LinkedList<String>();
public static Map<String, Object> exportToEbay(DispatchContext dctx, Map<String, Object> context) {
@@ -69,7 +68,7 @@ public class ProductsExportToEbay {
Delegator delegator = dctx.getDelegator();
productExportSuccessMessageList.clear();
productExportFailureMessageList.clear();
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
Map<String, Object> response = null;
try {
List<String> selectResult = UtilGenerics.checkList(context.get("selectResult"), String.class);
@@ -153,7 +152,7 @@ public class ProductsExportToEbay {
outputStream.close();
int responseCode = connection.getResponseCode();
InputStream inputStream;
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
String response = null;
if (responseCode == HttpURLConnection.HTTP_CREATED ||
@@ -549,7 +548,7 @@ public class ProductsExportToEbay {
private static Map<String, Object> readEbayCategoriesResponse(String msg, Locale locale) {
Map<String, Object> results = null;
- List<Map<String, Object>> categories = FastList.newInstance();
+ List<Map<String, Object>> categories = new LinkedList<Map<String,Object>>();
try {
Document docResponse = UtilXml.readXmlDocument(msg, true);
Element elemResponse = docResponse.getDocumentElement();
@@ -565,7 +564,7 @@ public class ProductsExportToEbay {
for (Element categoryArrayElement : UtilXml.childElementList(elemResponse, "CategoryArray")) {
// retrieve Category
for (Element categoryElement : UtilXml.childElementList(categoryArrayElement, "Category")) {
- Map<String, Object> categ = FastMap.newInstance();
+ Map<String, Object> categ = new HashMap<String, Object>();
String categoryCode = ("true".equalsIgnoreCase((UtilXml.childElementValue(categoryElement, "LeafCategory", "").trim())) ? "Y" : "N") + "_" +
UtilXml.childElementValue(categoryElement, "CategoryID", "").trim() + "_" +
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java Fri Apr 10 20:22:54 2015
@@ -18,11 +18,10 @@
*/
package org.ofbiz.ebaystore;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.ofbiz.entity.Delegator;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.ServiceUtil;
@@ -36,7 +35,7 @@ import com.ebay.soap.eBLBaseComponents.U
public class EbayAccount {
public static Map<String, Object> getEbayUser(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();
Locale locale = (Locale) context.get("locale");
String productStoreId = (String) context.get("productStoreId");
@@ -56,7 +55,7 @@ public class EbayAccount {
street1 = null,
street2 = null,
status = null;
- Map<String, Object>registrationAddress = FastMap.newInstance();
+ Map<String, Object>registrationAddress = new HashMap<String, Object>();
try {
ApiContext apiContext = EbayStoreHelper.getApiContext(productStoreId, locale, delegator);
Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java?rev=1672752&r1=1672751&r2=1672752&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java Fri Apr 10 20:22:54 2015
@@ -18,11 +18,10 @@
*/
package org.ofbiz.ebaystore;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javolution.util.FastMap;
-
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.Delegator;
@@ -40,7 +39,7 @@ public class EbayBestOfferAutoPref {
public static Map<String, Object> ebayBestOfferPrefCond(DispatchContext dctx, Map<String, ? extends Object> context) {
- Map<String, Object> result = FastMap.newInstance();
+ Map<String, Object> result = new HashMap<String, Object>();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Delegator delegator = dctx.getDelegator();