Re: svn commit: r1672752 [1/18] - in /ofbiz/trunk: applications/accounting/src/or
Locked
Re: svn commit: r1672752 [1/18] - in /ofbiz/trunk: applications/accounting/src/or
 
|
This should be fine, but there might be cases where a LinkedHashMap is
needed. Adrian Crum Sandglass Software www.sandglass-software.com On 4/10/2015 9:22 PM, [hidden email] wrote: > Author: nmalin > Date: Fri Apr 10 20:22:54 2015 > New Revision: 1672752 > > URL: http://svn.apache.org/r1672752 > Log: > Convert javolution FastMap, FastSet and FastList by standard java.util.* > Related to OFBIZ-5781 Convert Javolution collections into Java collections > Thanks to Deepak Dixit and Adrian Crum for their help. > > By defautl converted : > * FastMap by HashMap > * FastList by LinkedList > * FastSet by HashSet > > Modified: > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java > ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CostCenters.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy > ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy > ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy > ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy > ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml > ofbiz/trunk/applications/content/src/ControlApplet.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchEvents.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java > ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java > ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java > ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java > ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java > ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy > ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy > ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java > ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java > ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/quote/QuoteServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java > ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java > ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy > ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy > ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy > ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy > ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy > ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy > ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy > ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java > ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java > ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java > ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipHelper.java > ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java > ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java > ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java > ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/ListCommunications.groovy > ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy > ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy > ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy > ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy > ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml > ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoCatalogUrlServlet.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoConfigUtil.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContentUrlFilter.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ParametricSearch.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreEvents.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java > ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java > ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java > ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy > ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy > ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy > ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java > ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java > ofbiz/trunk/framework/common/template/JsLanguageFilesMapping.ftl > ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java > ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java > ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy > ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ComponentList.groovy > ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy > ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy > ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy > ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy > ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/ServiceResult.groovy > ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy > ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java > ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy > ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy > ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/RunStarSchemaQuery.groovy > ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java > ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java > ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentReport.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign > ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign > ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java > ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java > ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java > ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java > ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java > ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetDisputeInfo.groovy > ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy > ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy > ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/SoldAction.groovy > ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy > ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java > ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/BestSellingCategory.groovy > ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy > ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy > ofbiz/trunk/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java > ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java > ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java > ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy > ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy > ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java > ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java > ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy > ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java > ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java > ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java > ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java > ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy > ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy > ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml > ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java > ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign > ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign > ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java > ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/search/WebPosSearch.java > ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java > ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java > ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/SideDeepCategory.groovy > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java Fri Apr 10 20:22:54 2015 > @@ -20,12 +20,11 @@ > package org.ofbiz.accounting.agreement; > > import java.math.BigDecimal; > +import java.util.LinkedList; > import java.util.List; > import java.util.Locale; > import java.util.Map; > > -import javolution.util.FastList; > - > import org.ofbiz.base.util.Debug; > import org.ofbiz.base.util.UtilMisc; > import org.ofbiz.base.util.UtilNumber; > @@ -79,7 +78,7 @@ public class AgreementServices { > Delegator delegator = ctx.getDelegator(); > Locale locale = (Locale) context.get("locale"); > String errMsg = null; > - List<Map<String, Object>> commissions = FastList.newInstance(); > + List<Map<String, Object>> commissions = new LinkedList<Map<String,Object>>(); > > try { > BigDecimal amount = ((BigDecimal)context.get("amount")); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java Fri Apr 10 20:22:54 2015 > @@ -21,11 +21,10 @@ package org.ofbiz.accounting.finaccount; > > import java.math.BigDecimal; > import java.sql.Timestamp; > +import java.util.HashMap; > import java.util.Locale; > import java.util.Map; > > -import javolution.util.FastMap; > - > import org.ofbiz.accounting.payment.PaymentGatewayServices; > import org.ofbiz.base.util.Debug; > import org.ofbiz.base.util.GeneralException; > @@ -404,7 +403,7 @@ public class FinAccountPaymentServices { > } > > // build the withdraw context > - Map<String, Object> withdrawCtx = FastMap.newInstance(); > + Map<String, Object> withdrawCtx = new HashMap<String, Object>(); > withdrawCtx.put("finAccountId", finAccountId); > withdrawCtx.put("productStoreId", productStoreId); > withdrawCtx.put("currency", currency); > @@ -478,7 +477,7 @@ public class FinAccountPaymentServices { > } > > // call the deposit service > - Map<String, Object> depositCtx = FastMap.newInstance(); > + Map<String, Object> depositCtx = new HashMap<String, Object>(); > depositCtx.put("finAccountId", finAccountId); > depositCtx.put("productStoreId", productStoreId); > depositCtx.put("isRefund", Boolean.TRUE); > @@ -843,7 +842,7 @@ public class FinAccountPaymentServices { > > // hit the payment method for the amount to replenish > Map<String, BigDecimal> orderItemMap = UtilMisc.toMap("Auto-Replenishment FA #" + finAccountId, depositAmount); > - Map<String, Object> replOrderCtx = FastMap.newInstance(); > + Map<String, Object> replOrderCtx = new HashMap<String, Object>(); > replOrderCtx.put("productStoreId", productStoreId); > replOrderCtx.put("paymentMethodId", paymentMethod.getString("paymentMethodId")); > replOrderCtx.put("currency", currency); > @@ -863,7 +862,7 @@ public class FinAccountPaymentServices { > String orderId = (String) replResp.get("orderId"); > > // create the deposit > - Map<String, Object> depositCtx = FastMap.newInstance(); > + Map<String, Object> depositCtx = new HashMap<String, Object>(); > depositCtx.put("productStoreId", productStoreId); > depositCtx.put("finAccountId", finAccountId); > depositCtx.put("currency", currency); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java Fri Apr 10 20:22:54 2015 > @@ -19,6 +19,12 @@ > > package org.ofbiz.accounting.finaccount; > > +import java.math.BigDecimal; > +import java.util.HashMap; > +import java.util.List; > +import java.util.Locale; > +import java.util.Map; > + > import org.ofbiz.service.DispatchContext; > import org.ofbiz.service.LocalDispatcher; > import org.ofbiz.service.ServiceUtil; > @@ -29,16 +35,15 @@ import org.ofbiz.entity.GenericEntityExc > import org.ofbiz.entity.util.EntityQuery; > import org.ofbiz.entity.util.EntityUtil; > import org.ofbiz.entity.util.EntityUtilProperties; > -import org.ofbiz.base.util.*; > +import org.ofbiz.base.util.Debug; > +import org.ofbiz.base.util.UtilDateTime; > +import org.ofbiz.base.util.UtilMisc; > +import org.ofbiz.base.util.UtilProperties; > +import org.ofbiz.base.util.UtilValidate; > import org.ofbiz.base.util.string.FlexibleStringExpander; > import org.ofbiz.order.order.OrderReadHelper; > import org.ofbiz.order.finaccount.FinAccountHelper; > > -import java.util.*; > -import java.math.BigDecimal; > - > -import javolution.util.FastMap; > - > /** > * FinAccountProductServices - Financial Accounts created from product purchases (i.e. gift certificates) > */ > @@ -169,7 +174,7 @@ public class FinAccountProductServices { > } > > // create the context for FSE > - Map<String, Object> expContext = FastMap.newInstance(); > + Map<String, Object> expContext = new HashMap<String, Object>(); > expContext.put("orderHeader", orderHeader); > expContext.put("orderItem", orderItem); > expContext.put("party", party); > @@ -186,7 +191,7 @@ public class FinAccountProductServices { > BigDecimal deposit = price.multiply(quantity).setScale(FinAccountHelper.decimals, FinAccountHelper.rounding); > > // create the financial account > - Map<String, Object> createCtx = FastMap.newInstance(); > + Map<String, Object> createCtx = new HashMap<String, Object>(); > String finAccountId; > > createCtx.put("finAccountTypeId", finAccountTypeId); > @@ -218,7 +223,7 @@ public class FinAccountProductServices { > finAccountId = (String) createResp.get("finAccountId"); > > // create the owner role > - Map<String, Object> roleCtx = FastMap.newInstance(); > + Map<String, Object> roleCtx = new HashMap<String, Object>(); > roleCtx.put("partyId", partyId); > roleCtx.put("roleTypeId", "OWNER"); > roleCtx.put("finAccountId", finAccountId); > @@ -237,7 +242,7 @@ public class FinAccountProductServices { > } > > // create the initial deposit > - Map<String, Object> depositCtx = FastMap.newInstance(); > + Map<String, Object> depositCtx = new HashMap<String, Object>(); > depositCtx.put("finAccountId", finAccountId); > depositCtx.put("productStoreId", productStoreId); > depositCtx.put("currency", currency); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java Fri Apr 10 20:22:54 2015 > @@ -21,12 +21,11 @@ package org.ofbiz.accounting.finaccount; > > import java.math.BigDecimal; > import java.sql.Timestamp; > +import java.util.HashMap; > 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.GeneralException; > import org.ofbiz.base.util.UtilDateTime; > @@ -128,7 +127,7 @@ public class FinAccountServices { > creditAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", creditAccountId).queryOne(); > > // create the owner role > - Map<String, Object> roleCtx = FastMap.newInstance(); > + Map<String, Object> roleCtx = new HashMap<String, Object>(); > roleCtx.put("partyId", partyId); > roleCtx.put("roleTypeId", "OWNER"); > roleCtx.put("finAccountId", creditAccountId); > @@ -153,7 +152,7 @@ public class FinAccountServices { > } > > // create the credit transaction > - Map<String, Object> transactionMap = FastMap.newInstance(); > + Map<String, Object> transactionMap = new HashMap<String, Object>(); > transactionMap.put("finAccountTransTypeId", "ADJUSTMENT"); > transactionMap.put("finAccountId", creditAccount.getString("finAccountId")); > transactionMap.put("partyId", partyId); > @@ -413,7 +412,7 @@ public class FinAccountServices { > String returnId = (String) rhResp.get("returnId"); > > // create the return item > - Map<String, Object> returnItemCtx = FastMap.newInstance(); > + Map<String, Object> returnItemCtx = new HashMap<String, Object>(); > returnItemCtx.put("returnId", returnId); > returnItemCtx.put("orderId", orderId); > returnItemCtx.put("description", orderItem.getString("itemDescription")); > @@ -455,7 +454,7 @@ public class FinAccountServices { > String paymentId = response.getString("paymentId"); > > // create the adjustment transaction > - Map<String, Object> txCtx = FastMap.newInstance(); > + Map<String, Object> txCtx = new HashMap<String, Object>(); > txCtx.put("finAccountTransTypeId", "ADJUSTMENT"); > txCtx.put("finAccountId", finAccountId); > txCtx.put("orderId", orderId); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Fri Apr 10 20:22:54 2015 > @@ -26,15 +26,14 @@ import java.nio.ByteBuffer; > import java.nio.charset.Charset; > import java.sql.Timestamp; > import java.util.ArrayList; > +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 java.util.Set; > > -import javolution.util.FastList; > -import javolution.util.FastMap; > - > import org.apache.commons.collections.CollectionUtils; > import org.apache.commons.csv.CSVFormat; > import org.apache.commons.csv.CSVRecord; > @@ -236,7 +235,7 @@ public class InvoiceServices { > > // create the invoice record > if (UtilValidate.isEmpty(invoiceId)) { > - Map<String, Object> createInvoiceContext = FastMap.newInstance(); > + Map<String, Object> createInvoiceContext = new HashMap<String, Object>(); > createInvoiceContext.put("partyId", billToCustomerPartyId); > createInvoiceContext.put("partyIdFrom", billFromVendorPartyId); > createInvoiceContext.put("billingAccountId", billingAccountId); > @@ -261,7 +260,7 @@ public class InvoiceServices { > > // order roles to invoice roles > List<GenericValue> orderRoles = orderHeader.getRelated("OrderRole", null, null, false); > - Map<String, Object> createInvoiceRoleContext = FastMap.newInstance(); > + Map<String, Object> createInvoiceRoleContext = new HashMap<String, Object>(); > createInvoiceRoleContext.put("invoiceId", invoiceId); > createInvoiceRoleContext.put("userLogin", userLogin); > for (GenericValue orderRole : orderRoles) { > @@ -423,7 +422,7 @@ public class InvoiceServices { > > BigDecimal billingAmount = orderItem.getBigDecimal("unitPrice").setScale(invoiceTypeDecimals, ROUNDING); > > - Map<String, Object> createInvoiceItemContext = FastMap.newInstance(); > + Map<String, Object> createInvoiceItemContext = new HashMap<String, Object>(); > createInvoiceItemContext.put("invoiceId", invoiceId); > createInvoiceItemContext.put("invoiceItemSeqId", invoiceItemSeqId); > createInvoiceItemContext.put("invoiceItemTypeId", getInvoiceItemType(delegator, (orderItem.getString("orderItemTypeId")), (product == null ? null : product.getString("productTypeId")), invoiceType, "INV_FPROD_ITEM")); > @@ -467,7 +466,7 @@ public class InvoiceServices { > invoiceQuantity = invoiceQuantity.add(billingQuantity).setScale(invoiceTypeDecimals, ROUNDING); > > // create the OrderItemBilling record > - Map<String, Object> createOrderItemBillingContext = FastMap.newInstance(); > + Map<String, Object> createOrderItemBillingContext = new HashMap<String, Object>(); > createOrderItemBillingContext.put("invoiceId", invoiceId); > createOrderItemBillingContext.put("invoiceItemSeqId", invoiceItemSeqId); > createOrderItemBillingContext.put("orderId", orderItem.get("orderId")); > @@ -558,7 +557,7 @@ public class InvoiceServices { > } > } > if (amount.signum() != 0) { > - Map<String, Object> createInvoiceItemAdjContext = FastMap.newInstance(); > + Map<String, Object> createInvoiceItemAdjContext = new HashMap<String, Object>(); > createInvoiceItemAdjContext.put("invoiceId", invoiceId); > createInvoiceItemAdjContext.put("invoiceItemSeqId", invoiceItemSeqId); > createInvoiceItemAdjContext.put("invoiceItemTypeId", getInvoiceItemType(delegator, adj.getString("orderAdjustmentTypeId"), null, invoiceType, "INVOICE_ITM_ADJ")); > @@ -607,7 +606,7 @@ public class InvoiceServices { > } > > // Create the OrderAdjustmentBilling record > - Map<String, Object> createOrderAdjustmentBillingContext = FastMap.newInstance(); > + Map<String, Object> createOrderAdjustmentBillingContext = new HashMap<String, Object>(); > createOrderAdjustmentBillingContext.put("orderAdjustmentId", adj.getString("orderAdjustmentId")); > createOrderAdjustmentBillingContext.put("invoiceId", invoiceId); > createOrderAdjustmentBillingContext.put("invoiceItemSeqId", invoiceItemSeqId); > @@ -643,8 +642,8 @@ public class InvoiceServices { > } > > // create header adjustments as line items -- always to tax/shipping last > - Map<GenericValue, BigDecimal> shipAdjustments = FastMap.newInstance(); > - Map<GenericValue, BigDecimal> taxAdjustments = FastMap.newInstance(); > + Map<GenericValue, BigDecimal> shipAdjustments = new HashMap<GenericValue, BigDecimal>(); > + Map<GenericValue, BigDecimal> taxAdjustments = new HashMap<GenericValue, BigDecimal>(); > > List<GenericValue> headerAdjustments = orh.getOrderHeaderAdjustments(); > for (GenericValue adj : headerAdjustments) { > @@ -765,7 +764,7 @@ public class InvoiceServices { > .where(EntityCondition.makeCondition("orderId", EntityOperator.EQUALS, orderId), > EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PAYMENT_CANCELLED") > ).queryList(); > - List<GenericValue> currentPayments = FastList.newInstance(); > + List<GenericValue> currentPayments = new LinkedList<GenericValue>(); > for (GenericValue paymentPref : orderPaymentPrefs) { > List<GenericValue> payments = paymentPref.getRelated("Payment", null, null, false); > currentPayments.addAll(payments); > @@ -777,7 +776,7 @@ public class InvoiceServices { > } > BigDecimal notApplied = PaymentWorker.getPaymentNotApplied(payment); > if (notApplied.signum() > 0) { > - Map<String, Object> appl = FastMap.newInstance(); > + Map<String, Object> appl = new HashMap<String, Object>(); > appl.put("paymentId", payment.get("paymentId")); > appl.put("invoiceId", invoiceId); > appl.put("billingAccountId", billingAccountId); > @@ -826,8 +825,8 @@ public class InvoiceServices { > GenericValue userLogin = (GenericValue) context.get("userLogin"); > Locale locale = (Locale) context.get("locale"); > List<String> salesInvoiceIds = UtilGenerics.checkList(context.get("invoiceIds")); > - List<Map<String, String>> invoicesCreated = FastList.newInstance(); > - Map<String, List<Map<String, Object>>> commissionParties = FastMap.newInstance(); > + List<Map<String, String>> invoicesCreated = new LinkedList<Map<String,String>>(); > + Map<String, List<Map<String, Object>>> commissionParties = new HashMap<String, List<Map<String,Object>>>(); > for (String salesInvoiceId : salesInvoiceIds) { > List<String> salesRepPartyIds = UtilGenerics.checkList(context.get("partyIds")); > BigDecimal amountTotal = InvoiceWorker.getInvoiceTotal(delegator, salesInvoiceId); > @@ -927,7 +926,7 @@ public class InvoiceServices { > Timestamp now = UtilDateTime.nowTimestamp(); > // Create invoice for each commission receiving party > for (Map.Entry<String, List<Map<String, Object>>> commissionParty : commissionParties.entrySet()) { > - List<GenericValue> toStore = FastList.newInstance(); > + List<GenericValue> toStore = new LinkedList<GenericValue>(); > List<Map<String, Object>> commList = commissionParty.getValue(); > // get the billing parties > if (UtilValidate.isEmpty(commList)) { > @@ -941,7 +940,7 @@ public class InvoiceServices { > Long days = (Long) (commList.get(0)).get("days"); > // create the invoice record > // To and From are in commission's sense, opposite for invoice > - Map<String, Object> createInvoiceMap = FastMap.newInstance(); > + Map<String, Object> createInvoiceMap = new HashMap<String, Object>(); > createInvoiceMap.put("partyId", partyIdBillTo); > createInvoiceMap.put("partyIdFrom", partyIdBillFrom); > createInvoiceMap.put("invoiceDate", now); > @@ -1075,7 +1074,7 @@ public class InvoiceServices { > LocalDispatcher dispatcher = dctx.getDispatcher(); > String shipmentId = (String) context.get("shipmentId"); > Locale locale = (Locale) context.get("locale"); > - List<String> invoicesCreated = FastList.newInstance(); > + List<String> invoicesCreated = new LinkedList<String>(); > Map<String, Object> response = ServiceUtil.returnSuccess(); > GenericValue orderShipment = null; > String invoicePerShipment = null; > @@ -1138,7 +1137,7 @@ public class InvoiceServices { > "AccountingTroubleGettingShipmentEntity", > UtilMisc.toMap("shipmentId", shipmentId), locale)); > } > - List<GenericValue> itemIssuances = FastList.newInstance(); > + List<GenericValue> itemIssuances = new LinkedList<GenericValue>(); > try { > itemIssuances = EntityQuery.use(delegator).select("orderId", "shipmentId") > .from("ItemIssuance").orderBy("orderId").distinct().queryList(); > @@ -1154,11 +1153,11 @@ public class InvoiceServices { > // The orders can now be placed in separate groups, each for > // 1. The group of orders for which payment is already captured. No grouping and action required. > // 2. The group of orders for which invoice is IN-Process status. > - Map<String, GenericValue> ordersWithInProcessInvoice = FastMap.newInstance(); > + Map<String, GenericValue> ordersWithInProcessInvoice = new HashMap<String, GenericValue>(); > > for (GenericValue itemIssuance : itemIssuances) { > String orderId = itemIssuance.getString("orderId"); > - Map<String, Object> billFields = FastMap.newInstance(); > + Map<String, Object> billFields = new HashMap<String, Object>(); > billFields.put("orderId", orderId); > > GenericValue orderItemBilling = null; > @@ -1191,7 +1190,7 @@ public class InvoiceServices { > // For In-Process invoice, move the status to ready and capture the payment > for (GenericValue invoice : ordersWithInProcessInvoice.values()) { > String invoiceId = invoice.getString("invoiceId"); > - Map<String, Object> setInvoiceStatusResult = FastMap.newInstance(); > + Map<String, Object> setInvoiceStatusResult = new HashMap<String, Object>(); > try { > setInvoiceStatusResult = dispatcher.runSync("setInvoiceStatus", UtilMisc.<String, Object>toMap("invoiceId", invoiceId, "statusId", "INVOICE_READY", "userLogin", userLogin)); > } catch (GenericServiceException e) { > @@ -1238,7 +1237,7 @@ public class InvoiceServices { > boolean purchaseShipmentFound = false; > boolean dropShipmentFound = false; > > - List<String> invoicesCreated = FastList.newInstance(); > + List<String> invoicesCreated = new LinkedList<String>(); > > //DEJ20060520: not used? planned to be used? List shipmentIdList = new LinkedList(); > for (String tmpShipmentId : shipmentIds) { > @@ -1321,17 +1320,17 @@ public class InvoiceServices { > } > > // group items by order > - Map<String, List<GenericValue>> shippedOrderItems = FastMap.newInstance(); > + Map<String, List<GenericValue>> shippedOrderItems = new HashMap<String, List<GenericValue>>(); > for (GenericValue item : items) { > String orderId = item.getString("orderId"); > String orderItemSeqId = item.getString("orderItemSeqId"); > List<GenericValue> itemsByOrder = shippedOrderItems.get(orderId); > if (itemsByOrder == null) { > - itemsByOrder = FastList.newInstance(); > + itemsByOrder = new LinkedList<GenericValue>(); > } > > // check and make sure we haven't already billed for this issuance or shipment receipt > - List<EntityCondition> billFields = FastList.newInstance(); > + List<EntityCondition> billFields = new LinkedList<EntityCondition>(); > billFields.add(EntityCondition.makeCondition("orderId", orderId)); > billFields.add(EntityCondition.makeCondition("orderItemSeqId", orderItemSeqId)); > billFields.add(EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED")); > @@ -1374,10 +1373,10 @@ public class InvoiceServices { > List<GenericValue> billItems = shippedOrderItems.get(orderId); > > // a new list to be used to pass to the create invoice service > - List<GenericValue> toBillItems = FastList.newInstance(); > + List<GenericValue> toBillItems = new LinkedList<GenericValue>(); > > // map of available quantities so we only have to calc once > - Map<String, BigDecimal> itemQtyAvail = FastMap.newInstance(); > + Map<String, BigDecimal> itemQtyAvail = new HashMap<String, BigDecimal>(); > > // now we will check each issuance and make sure it hasn't already been billed > for (GenericValue issue : billItems) { > @@ -1391,7 +1390,7 @@ public class InvoiceServices { > > BigDecimal billAvail = itemQtyAvail.get(issue.getString("orderItemSeqId")); > if (billAvail == null) { > - List<EntityCondition> lookup = FastList.newInstance(); > + List<EntityCondition> lookup = new LinkedList<EntityCondition>(); > lookup.add(EntityCondition.makeCondition("orderId", orderId)); > lookup.add(EntityCondition.makeCondition("orderItemSeqId", issue.get("orderItemSeqId"))); > lookup.add(EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED")); > @@ -1514,7 +1513,7 @@ public class InvoiceServices { > } > > // Total the additional shipping charges for the shipments > - Map<GenericValue, BigDecimal> additionalShippingCharges = FastMap.newInstance(); > + Map<GenericValue, BigDecimal> additionalShippingCharges = new HashMap<GenericValue, BigDecimal>(); > BigDecimal totalAdditionalShippingCharges = ZERO; > if (UtilValidate.isNotEmpty(invoiceableShipments)) { > for (GenericValue shipment : invoiceableShipments) { > @@ -1533,7 +1532,7 @@ public class InvoiceServices { > GenericValue shipment = entry.getKey(); > BigDecimal additionalShippingCharge = entry.getValue(); > String shipmentId = shipment.getString("shipmentId"); > - Map<String, Object> createOrderAdjustmentContext = FastMap.newInstance(); > + Map<String, Object> createOrderAdjustmentContext = new HashMap<String, Object>(); > createOrderAdjustmentContext.put("orderId", orderId); > createOrderAdjustmentContext.put("orderAdjustmentTypeId", "SHIPPING_CHARGES"); > String addtlChargeDescription = shipment.getString("addtlShippingChargeDesc"); > @@ -1566,8 +1565,8 @@ public class InvoiceServices { > "AccountingTroubleCallingCreateInvoicesFromShipmentService", locale)); > } > > - List<Object> emptyList = FastList.newInstance(); > - Map<String, Object> calcTaxContext = FastMap.newInstance(); > + List<Object> emptyList = new LinkedList<Object>(); > + Map<String, Object> calcTaxContext = new HashMap<String, Object>(); > calcTaxContext.put("productStoreId", orh.getProductStoreId()); > calcTaxContext.put("payToPartyId", payToParty.getString("partyId")); > calcTaxContext.put("billToPartyId", billToParty.getString("partyId")); > @@ -1761,7 +1760,7 @@ public class InvoiceServices { > boolean salesReturnFound = false; > boolean purchaseReturnFound = false; > > - List<String> invoicesCreated = FastList.newInstance(); > + List<String> invoicesCreated = new LinkedList<String>(); > try { > > // get the shipment and validate that it is a sales return > @@ -1792,7 +1791,7 @@ public class InvoiceServices { > } > > // group the shipments by returnId (because we want a seperate itemized invoice for each return) > - Map<String, List<GenericValue>> itemsShippedGroupedByReturn = FastMap.newInstance(); > + Map<String, List<GenericValue>> itemsShippedGroupedByReturn = new HashMap<String, List<GenericValue>>(); > > for (GenericValue item : shippedItems) { > String returnId = null; > @@ -1824,7 +1823,7 @@ public class InvoiceServices { > // get the List of items shipped to/from this returnId > List<GenericValue> billItems = itemsShippedGroupedByReturn.get(returnId); > if (billItems == null) { > - billItems = FastList.newInstance(); > + billItems = new LinkedList<GenericValue>(); > } > > // add our item to the group and put it back in the map > @@ -2180,7 +2179,7 @@ public class InvoiceServices { > UtilMisc.toMap("invoiceId", invoiceId), locale)); > } > > - Map<String, BigDecimal> payments = FastMap.newInstance(); > + Map<String, BigDecimal> payments = new HashMap<String, BigDecimal>(); > Timestamp paidDate = null; > for (GenericValue payAppl : paymentAppl) { > payments.put(payAppl.getString("paymentId"), payAppl.getBigDecimal("amountApplied")); > @@ -2239,7 +2238,7 @@ public class InvoiceServices { > amount = baseAmount.multiply(multiplier).divide(divisor, decimals, rounding); > } > if (amount.signum() != 0) { > - Map<String, Object> createInvoiceItemContext = FastMap.newInstance(); > + Map<String, Object> createInvoiceItemContext = new HashMap<String, Object>(); > createInvoiceItemContext.put("invoiceId", invoiceId); > createInvoiceItemContext.put("invoiceItemSeqId", invoiceItemSeqId); > createInvoiceItemContext.put("invoiceItemTypeId", getInvoiceItemType(delegator, adj.getString("orderAdjustmentTypeId"), null, invoiceTypeId, "INVOICE_ADJ")); > @@ -2268,7 +2267,7 @@ public class InvoiceServices { > } > > // Create the OrderAdjustmentBilling record > - Map<String, Object> createOrderAdjustmentBillingContext = FastMap.newInstance(); > + Map<String, Object> createOrderAdjustmentBillingContext = new HashMap<String, Object>(); > createOrderAdjustmentBillingContext.put("orderAdjustmentId", adj.getString("orderAdjustmentId")); > createOrderAdjustmentBillingContext.put("invoiceId", invoiceId); > createOrderAdjustmentBillingContext.put("invoiceItemSeqId", invoiceItemSeqId); > @@ -2295,7 +2294,7 @@ public class InvoiceServices { > amount = percent.multiply(divisor); > } > if (amount.signum() != 0) { > - Map<String, Object> createInvoiceItemContext = FastMap.newInstance(); > + Map<String, Object> createInvoiceItemContext = new HashMap<String, Object>(); > createInvoiceItemContext.put("invoiceId", invoiceId); > createInvoiceItemContext.put("invoiceItemSeqId", invoiceItemSeqId); > createInvoiceItemContext.put("invoiceItemTypeId", getInvoiceItemType(delegator, adj.getString("orderAdjustmentTypeId"), null, invoiceTypeId, "INVOICE_ADJ")); > @@ -2324,7 +2323,7 @@ public class InvoiceServices { > } > > // Create the OrderAdjustmentBilling record > - Map<String, Object> createOrderAdjustmentBillingContext = FastMap.newInstance(); > + Map<String, Object> createOrderAdjustmentBillingContext = new HashMap<String, Object>(); > createOrderAdjustmentBillingContext.put("orderAdjustmentId", adj.getString("orderAdjustmentId")); > createOrderAdjustmentBillingContext.put("invoiceId", invoiceId); > createOrderAdjustmentBillingContext.put("invoiceItemSeqId", invoiceItemSeqId); > @@ -2353,7 +2352,7 @@ public class InvoiceServices { > if (terms != null) { > for (GenericValue term : terms) { > > - Map<String, Object> createInvoiceTermContext = FastMap.newInstance(); > + Map<String, Object> createInvoiceTermContext = new HashMap<String, Object>(); > createInvoiceTermContext.put("invoiceId", invoiceId); > createInvoiceTermContext.put("invoiceItemSeqId", "_NA_"); > createInvoiceTermContext.put("termTypeId", term.get("termTypeId")); > @@ -2443,7 +2442,7 @@ public class InvoiceServices { > String taxAuthGeoId = (String) context.get("taxAuthGeoId"); > String useHighestAmount = (String) context.get("useHighestAmount"); > > - List<String> errorMessageList = FastList.newInstance(); > + List<String> errorMessageList = new LinkedList<String>(); > > if (debug) Debug.logInfo("updatePaymentApplicationDefBd input parameters..." + > " defaultInvoiceProcessing: " + defaultInvoiceProcessing + > @@ -3357,8 +3356,8 @@ public class InvoiceServices { > String csvString = Charset.forName(encoding).decode(fileBytes).toString(); > final BufferedReader csvReader = new BufferedReader(new StringReader(csvString)); > CSVFormat fmt = CSVFormat.DEFAULT.withHeader(); > - List<String> errMsgs = FastList.newInstance(); > - List<String> newErrMsgs = FastList.newInstance(); > + List<String> errMsgs = new LinkedList<String>(); > + List<String> newErrMsgs = new LinkedList<String>(); > String lastInvoiceId = null; > String currentInvoiceId = null; > String newInvoiceId = null; > @@ -3395,7 +3394,7 @@ public class InvoiceServices { > > // invoice validation > try { > - newErrMsgs = FastList.newInstance(); > + newErrMsgs = new LinkedList<String>(); > if (UtilValidate.isEmpty(invoice.get("partyIdFrom"))) { > newErrMsgs.add("Line number " + rec.getRecordNumber() + ": Mandatory Party Id From and Party Id From Trans missing for invoice: " + currentInvoiceId); > } else if (EntityQuery.use(delegator).from("Party").where("partyId", invoice.get("partyIdFrom")).queryOne() == null) { > @@ -3459,7 +3458,7 @@ public class InvoiceServices { > } > // invoice item validation > try { > - newErrMsgs = FastList.newInstance(); > + newErrMsgs = new LinkedList<String>(); > if (UtilValidate.isEmpty(invoiceItem.get("invoiceItemSeqId"))) { > newErrMsgs.add("Line number " + rec.getRecordNumber() + ": Mandatory item sequence Id missing for invoice: " + currentInvoiceId); > } > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java Fri Apr 10 20:22:54 2015 > @@ -21,14 +21,13 @@ package org.ofbiz.accounting.invoice; > import java.math.BigDecimal; > import java.math.MathContext; > import java.sql.Timestamp; > +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.UtilDateTime; > import org.ofbiz.base.util.UtilMisc; > @@ -114,7 +113,7 @@ public class InvoiceWorker { > > /** Method to get the taxable invoice item types as a List of invoiceItemTypeIds. These are identified in Enumeration with enumTypeId TAXABLE_INV_ITM_TY. */ > public static List<String> getTaxableInvoiceItemTypeIds(Delegator delegator) throws GenericEntityException { > - List<String> typeIds = FastList.newInstance(); > + List<String> typeIds = new LinkedList<String>(); > List<GenericValue> invoiceItemTaxTypes = EntityQuery.use(delegator).from("Enumeration").where("enumTypeId", "TAXABLE_INV_ITM_TY") > .cache().queryList(); > for (GenericValue invoiceItemTaxType : invoiceItemTaxTypes) { > @@ -586,7 +585,7 @@ public class InvoiceWorker { > @Deprecated > public static Map<String, Object> getInvoiceTaxByTaxAuthGeoAndParty(GenericValue invoice) { > BigDecimal taxGrandTotal = ZERO; > - List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = FastList.newInstance(); > + List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = new LinkedList<Map<String,Object>>(); > List<GenericValue> invoiceItems = null; > if (UtilValidate.isNotEmpty(invoice)) { > try { > @@ -634,7 +633,7 @@ public class InvoiceWorker { > } > } > } > - Map<String, Object> result = FastMap.newInstance(); > + Map<String, Object> result = new HashMap<String, Object>(); > result.put("taxByTaxAuthGeoAndPartyList", taxByTaxAuthGeoAndPartyList); > result.put("taxGrandTotal", taxGrandTotal); > return result; > @@ -647,7 +646,7 @@ public class InvoiceWorker { > * will not account for tax lines that do not contain a taxAuthPartyId > */ > public static Map<String, Set<String>> getInvoiceTaxAuthPartyAndGeos (GenericValue invoice) { > - Map<String, Set<String>> result = FastMap.newInstance(); > + Map<String, Set<String>> result = new HashMap<String, Set<String>>(); > > if (invoice == null) > throw new IllegalArgumentException("Invoice cannot be null."); > @@ -668,7 +667,7 @@ public class InvoiceWorker { > String taxAuthGeoId = invoiceItem.getString("taxAuthGeoId"); > if (UtilValidate.isNotEmpty(taxAuthPartyId)) { > if (!result.containsKey(taxAuthPartyId)) { > - Set<String> taxAuthGeos = FastSet.newInstance(); > + Set<String> taxAuthGeos = new HashSet<String>(); > taxAuthGeos.add(taxAuthGeoId); > result.put(taxAuthPartyId, taxAuthGeos); > } else { > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java Fri Apr 10 20:22:54 2015 > @@ -23,12 +23,11 @@ import java.util.Collections; > import java.util.Comparator; > 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 org.ofbiz.base.util.Debug; > import org.ofbiz.base.util.GeneralException; > import org.ofbiz.base.util.UtilDateTime; > @@ -66,7 +65,7 @@ public class BillingAccountWorker { > } > > public static List<Map<String, Object>> makePartyBillingAccountList(GenericValue userLogin, String currencyUomId, String partyId, Delegator delegator, LocalDispatcher dispatcher) throws GeneralException { > - List<Map<String, Object>> billingAccountList = FastList.newInstance(); > + List<Map<String, Object>> billingAccountList = new LinkedList<Map<String,Object>>(); > > Map<String, Object> agentResult = dispatcher.runSync("getRelatedParties", UtilMisc.<String, Object>toMap("userLogin", userLogin, "partyIdFrom", partyId, > "roleTypeIdFrom", "AGENT", "roleTypeIdTo", "CUSTOMER", "partyRelationshipTypeId", "AGENT", "includeFromToSwitched", "Y")); > > Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff > ============================================================================== > --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original) > +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Fri Apr 10 20:22:54 2015 > @@ -20,13 +20,12 @@ package org.ofbiz.accounting.payment; > > import java.math.BigDecimal; > import java.sql.Timestamp; > +import java.util.HashMap; > import java.util.List; > import java.util.Locale; > import java.util.Map; > import java.util.Random; > > -import javolution.util.FastMap; > - > import org.ofbiz.base.util.Debug; > import org.ofbiz.base.util.GeneralException; > import org.ofbiz.base.util.UtilDateTime; > @@ -412,7 +411,7 @@ public class GiftCertificateServices { > // obtain the order information > OrderReadHelper orh = new OrderReadHelper(delegator, orderPaymentPreference.getString("orderId")); > > - Map<String, Object> redeemCtx = FastMap.newInstance(); > + Map<String, Object> redeemCtx = new HashMap<String, Object>(); > redeemCtx.put("userLogin", userLogin); > redeemCtx.put("productStoreId", orh.getProductStoreId()); > redeemCtx.put("cardNumber", giftCard.get("finAccountId")); > @@ -657,7 +656,7 @@ public class GiftCertificateServices { > currency = EntityUtilProperties.getPropertyValue("general.properties", "currency.uom.id.default", "USD", delegator); > } > > - Map<String, Object> refundCtx = FastMap.newInstance(); > + Map<String, Object> refundCtx = new HashMap<String, Object>(); > refundCtx.put("productStoreId", productStoreId); > refundCtx.put("currency", currency); > refundCtx.put("partyId", partyId); > @@ -803,7 +802,7 @@ public class GiftCertificateServices { > } > > // make a map of answer info > - Map<String, Object> answerMap = FastMap.newInstance(); > + Map<String, Object> answerMap = new HashMap<String, Object>(); > if (responseAnswers != null) { > for (GenericValue answer : responseAnswers) { > GenericValue question = null; > @@ -836,7 +835,7 @@ public class GiftCertificateServices { > int qtyLoop = quantity.intValue(); > for (int i = 0; i < qtyLoop; i++) { > // create a gift certificate > - Map<String, Object> createGcCtx = FastMap.newInstance(); > + Map<String, Object> createGcCtx = new HashMap<String, Object>(); > //createGcCtx.put("paymentConfig", paymentConfig); > createGcCtx.put("productStoreId", productStoreId); > createGcCtx.put("currency", currency); > @@ -860,7 +859,7 @@ public class GiftCertificateServices { > } > > // create the fulfillment record > - Map<String, Object> gcFulFill = FastMap.newInstance(); > + Map<String, Object> gcFulFill = new HashMap<String, Object>(); > gcFulFill.put("typeEnumId", "GC_ACTIVATE"); > gcFulFill.put("partyId", partyId); > gcFulFill.put("orderId", orderId); > @@ -908,7 +907,7 @@ public class GiftCertificateServices { > bcc = orderEmails; > } > } > - Map<String, Object> emailCtx = FastMap.newInstance(); > + Map<String, Object> emailCtx = new HashMap<String, Object>(); > String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); > if (UtilValidate.isEmpty(bodyScreenLocation)) { > bodyScreenLocation = ProductStoreWorker.getDefaultProductStoreEmailScreenLocation(emailType); > @@ -1031,7 +1030,7 @@ public class GiftCertificateServices { > } > > // make a map of answer info > - Map<String, Object> answerMap = FastMap.newInstance(); > + Map<String, Object> answerMap = new HashMap<String, Object>(); > if (responseAnswers != null) { > for (GenericValue answer : responseAnswers) { > GenericValue question = null; > @@ -1056,7 +1055,7 @@ public class GiftCertificateServices { > String pinNumber = (String) answerMap.get(pinNumberKey); > > // reload the gift card > - Map<String, Object> reloadCtx = FastMap.newInstance(); > + Map<String, Object> reloadCtx = new HashMap<String, Object>(); > reloadCtx.put("productStoreId", productStoreId); > reloadCtx.put("currency", currency); > reloadCtx.put("partyId", partyId); > @@ -1079,7 +1078,7 @@ public class GiftCertificateServices { > } > > // create the fulfillment record > - Map<String, Object> gcFulFill = FastMap.newInstance(); > + Map<String, Object> gcFulFill = new HashMap<String, Object>(); > gcFulFill.put("typeEnumId", "GC_RELOAD"); > gcFulFill.put("userLogin", userLogin); > gcFulFill.put("partyId", partyId); > @@ -1137,7 +1136,7 @@ public class GiftCertificateServices { > } else { > answerMap.put("locale", locale); > > - Map<String, Object> emailCtx = FastMap.newInstance(); > + Map<String, Object> emailCtx = new HashMap<String, Object>(); > String bodyScreenLocation = productStoreEmail.getString("bodyScreenLocation"); > if (UtilValidate.isEmpty(bodyScreenLocation)) { > bodyScreenLocation = ProductStoreWorker.getDefaultProductStoreEmailScreenLocation(emailType); > @@ -1231,7 +1230,7 @@ public class GiftCertificateServices { > Debug.logInfo("Returnable INFO : " + returnableQuantity + " @ " + returnablePrice + " :: " + orderItem, module); > > // create the return header > - Map<String, Object> returnHeaderInfo = FastMap.newInstance(); > + Map<String, Object> returnHeaderInfo = new HashMap<String, Object>(); > returnHeaderInfo.put("fromPartyId", partyId); > returnHeaderInfo.put("userLogin", userLogin); > Map<String, Object> returnHeaderResp = null; > @@ -1261,7 +1260,7 @@ public class GiftCertificateServices { > } > > // create the return item > - Map<String, Object> returnItemInfo = FastMap.newInstance(); > + Map<String, Object> returnItemInfo = new HashMap<String, Object>(); > returnItemInfo.put("returnId", returnId); > returnItemInfo.put("returnReasonId", "RTN_DIG_FILL_FAIL"); > returnItemInfo.put("returnTypeId", "RTN_REFUND"); > @@ -1311,7 +1310,7 @@ public class GiftCertificateServices { > } > > // update the status to received so it can process > - Map<String, Object> updateReturnInfo = FastMap.newInstance(); > + Map<String, Object> updateReturnInfo = new HashMap<String, Object>(); > updateReturnInfo.put("returnId", returnId); > updateReturnInfo.put("statusId", "RETURN_RECEIVED"); > updateReturnInfo.put("currentStatusId", "RETURN_REQUESTED"); > > |
Re: svn commit: r1672752 [1/18] - in /ofbiz/trunk: applications/accounting/src/or
|
|
Clearly ! In the patch, few time I detected an iteration over the map
and I used LinkedHashMap. But after 2h of refactoring, we saw nothing ! I don't analyse each algorithm to assure that linkedHashMap need to use on this first step. Now I keep it in mind as the second step ;) Nicolas Le 11/04/2015 10:26, Adrian Crum a écrit : > This should be fine, but there might be cases where a LinkedHashMap is > needed. > > Adrian Crum > Sandglass Software > www.sandglass-software.com > > On 4/10/2015 9:22 PM, [hidden email] wrote: >> Author: nmalin >> Date: Fri Apr 10 20:22:54 2015 >> New Revision: 1672752 >> >> URL: http://svn.apache.org/r1672752 >> Log: >> Convert javolution FastMap, FastSet and FastList by standard java.util.* >> Related to OFBIZ-5781 Convert Javolution collections into Java >> collections >> Thanks to Deepak Dixit and Adrian Crum for their help. >> >> By defautl converted : >> * FastMap by HashMap >> * FastList by LinkedList >> * FastSet by HashSet >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/ideal/IdealEvents.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/TaxAuthorityGlAccounts.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/EditInvoice.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/GetAccountOrganizationAndClass.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/invoice/InvoiceReport.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/order/BillingAccountOrders.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CostCenters.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/IncomeStatement.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/SalesInvoiceByProductCategorySummary.groovy >> ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy >> ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProdCatalog.groovy >> ofbiz/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/actions/GetProductStoreAndWebSite.groovy >> ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml >> ofbiz/trunk/applications/content/src/ControlApplet.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/ConvertTree.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocEvents.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchEvents.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/PermissionRecorder.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutWorker.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/output/OutputServices.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java >> ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java >> ofbiz/trunk/applications/humanres/src/org/ofbiz/humanres/HumanResEvents.java >> ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/actions/category/CategoryTree.groovy >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMNode.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMTree.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRun.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunEvents.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunHelper.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/routing/RoutingServices.java >> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java >> ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy >> ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/productionRunAllFixedAssets.groovy >> ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java >> ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java >> ofbiz/trunk/applications/marketing/src/org/ofbiz/sfa/vcard/VCard.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/OrderManagerEvents.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderEvents.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/quote/QuoteServices.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEstimateWrapper.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/test/OrderTestServices.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/test/PurchaseOrderTest.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/test/SalesOrderTest.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java >> ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java >> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/AddGiftCertificates.groovy >> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/CheckoutShippingAddress.groovy >> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy >> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/SideDeepCategory.groovy >> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy >> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy >> ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy >> ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java >> ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java >> ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java >> ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipHelper.java >> ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyRelationshipServices.java >> ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java >> ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java >> ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/ListCommunications.groovy >> ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/getPartyEmailFromCommEventInfo.groovy >> ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy >> ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedInvoicesForParty.groovy >> ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy >> ofbiz/trunk/applications/product/script/org/ofbiz/product/catalog/CatalogServices.xml >> ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlFilter.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryWorker.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoCatalogUrlServlet.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoConfigUtil.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContentUrlFilter.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/SeoContextFilter.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/category/ftl/CatalogUrlSeoTransform.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWorker.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ParametricSearch.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/image/ScaleImage.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/CropImage.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/FrameImage.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageManagementServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ImageUrlServlet.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/ReplaceImage.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/RotateImage.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/imagemanagement/WatermarkImage.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreEvents.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java >> ofbiz/trunk/applications/product/src/org/ofbiz/product/test/StockMovesTest.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/test/IssuanceTest.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java >> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSessionLine.java >> ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/category/CategoryTree.groovy >> ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy >> ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/inventory/InventoryAverageCosts.groovy >> ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalRecurConverter.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java >> ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortWorker.java >> ofbiz/trunk/framework/common/template/JsLanguageFilesMapping.ftl >> ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/EntityArtifactInfo.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceEcaArtifactInfo.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelInfo.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java >> ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java >> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ArtifactInfo.groovy >> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/ComponentList.groovy >> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/artifactinfo/TestSuiteInfo.groovy >> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy >> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy >> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy >> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/service/ServiceResult.groovy >> ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/stats/StatsSinceStart.groovy >> ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java >> ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemaFields.groovy >> ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/GetStarSchemas.groovy >> ofbiz/trunk/specialpurpose/bi/webapp/bi/WEB-INF/actions/reportbuilder/RunStarSchemaQuery.groovy >> ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java >> ofbiz/trunk/specialpurpose/birt/src/org/ofbiz/birt/webapp/view/BirtViewHandler.java >> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/BalanceSheet.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/IncomeStatement.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/PaymentReport.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/accounting/reports/TrialBalance.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/facility/inventory/report/InventoryReport.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/CouponSalesReport.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderByReferrer.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrderDiscountCodeReport.rptdesign >> ofbiz/trunk/specialpurpose/birt/webapp/ordermgr/reports/OrdersByChannel.rptdesign >> ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java >> ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java >> ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java >> ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayAccount.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayFeedback.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPrefEvents.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCustomerService.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreInventoryServices.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOptions.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java >> ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreSiteFacade.java >> ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/automationPreferences/GetDisputeInfo.groovy >> ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/feedback/FeedbackList.groovy >> ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListPrepare.groovy >> ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/SoldAction.groovy >> ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/actions/store/StoreAccount.groovy >> ofbiz/trunk/specialpurpose/ecommerce/src/org/ofbiz/ecommerce/janrain/JanrainHelper.java >> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/BestSellingCategory.groovy >> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ProductCategories.groovy >> ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/ajaxbreadcrumbs.groovy >> ofbiz/trunk/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java >> ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/GoogleBaseSearchEvents.java >> ofbiz/trunk/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java >> ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/FilterProducts.groovy >> ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/autoUpdateConfig.groovy >> ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java >> ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java >> ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy >> ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java >> ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java >> ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/guiapp/xui/XuiSession.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java >> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java >> ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListResourceBillingHours.groovy >> ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getProjectId.groovy >> ofbiz/trunk/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumServices.xml >> ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java >> ofbiz/trunk/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindBacklogItem.groovy >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/FindTaskList.groovy >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumPreferenceSecurityGroup.groovy >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListScrumResource.groovy >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListUnplanBacklog.groovy >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/TaskList.groovy >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByStatusChart.rptdesign >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogByTypeChart.rptdesign >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/BacklogChart.rptdesign >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectAndSprintChart.rptdesign >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/ProjectByStatusChart.rptdesign >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByStatusChart.rptdesign >> ofbiz/trunk/specialpurpose/scrum/webapp/scrum/reports/TaskByTypeChart.rptdesign >> ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/WebPosEvents.java >> ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/search/WebPosSearch.java >> ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/session/WebPosSession.java >> ofbiz/trunk/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java >> ofbiz/trunk/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/catalog/SideDeepCategory.groovy >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java >> (original) >> +++ >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/agreement/AgreementServices.java >> Fri Apr 10 20:22:54 2015 >> @@ -20,12 +20,11 @@ >> package org.ofbiz.accounting.agreement; >> >> import java.math.BigDecimal; >> +import java.util.LinkedList; >> import java.util.List; >> import java.util.Locale; >> import java.util.Map; >> >> -import javolution.util.FastList; >> - >> import org.ofbiz.base.util.Debug; >> import org.ofbiz.base.util.UtilMisc; >> import org.ofbiz.base.util.UtilNumber; >> @@ -79,7 +78,7 @@ public class AgreementServices { >> Delegator delegator = ctx.getDelegator(); >> Locale locale = (Locale) context.get("locale"); >> String errMsg = null; >> - List<Map<String, Object>> commissions = FastList.newInstance(); >> + List<Map<String, Object>> commissions = new >> LinkedList<Map<String,Object>>(); >> >> try { >> BigDecimal amount = ((BigDecimal)context.get("amount")); >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java >> (original) >> +++ >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java >> Fri Apr 10 20:22:54 2015 >> @@ -21,11 +21,10 @@ package org.ofbiz.accounting.finaccount; >> >> import java.math.BigDecimal; >> import java.sql.Timestamp; >> +import java.util.HashMap; >> import java.util.Locale; >> import java.util.Map; >> >> -import javolution.util.FastMap; >> - >> import org.ofbiz.accounting.payment.PaymentGatewayServices; >> import org.ofbiz.base.util.Debug; >> import org.ofbiz.base.util.GeneralException; >> @@ -404,7 +403,7 @@ public class FinAccountPaymentServices { >> } >> >> // build the withdraw context >> - Map<String, Object> withdrawCtx = FastMap.newInstance(); >> + Map<String, Object> withdrawCtx = new HashMap<String, >> Object>(); >> withdrawCtx.put("finAccountId", finAccountId); >> withdrawCtx.put("productStoreId", productStoreId); >> withdrawCtx.put("currency", currency); >> @@ -478,7 +477,7 @@ public class FinAccountPaymentServices { >> } >> >> // call the deposit service >> - Map<String, Object> depositCtx = FastMap.newInstance(); >> + Map<String, Object> depositCtx = new HashMap<String, Object>(); >> depositCtx.put("finAccountId", finAccountId); >> depositCtx.put("productStoreId", productStoreId); >> depositCtx.put("isRefund", Boolean.TRUE); >> @@ -843,7 +842,7 @@ public class FinAccountPaymentServices { >> >> // hit the payment method for the amount to replenish >> Map<String, BigDecimal> orderItemMap = >> UtilMisc.toMap("Auto-Replenishment FA #" + finAccountId, depositAmount); >> - Map<String, Object> replOrderCtx = FastMap.newInstance(); >> + Map<String, Object> replOrderCtx = new HashMap<String, >> Object>(); >> replOrderCtx.put("productStoreId", productStoreId); >> replOrderCtx.put("paymentMethodId", >> paymentMethod.getString("paymentMethodId")); >> replOrderCtx.put("currency", currency); >> @@ -863,7 +862,7 @@ public class FinAccountPaymentServices { >> String orderId = (String) replResp.get("orderId"); >> >> // create the deposit >> - Map<String, Object> depositCtx = FastMap.newInstance(); >> + Map<String, Object> depositCtx = new HashMap<String, Object>(); >> depositCtx.put("productStoreId", productStoreId); >> depositCtx.put("finAccountId", finAccountId); >> depositCtx.put("currency", currency); >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java >> (original) >> +++ >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountProductServices.java >> Fri Apr 10 20:22:54 2015 >> @@ -19,6 +19,12 @@ >> >> package org.ofbiz.accounting.finaccount; >> >> +import java.math.BigDecimal; >> +import java.util.HashMap; >> +import java.util.List; >> +import java.util.Locale; >> +import java.util.Map; >> + >> import org.ofbiz.service.DispatchContext; >> import org.ofbiz.service.LocalDispatcher; >> import org.ofbiz.service.ServiceUtil; >> @@ -29,16 +35,15 @@ import org.ofbiz.entity.GenericEntityExc >> import org.ofbiz.entity.util.EntityQuery; >> import org.ofbiz.entity.util.EntityUtil; >> import org.ofbiz.entity.util.EntityUtilProperties; >> -import org.ofbiz.base.util.*; >> +import org.ofbiz.base.util.Debug; >> +import org.ofbiz.base.util.UtilDateTime; >> +import org.ofbiz.base.util.UtilMisc; >> +import org.ofbiz.base.util.UtilProperties; >> +import org.ofbiz.base.util.UtilValidate; >> import org.ofbiz.base.util.string.FlexibleStringExpander; >> import org.ofbiz.order.order.OrderReadHelper; >> import org.ofbiz.order.finaccount.FinAccountHelper; >> >> -import java.util.*; >> -import java.math.BigDecimal; >> - >> -import javolution.util.FastMap; >> - >> /** >> * FinAccountProductServices - Financial Accounts created from >> product purchases (i.e. gift certificates) >> */ >> @@ -169,7 +174,7 @@ public class FinAccountProductServices { >> } >> >> // create the context for FSE >> - Map<String, Object> expContext = FastMap.newInstance(); >> + Map<String, Object> expContext = new HashMap<String, Object>(); >> expContext.put("orderHeader", orderHeader); >> expContext.put("orderItem", orderItem); >> expContext.put("party", party); >> @@ -186,7 +191,7 @@ public class FinAccountProductServices { >> BigDecimal deposit = >> price.multiply(quantity).setScale(FinAccountHelper.decimals, >> FinAccountHelper.rounding); >> >> // create the financial account >> - Map<String, Object> createCtx = FastMap.newInstance(); >> + Map<String, Object> createCtx = new HashMap<String, Object>(); >> String finAccountId; >> >> createCtx.put("finAccountTypeId", finAccountTypeId); >> @@ -218,7 +223,7 @@ public class FinAccountProductServices { >> finAccountId = (String) createResp.get("finAccountId"); >> >> // create the owner role >> - Map<String, Object> roleCtx = FastMap.newInstance(); >> + Map<String, Object> roleCtx = new HashMap<String, Object>(); >> roleCtx.put("partyId", partyId); >> roleCtx.put("roleTypeId", "OWNER"); >> roleCtx.put("finAccountId", finAccountId); >> @@ -237,7 +242,7 @@ public class FinAccountProductServices { >> } >> >> // create the initial deposit >> - Map<String, Object> depositCtx = FastMap.newInstance(); >> + Map<String, Object> depositCtx = new HashMap<String, Object>(); >> depositCtx.put("finAccountId", finAccountId); >> depositCtx.put("productStoreId", productStoreId); >> depositCtx.put("currency", currency); >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java >> (original) >> +++ >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java >> Fri Apr 10 20:22:54 2015 >> @@ -21,12 +21,11 @@ package org.ofbiz.accounting.finaccount; >> >> import java.math.BigDecimal; >> import java.sql.Timestamp; >> +import java.util.HashMap; >> 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.GeneralException; >> import org.ofbiz.base.util.UtilDateTime; >> @@ -128,7 +127,7 @@ public class FinAccountServices { >> creditAccount = >> EntityQuery.use(delegator).from("FinAccount").where("finAccountId", >> creditAccountId).queryOne(); >> >> // create the owner role >> - Map<String, Object> roleCtx = >> FastMap.newInstance(); >> + Map<String, Object> roleCtx = new >> HashMap<String, Object>(); >> roleCtx.put("partyId", partyId); >> roleCtx.put("roleTypeId", "OWNER"); >> roleCtx.put("finAccountId", creditAccountId); >> @@ -153,7 +152,7 @@ public class FinAccountServices { >> } >> >> // create the credit transaction >> - Map<String, Object> transactionMap = FastMap.newInstance(); >> + Map<String, Object> transactionMap = new HashMap<String, >> Object>(); >> transactionMap.put("finAccountTransTypeId", "ADJUSTMENT"); >> transactionMap.put("finAccountId", >> creditAccount.getString("finAccountId")); >> transactionMap.put("partyId", partyId); >> @@ -413,7 +412,7 @@ public class FinAccountServices { >> String returnId = (String) >> rhResp.get("returnId"); >> >> // create the return item >> - Map<String, Object> >> returnItemCtx = FastMap.newInstance(); >> + Map<String, Object> >> returnItemCtx = new HashMap<String, Object>(); >> returnItemCtx.put("returnId", returnId); >> returnItemCtx.put("orderId", orderId); >> returnItemCtx.put("description", >> orderItem.getString("itemDescription")); >> @@ -455,7 +454,7 @@ public class FinAccountServices { >> String paymentId = >> response.getString("paymentId"); >> >> // create the adjustment >> transaction >> - Map<String, Object> txCtx = >> FastMap.newInstance(); >> + Map<String, Object> txCtx = new >> HashMap<String, Object>(); >> txCtx.put("finAccountTransTypeId", "ADJUSTMENT"); >> txCtx.put("finAccountId", >> finAccountId); >> txCtx.put("orderId", orderId); >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java >> (original) >> +++ >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java >> Fri Apr 10 20:22:54 2015 >> @@ -26,15 +26,14 @@ import java.nio.ByteBuffer; >> import java.nio.charset.Charset; >> import java.sql.Timestamp; >> import java.util.ArrayList; >> +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 java.util.Set; >> >> -import javolution.util.FastList; >> -import javolution.util.FastMap; >> - >> import org.apache.commons.collections.CollectionUtils; >> import org.apache.commons.csv.CSVFormat; >> import org.apache.commons.csv.CSVRecord; >> @@ -236,7 +235,7 @@ public class InvoiceServices { >> >> // create the invoice record >> if (UtilValidate.isEmpty(invoiceId)) { >> - Map<String, Object> createInvoiceContext = >> FastMap.newInstance(); >> + Map<String, Object> createInvoiceContext = new >> HashMap<String, Object>(); >> createInvoiceContext.put("partyId", >> billToCustomerPartyId); >> createInvoiceContext.put("partyIdFrom", >> billFromVendorPartyId); >> createInvoiceContext.put("billingAccountId", >> billingAccountId); >> @@ -261,7 +260,7 @@ public class InvoiceServices { >> >> // order roles to invoice roles >> List<GenericValue> orderRoles = >> orderHeader.getRelated("OrderRole", null, null, false); >> - Map<String, Object> createInvoiceRoleContext = >> FastMap.newInstance(); >> + Map<String, Object> createInvoiceRoleContext = new >> HashMap<String, Object>(); >> createInvoiceRoleContext.put("invoiceId", invoiceId); >> createInvoiceRoleContext.put("userLogin", userLogin); >> for (GenericValue orderRole : orderRoles) { >> @@ -423,7 +422,7 @@ public class InvoiceServices { >> >> BigDecimal billingAmount = >> orderItem.getBigDecimal("unitPrice").setScale(invoiceTypeDecimals, >> ROUNDING); >> >> - Map<String, Object> createInvoiceItemContext = >> FastMap.newInstance(); >> + Map<String, Object> createInvoiceItemContext = new >> HashMap<String, Object>(); >> createInvoiceItemContext.put("invoiceId", invoiceId); >> createInvoiceItemContext.put("invoiceItemSeqId", invoiceItemSeqId); >> createInvoiceItemContext.put("invoiceItemTypeId", >> getInvoiceItemType(delegator, >> (orderItem.getString("orderItemTypeId")), (product == null ? null : >> product.getString("productTypeId")), invoiceType, "INV_FPROD_ITEM")); >> @@ -467,7 +466,7 @@ public class InvoiceServices { >> invoiceQuantity = >> invoiceQuantity.add(billingQuantity).setScale(invoiceTypeDecimals, >> ROUNDING); >> >> // create the OrderItemBilling record >> - Map<String, Object> createOrderItemBillingContext = >> FastMap.newInstance(); >> + Map<String, Object> createOrderItemBillingContext = >> new HashMap<String, Object>(); >> createOrderItemBillingContext.put("invoiceId", >> invoiceId); >> createOrderItemBillingContext.put("invoiceItemSeqId", invoiceItemSeqId); >> createOrderItemBillingContext.put("orderId", >> orderItem.get("orderId")); >> @@ -558,7 +557,7 @@ public class InvoiceServices { >> } >> } >> if (amount.signum() != 0) { >> - Map<String, Object> >> createInvoiceItemAdjContext = FastMap.newInstance(); >> + Map<String, Object> >> createInvoiceItemAdjContext = new HashMap<String, Object>(); >> createInvoiceItemAdjContext.put("invoiceId", invoiceId); >> createInvoiceItemAdjContext.put("invoiceItemSeqId", invoiceItemSeqId); >> createInvoiceItemAdjContext.put("invoiceItemTypeId", >> getInvoiceItemType(delegator, adj.getString("orderAdjustmentTypeId"), >> null, invoiceType, "INVOICE_ITM_ADJ")); >> @@ -607,7 +606,7 @@ public class InvoiceServices { >> } >> >> // Create the OrderAdjustmentBilling record >> - Map<String, Object> >> createOrderAdjustmentBillingContext = FastMap.newInstance(); >> + Map<String, Object> >> createOrderAdjustmentBillingContext = new HashMap<String, Object>(); >> createOrderAdjustmentBillingContext.put("orderAdjustmentId", >> adj.getString("orderAdjustmentId")); >> createOrderAdjustmentBillingContext.put("invoiceId", invoiceId); >> createOrderAdjustmentBillingContext.put("invoiceItemSeqId", >> invoiceItemSeqId); >> @@ -643,8 +642,8 @@ public class InvoiceServices { >> } >> >> // create header adjustments as line items -- always to >> tax/shipping last >> - Map<GenericValue, BigDecimal> shipAdjustments = >> FastMap.newInstance(); >> - Map<GenericValue, BigDecimal> taxAdjustments = >> FastMap.newInstance(); >> + Map<GenericValue, BigDecimal> shipAdjustments = new >> HashMap<GenericValue, BigDecimal>(); >> + Map<GenericValue, BigDecimal> taxAdjustments = new >> HashMap<GenericValue, BigDecimal>(); >> >> List<GenericValue> headerAdjustments = >> orh.getOrderHeaderAdjustments(); >> for (GenericValue adj : headerAdjustments) { >> @@ -765,7 +764,7 @@ public class InvoiceServices { >> .where(EntityCondition.makeCondition("orderId", >> EntityOperator.EQUALS, orderId), >> EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, >> "PAYMENT_CANCELLED") >> ).queryList(); >> - List<GenericValue> currentPayments = >> FastList.newInstance(); >> + List<GenericValue> currentPayments = new >> LinkedList<GenericValue>(); >> for (GenericValue paymentPref : orderPaymentPrefs) { >> List<GenericValue> payments = >> paymentPref.getRelated("Payment", null, null, false); >> currentPayments.addAll(payments); >> @@ -777,7 +776,7 @@ public class InvoiceServices { >> } >> BigDecimal notApplied = >> PaymentWorker.getPaymentNotApplied(payment); >> if (notApplied.signum() > 0) { >> - Map<String, Object> appl = FastMap.newInstance(); >> + Map<String, Object> appl = new HashMap<String, >> Object>(); >> appl.put("paymentId", payment.get("paymentId")); >> appl.put("invoiceId", invoiceId); >> appl.put("billingAccountId", billingAccountId); >> @@ -826,8 +825,8 @@ public class InvoiceServices { >> GenericValue userLogin = (GenericValue) >> context.get("userLogin"); >> Locale locale = (Locale) context.get("locale"); >> List<String> salesInvoiceIds = >> UtilGenerics.checkList(context.get("invoiceIds")); >> - List<Map<String, String>> invoicesCreated = >> FastList.newInstance(); >> - Map<String, List<Map<String, Object>>> commissionParties = >> FastMap.newInstance(); >> + List<Map<String, String>> invoicesCreated = new >> LinkedList<Map<String,String>>(); >> + Map<String, List<Map<String, Object>>> commissionParties = >> new HashMap<String, List<Map<String,Object>>>(); >> for (String salesInvoiceId : salesInvoiceIds) { >> List<String> salesRepPartyIds = >> UtilGenerics.checkList(context.get("partyIds")); >> BigDecimal amountTotal = >> InvoiceWorker.getInvoiceTotal(delegator, salesInvoiceId); >> @@ -927,7 +926,7 @@ public class InvoiceServices { >> Timestamp now = UtilDateTime.nowTimestamp(); >> // Create invoice for each commission receiving party >> for (Map.Entry<String, List<Map<String, Object>>> >> commissionParty : commissionParties.entrySet()) { >> - List<GenericValue> toStore = FastList.newInstance(); >> + List<GenericValue> toStore = new >> LinkedList<GenericValue>(); >> List<Map<String, Object>> commList = >> commissionParty.getValue(); >> // get the billing parties >> if (UtilValidate.isEmpty(commList)) { >> @@ -941,7 +940,7 @@ public class InvoiceServices { >> Long days = (Long) (commList.get(0)).get("days"); >> // create the invoice record >> // To and From are in commission's sense, opposite for >> invoice >> - Map<String, Object> createInvoiceMap = >> FastMap.newInstance(); >> + Map<String, Object> createInvoiceMap = new >> HashMap<String, Object>(); >> createInvoiceMap.put("partyId", partyIdBillTo); >> createInvoiceMap.put("partyIdFrom", partyIdBillFrom); >> createInvoiceMap.put("invoiceDate", now); >> @@ -1075,7 +1074,7 @@ public class InvoiceServices { >> LocalDispatcher dispatcher = dctx.getDispatcher(); >> String shipmentId = (String) context.get("shipmentId"); >> Locale locale = (Locale) context.get("locale"); >> - List<String> invoicesCreated = FastList.newInstance(); >> + List<String> invoicesCreated = new LinkedList<String>(); >> Map<String, Object> response = ServiceUtil.returnSuccess(); >> GenericValue orderShipment = null; >> String invoicePerShipment = null; >> @@ -1138,7 +1137,7 @@ public class InvoiceServices { >> "AccountingTroubleGettingShipmentEntity", >> UtilMisc.toMap("shipmentId", shipmentId), >> locale)); >> } >> - List<GenericValue> itemIssuances = FastList.newInstance(); >> + List<GenericValue> itemIssuances = new >> LinkedList<GenericValue>(); >> try { >> itemIssuances = >> EntityQuery.use(delegator).select("orderId", "shipmentId") >> .from("ItemIssuance").orderBy("orderId").distinct().queryList(); >> @@ -1154,11 +1153,11 @@ public class InvoiceServices { >> // The orders can now be placed in separate groups, each for >> // 1. The group of orders for which payment is already >> captured. No grouping and action required. >> // 2. The group of orders for which invoice is IN-Process >> status. >> - Map<String, GenericValue> ordersWithInProcessInvoice = >> FastMap.newInstance(); >> + Map<String, GenericValue> ordersWithInProcessInvoice = new >> HashMap<String, GenericValue>(); >> >> for (GenericValue itemIssuance : itemIssuances) { >> String orderId = itemIssuance.getString("orderId"); >> - Map<String, Object> billFields = FastMap.newInstance(); >> + Map<String, Object> billFields = new HashMap<String, >> Object>(); >> billFields.put("orderId", orderId); >> >> GenericValue orderItemBilling = null; >> @@ -1191,7 +1190,7 @@ public class InvoiceServices { >> // For In-Process invoice, move the status to ready and >> capture the payment >> for (GenericValue invoice : >> ordersWithInProcessInvoice.values()) { >> String invoiceId = invoice.getString("invoiceId"); >> - Map<String, Object> setInvoiceStatusResult = >> FastMap.newInstance(); >> + Map<String, Object> setInvoiceStatusResult = new >> HashMap<String, Object>(); >> try { >> setInvoiceStatusResult = >> dispatcher.runSync("setInvoiceStatus", UtilMisc.<String, >> Object>toMap("invoiceId", invoiceId, "statusId", "INVOICE_READY", >> "userLogin", userLogin)); >> } catch (GenericServiceException e) { >> @@ -1238,7 +1237,7 @@ public class InvoiceServices { >> boolean purchaseShipmentFound = false; >> boolean dropShipmentFound = false; >> >> - List<String> invoicesCreated = FastList.newInstance(); >> + List<String> invoicesCreated = new LinkedList<String>(); >> >> //DEJ20060520: not used? planned to be used? List >> shipmentIdList = new LinkedList(); >> for (String tmpShipmentId : shipmentIds) { >> @@ -1321,17 +1320,17 @@ public class InvoiceServices { >> } >> >> // group items by order >> - Map<String, List<GenericValue>> shippedOrderItems = >> FastMap.newInstance(); >> + Map<String, List<GenericValue>> shippedOrderItems = new >> HashMap<String, List<GenericValue>>(); >> for (GenericValue item : items) { >> String orderId = item.getString("orderId"); >> String orderItemSeqId = item.getString("orderItemSeqId"); >> List<GenericValue> itemsByOrder = >> shippedOrderItems.get(orderId); >> if (itemsByOrder == null) { >> - itemsByOrder = FastList.newInstance(); >> + itemsByOrder = new LinkedList<GenericValue>(); >> } >> >> // check and make sure we haven't already billed for >> this issuance or shipment receipt >> - List<EntityCondition> billFields = FastList.newInstance(); >> + List<EntityCondition> billFields = new >> LinkedList<EntityCondition>(); >> billFields.add(EntityCondition.makeCondition("orderId", orderId)); >> billFields.add(EntityCondition.makeCondition("orderItemSeqId", >> orderItemSeqId)); >> billFields.add(EntityCondition.makeCondition("statusId", >> EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED")); >> @@ -1374,10 +1373,10 @@ public class InvoiceServices { >> List<GenericValue> billItems = >> shippedOrderItems.get(orderId); >> >> // a new list to be used to pass to the create invoice >> service >> - List<GenericValue> toBillItems = FastList.newInstance(); >> + List<GenericValue> toBillItems = new >> LinkedList<GenericValue>(); >> >> // map of available quantities so we only have to calc >> once >> - Map<String, BigDecimal> itemQtyAvail = >> FastMap.newInstance(); >> + Map<String, BigDecimal> itemQtyAvail = new >> HashMap<String, BigDecimal>(); >> >> // now we will check each issuance and make sure it >> hasn't already been billed >> for (GenericValue issue : billItems) { >> @@ -1391,7 +1390,7 @@ public class InvoiceServices { >> >> BigDecimal billAvail = >> itemQtyAvail.get(issue.getString("orderItemSeqId")); >> if (billAvail == null) { >> - List<EntityCondition> lookup = >> FastList.newInstance(); >> + List<EntityCondition> lookup = new >> LinkedList<EntityCondition>(); >> lookup.add(EntityCondition.makeCondition("orderId", orderId)); >> lookup.add(EntityCondition.makeCondition("orderItemSeqId", >> issue.get("orderItemSeqId"))); >> lookup.add(EntityCondition.makeCondition("statusId", >> EntityOperator.NOT_EQUAL, "INVOICE_CANCELLED")); >> @@ -1514,7 +1513,7 @@ public class InvoiceServices { >> } >> >> // Total the additional shipping charges for the >> shipments >> - Map<GenericValue, BigDecimal> >> additionalShippingCharges = FastMap.newInstance(); >> + Map<GenericValue, BigDecimal> >> additionalShippingCharges = new HashMap<GenericValue, BigDecimal>(); >> BigDecimal totalAdditionalShippingCharges = ZERO; >> if (UtilValidate.isNotEmpty(invoiceableShipments)) { >> for (GenericValue shipment : >> invoiceableShipments) { >> @@ -1533,7 +1532,7 @@ public class InvoiceServices { >> GenericValue shipment = entry.getKey(); >> BigDecimal additionalShippingCharge = >> entry.getValue(); >> String shipmentId = >> shipment.getString("shipmentId"); >> - Map<String, Object> >> createOrderAdjustmentContext = FastMap.newInstance(); >> + Map<String, Object> >> createOrderAdjustmentContext = new HashMap<String, Object>(); >> createOrderAdjustmentContext.put("orderId", orderId); >> createOrderAdjustmentContext.put("orderAdjustmentTypeId", >> "SHIPPING_CHARGES"); >> String addtlChargeDescription = >> shipment.getString("addtlShippingChargeDesc"); >> @@ -1566,8 +1565,8 @@ public class InvoiceServices { >> "AccountingTroubleCallingCreateInvoicesFromShipmentService", locale)); >> } >> >> - List<Object> emptyList = >> FastList.newInstance(); >> - Map<String, Object> calcTaxContext = >> FastMap.newInstance(); >> + List<Object> emptyList = new >> LinkedList<Object>(); >> + Map<String, Object> calcTaxContext = new >> HashMap<String, Object>(); >> calcTaxContext.put("productStoreId", >> orh.getProductStoreId()); >> calcTaxContext.put("payToPartyId", >> payToParty.getString("partyId")); >> calcTaxContext.put("billToPartyId", >> billToParty.getString("partyId")); >> @@ -1761,7 +1760,7 @@ public class InvoiceServices { >> boolean salesReturnFound = false; >> boolean purchaseReturnFound = false; >> >> - List<String> invoicesCreated = FastList.newInstance(); >> + List<String> invoicesCreated = new LinkedList<String>(); >> try { >> >> // get the shipment and validate that it is a sales return >> @@ -1792,7 +1791,7 @@ public class InvoiceServices { >> } >> >> // group the shipments by returnId (because we want a >> seperate itemized invoice for each return) >> - Map<String, List<GenericValue>> >> itemsShippedGroupedByReturn = FastMap.newInstance(); >> + Map<String, List<GenericValue>> >> itemsShippedGroupedByReturn = new HashMap<String, List<GenericValue>>(); >> >> for (GenericValue item : shippedItems) { >> String returnId = null; >> @@ -1824,7 +1823,7 @@ public class InvoiceServices { >> // get the List of items shipped to/from this returnId >> List<GenericValue> billItems = >> itemsShippedGroupedByReturn.get(returnId); >> if (billItems == null) { >> - billItems = FastList.newInstance(); >> + billItems = new LinkedList<GenericValue>(); >> } >> >> // add our item to the group and put it back in the >> map >> @@ -2180,7 +2179,7 @@ public class InvoiceServices { >> UtilMisc.toMap("invoiceId", invoiceId), locale)); >> } >> >> - Map<String, BigDecimal> payments = FastMap.newInstance(); >> + Map<String, BigDecimal> payments = new HashMap<String, >> BigDecimal>(); >> Timestamp paidDate = null; >> for (GenericValue payAppl : paymentAppl) { >> payments.put(payAppl.getString("paymentId"), >> payAppl.getBigDecimal("amountApplied")); >> @@ -2239,7 +2238,7 @@ public class InvoiceServices { >> amount = >> baseAmount.multiply(multiplier).divide(divisor, decimals, rounding); >> } >> if (amount.signum() != 0) { >> - Map<String, Object> createInvoiceItemContext = >> FastMap.newInstance(); >> + Map<String, Object> createInvoiceItemContext = new >> HashMap<String, Object>(); >> createInvoiceItemContext.put("invoiceId", invoiceId); >> createInvoiceItemContext.put("invoiceItemSeqId", invoiceItemSeqId); >> createInvoiceItemContext.put("invoiceItemTypeId", >> getInvoiceItemType(delegator, adj.getString("orderAdjustmentTypeId"), >> null, invoiceTypeId, "INVOICE_ADJ")); >> @@ -2268,7 +2267,7 @@ public class InvoiceServices { >> } >> >> // Create the OrderAdjustmentBilling record >> - Map<String, Object> >> createOrderAdjustmentBillingContext = FastMap.newInstance(); >> + Map<String, Object> >> createOrderAdjustmentBillingContext = new HashMap<String, Object>(); >> createOrderAdjustmentBillingContext.put("orderAdjustmentId", >> adj.getString("orderAdjustmentId")); >> createOrderAdjustmentBillingContext.put("invoiceId", invoiceId); >> createOrderAdjustmentBillingContext.put("invoiceItemSeqId", >> invoiceItemSeqId); >> @@ -2295,7 +2294,7 @@ public class InvoiceServices { >> amount = percent.multiply(divisor); >> } >> if (amount.signum() != 0) { >> - Map<String, Object> createInvoiceItemContext = >> FastMap.newInstance(); >> + Map<String, Object> createInvoiceItemContext = new >> HashMap<String, Object>(); >> createInvoiceItemContext.put("invoiceId", invoiceId); >> createInvoiceItemContext.put("invoiceItemSeqId", invoiceItemSeqId); >> createInvoiceItemContext.put("invoiceItemTypeId", >> getInvoiceItemType(delegator, adj.getString("orderAdjustmentTypeId"), >> null, invoiceTypeId, "INVOICE_ADJ")); >> @@ -2324,7 +2323,7 @@ public class InvoiceServices { >> } >> >> // Create the OrderAdjustmentBilling record >> - Map<String, Object> >> createOrderAdjustmentBillingContext = FastMap.newInstance(); >> + Map<String, Object> >> createOrderAdjustmentBillingContext = new HashMap<String, Object>(); >> createOrderAdjustmentBillingContext.put("orderAdjustmentId", >> adj.getString("orderAdjustmentId")); >> createOrderAdjustmentBillingContext.put("invoiceId", invoiceId); >> createOrderAdjustmentBillingContext.put("invoiceItemSeqId", >> invoiceItemSeqId); >> @@ -2353,7 +2352,7 @@ public class InvoiceServices { >> if (terms != null) { >> for (GenericValue term : terms) { >> >> - Map<String, Object> createInvoiceTermContext = >> FastMap.newInstance(); >> + Map<String, Object> createInvoiceTermContext = new >> HashMap<String, Object>(); >> createInvoiceTermContext.put("invoiceId", invoiceId); >> createInvoiceTermContext.put("invoiceItemSeqId", "_NA_"); >> createInvoiceTermContext.put("termTypeId", >> term.get("termTypeId")); >> @@ -2443,7 +2442,7 @@ public class InvoiceServices { >> String taxAuthGeoId = (String) context.get("taxAuthGeoId"); >> String useHighestAmount = (String) >> context.get("useHighestAmount"); >> >> - List<String> errorMessageList = FastList.newInstance(); >> + List<String> errorMessageList = new LinkedList<String>(); >> >> if (debug) Debug.logInfo("updatePaymentApplicationDefBd >> input parameters..." + >> " defaultInvoiceProcessing: " + >> defaultInvoiceProcessing + >> @@ -3357,8 +3356,8 @@ public class InvoiceServices { >> String csvString = >> Charset.forName(encoding).decode(fileBytes).toString(); >> final BufferedReader csvReader = new BufferedReader(new >> StringReader(csvString)); >> CSVFormat fmt = CSVFormat.DEFAULT.withHeader(); >> - List<String> errMsgs = FastList.newInstance(); >> - List<String> newErrMsgs = FastList.newInstance(); >> + List<String> errMsgs = new LinkedList<String>(); >> + List<String> newErrMsgs = new LinkedList<String>(); >> String lastInvoiceId = null; >> String currentInvoiceId = null; >> String newInvoiceId = null; >> @@ -3395,7 +3394,7 @@ public class InvoiceServices { >> >> // invoice validation >> try { >> - newErrMsgs = FastList.newInstance(); >> + newErrMsgs = new LinkedList<String>(); >> if >> (UtilValidate.isEmpty(invoice.get("partyIdFrom"))) { >> newErrMsgs.add("Line number " + >> rec.getRecordNumber() + ": Mandatory Party Id From and Party Id From >> Trans missing for invoice: " + currentInvoiceId); >> } else if >> (EntityQuery.use(delegator).from("Party").where("partyId", >> invoice.get("partyIdFrom")).queryOne() == null) { >> @@ -3459,7 +3458,7 @@ public class InvoiceServices { >> } >> // invoice item validation >> try { >> - newErrMsgs = FastList.newInstance(); >> + newErrMsgs = new LinkedList<String>(); >> if >> (UtilValidate.isEmpty(invoiceItem.get("invoiceItemSeqId"))) { >> newErrMsgs.add("Line number " + >> rec.getRecordNumber() + ": Mandatory item sequence Id missing for >> invoice: " + currentInvoiceId); >> } >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java >> (original) >> +++ >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceWorker.java >> Fri Apr 10 20:22:54 2015 >> @@ -21,14 +21,13 @@ package org.ofbiz.accounting.invoice; >> import java.math.BigDecimal; >> import java.math.MathContext; >> import java.sql.Timestamp; >> +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.UtilDateTime; >> import org.ofbiz.base.util.UtilMisc; >> @@ -114,7 +113,7 @@ public class InvoiceWorker { >> >> /** Method to get the taxable invoice item types as a List of >> invoiceItemTypeIds. These are identified in Enumeration with >> enumTypeId TAXABLE_INV_ITM_TY. */ >> public static List<String> >> getTaxableInvoiceItemTypeIds(Delegator delegator) throws >> GenericEntityException { >> - List<String> typeIds = FastList.newInstance(); >> + List<String> typeIds = new LinkedList<String>(); >> List<GenericValue> invoiceItemTaxTypes = >> EntityQuery.use(delegator).from("Enumeration").where("enumTypeId", >> "TAXABLE_INV_ITM_TY") >> .cache().queryList(); >> for (GenericValue invoiceItemTaxType : invoiceItemTaxTypes) { >> @@ -586,7 +585,7 @@ public class InvoiceWorker { >> @Deprecated >> public static Map<String, Object> >> getInvoiceTaxByTaxAuthGeoAndParty(GenericValue invoice) { >> BigDecimal taxGrandTotal = ZERO; >> - List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = >> FastList.newInstance(); >> + List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = new >> LinkedList<Map<String,Object>>(); >> List<GenericValue> invoiceItems = null; >> if (UtilValidate.isNotEmpty(invoice)) { >> try { >> @@ -634,7 +633,7 @@ public class InvoiceWorker { >> } >> } >> } >> - Map<String, Object> result = FastMap.newInstance(); >> + Map<String, Object> result = new HashMap<String, Object>(); >> result.put("taxByTaxAuthGeoAndPartyList", >> taxByTaxAuthGeoAndPartyList); >> result.put("taxGrandTotal", taxGrandTotal); >> return result; >> @@ -647,7 +646,7 @@ public class InvoiceWorker { >> * will not account for tax lines that do not contain a >> taxAuthPartyId >> */ >> public static Map<String, Set<String>> >> getInvoiceTaxAuthPartyAndGeos (GenericValue invoice) { >> - Map<String, Set<String>> result = FastMap.newInstance(); >> + Map<String, Set<String>> result = new HashMap<String, >> Set<String>>(); >> >> if (invoice == null) >> throw new IllegalArgumentException("Invoice cannot be >> null."); >> @@ -668,7 +667,7 @@ public class InvoiceWorker { >> String taxAuthGeoId = >> invoiceItem.getString("taxAuthGeoId"); >> if (UtilValidate.isNotEmpty(taxAuthPartyId)) { >> if (!result.containsKey(taxAuthPartyId)) { >> - Set<String> taxAuthGeos = >> FastSet.newInstance(); >> + Set<String> taxAuthGeos = new >> HashSet<String>(); >> taxAuthGeos.add(taxAuthGeoId); >> result.put(taxAuthPartyId, taxAuthGeos); >> } else { >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java?rev=1672752&r1=1672751&r2=1672752&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java >> (original) >> +++ >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java >> Fri Apr 10 20:22:54 2015 >> @@ -23,12 +23,11 @@ import java.util.Collections; >> import java.util.Comparator; >> 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 org.ofbiz.base.util.Debug; >> import org.ofbiz.base.util.GeneralException; >> import org.ofbiz.base.util.UtilDateTime; >> @@ -66,7 +65,7 @@ public class BillingAccountWorker { >> } >> >> public static List<Map<String, Object>> >> makePartyBillingAccountList(GenericValue userLogin, String >> currencyUomId, String partyId, Delegator delegator, LocalDispatcher >> dispatcher) throws GeneralException { >> - List<Map<String, Object>> billingAccountList = >> FastList.newInstance(); >> + List<Map<String, Object>> billingAccountList = new >> LinkedList<Map<String,Object>>(); >> >> Map<String, Object> agentResult = >> dispatcher.runSync("getRelatedParties", UtilMisc.<String, >> Object>toMap("userLogin", userLogin, "partyIdFrom", partyId, >> "roleTypeIdFrom", "AGENT", "roleTypeIdTo", >> "CUSTOMER", "partyRelationshipTypeId", "AGENT", >> "includeFromToSwitched", "Y")); >> >> Modified: >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1672752&r1=1672751&r2=1672752&view=diff >> ============================================================================== >> >> --- >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java >> (original) >> +++ >> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java >> Fri Apr 10 20:22:54 2015 >> @@ -20,13 +20,12 @@ package org.ofbiz.accounting.payment; >> >> import java.math.BigDecimal; >> import java.sql.Timestamp; >> +import java.util.HashMap; >> import java.util.List; >> import java.util.Locale; >> import java.util.Map; >> import java.util.Random; >> >> -import javolution.util.FastMap; >> - >> import org.ofbiz.base.util.Debug; >> import org.ofbiz.base.util.GeneralException; >> import org.ofbiz.base.util.UtilDateTime; >> @@ -412,7 +411,7 @@ public class GiftCertificateServices { >> // obtain the order information >> OrderReadHelper orh = new OrderReadHelper(delegator, >> orderPaymentPreference.getString("orderId")); >> >> - Map<String, Object> redeemCtx = FastMap.newInstance(); >> + Map<String, Object> redeemCtx = new HashMap<String, >> Object>(); >> redeemCtx.put("userLogin", userLogin); >> redeemCtx.put("productStoreId", orh.getProductStoreId()); >> redeemCtx.put("cardNumber", giftCard.get("finAccountId")); >> @@ -657,7 +656,7 @@ public class GiftCertificateServices { >> currency = >> EntityUtilProperties.getPropertyValue("general.properties", >> "currency.uom.id.default", "USD", delegator); >> } >> >> - Map<String, Object> refundCtx = FastMap.newInstance(); >> + Map<String, Object> refundCtx = new HashMap<String, Object>(); >> refundCtx.put("productStoreId", productStoreId); >> refundCtx.put("currency", currency); >> refundCtx.put("partyId", partyId); >> @@ -803,7 +802,7 @@ public class GiftCertificateServices { >> } >> >> // make a map of answer info >> - Map<String, Object> answerMap = FastMap.newInstance(); >> + Map<String, Object> answerMap = new HashMap<String, Object>(); >> if (responseAnswers != null) { >> for (GenericValue answer : responseAnswers) { >> GenericValue question = null; >> @@ -836,7 +835,7 @@ public class GiftCertificateServices { >> int qtyLoop = quantity.intValue(); >> for (int i = 0; i < qtyLoop; i++) { >> // create a gift certificate >> - Map<String, Object> createGcCtx = FastMap.newInstance(); >> + Map<String, Object> createGcCtx = new HashMap<String, >> Object>(); >> //createGcCtx.put("paymentConfig", paymentConfig); >> createGcCtx.put("productStoreId", productStoreId); >> createGcCtx.put("currency", currency); >> @@ -860,7 +859,7 @@ public class GiftCertificateServices { >> } >> >> // create the fulfillment record >> - Map<String, Object> gcFulFill = FastMap.newInstance(); >> + Map<String, Object> gcFulFill = new HashMap<String, >> Object>(); >> gcFulFill.put("typeEnumId", "GC_ACTIVATE"); >> gcFulFill.put("partyId", partyId); >> gcFulFill.put("orderId", orderId); >> @@ -908,7 +907,7 @@ public class GiftCertificateServices { >> bcc = orderEmails; >> } >> } >> - Map<String, Object> emailCtx = FastMap.newInstance(); >> + Map<String, Object> emailCtx = new HashMap<String, >> Object>(); >> String bodyScreenLocation = >> productStoreEmail.getString("bodyScreenLocation"); >> if (UtilValidate.isEmpty(bodyScreenLocation)) { >> bodyScreenLocation = >> ProductStoreWorker.getDefaultProductStoreEmailScreenLocation(emailType); >> @@ -1031,7 +1030,7 @@ public class GiftCertificateServices { >> } >> >> // make a map of answer info >> - Map<String, Object> answerMap = FastMap.newInstance(); >> + Map<String, Object> answerMap = new HashMap<String, Object>(); >> if (responseAnswers != null) { >> for (GenericValue answer : responseAnswers) { >> GenericValue question = null; >> @@ -1056,7 +1055,7 @@ public class GiftCertificateServices { >> String pinNumber = (String) answerMap.get(pinNumberKey); >> >> // reload the gift card >> - Map<String, Object> reloadCtx = FastMap.newInstance(); >> + Map<String, Object> reloadCtx = new HashMap<String, Object>(); >> reloadCtx.put("productStoreId", productStoreId); >> reloadCtx.put("currency", currency); >> reloadCtx.put("partyId", partyId); >> @@ -1079,7 +1078,7 @@ public class GiftCertificateServices { >> } >> >> // create the fulfillment record >> - Map<String, Object> gcFulFill = FastMap.newInstance(); >> + Map<String, Object> gcFulFill = new HashMap<String, Object>(); >> gcFulFill.put("typeEnumId", "GC_RELOAD"); >> gcFulFill.put("userLogin", userLogin); >> gcFulFill.put("partyId", partyId); >> @@ -1137,7 +1136,7 @@ public class GiftCertificateServices { >> } else { >> answerMap.put("locale", locale); >> >> - Map<String, Object> emailCtx = FastMap.newInstance(); >> + Map<String, Object> emailCtx = new HashMap<String, >> Object>(); >> String bodyScreenLocation = >> productStoreEmail.getString("bodyScreenLocation"); >> if (UtilValidate.isEmpty(bodyScreenLocation)) { >> bodyScreenLocation = >> ProductStoreWorker.getDefaultProductStoreEmailScreenLocation(emailType); >> @@ -1231,7 +1230,7 @@ public class GiftCertificateServices { >> Debug.logInfo("Returnable INFO : " + returnableQuantity >> + " @ " + returnablePrice + " :: " + orderItem, module); >> >> // create the return header >> - Map<String, Object> returnHeaderInfo = >> FastMap.newInstance(); >> + Map<String, Object> returnHeaderInfo = new >> HashMap<String, Object>(); >> returnHeaderInfo.put("fromPartyId", partyId); >> returnHeaderInfo.put("userLogin", userLogin); >> Map<String, Object> returnHeaderResp = null; >> @@ -1261,7 +1260,7 @@ public class GiftCertificateServices { >> } >> >> // create the return item >> - Map<String, Object> returnItemInfo = FastMap.newInstance(); >> + Map<String, Object> returnItemInfo = new HashMap<String, >> Object>(); >> returnItemInfo.put("returnId", returnId); >> returnItemInfo.put("returnReasonId", "RTN_DIG_FILL_FAIL"); >> returnItemInfo.put("returnTypeId", "RTN_REFUND"); >> @@ -1311,7 +1310,7 @@ public class GiftCertificateServices { >> } >> >> // update the status to received so it can process >> - Map<String, Object> updateReturnInfo = >> FastMap.newInstance(); >> + Map<String, Object> updateReturnInfo = new >> HashMap<String, Object>(); >> updateReturnInfo.put("returnId", returnId); >> updateReturnInfo.put("statusId", "RETURN_RECEIVED"); >> updateReturnInfo.put("currentStatusId", >> "RETURN_REQUESTED"); >> >> |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |