You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/05/10 08:24:20 UTC
svn commit: r655016 - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/tax/
applications/content/src/org/ofbiz/content/...
Author: lektran
Date: Fri May 9 23:24:19 2008
New Revision: 655016
URL: http://svn.apache.org/viewvc?rev=655016&view=rev
Log:
Removed more calls to deprecated GenericDelegator methods
Modified:
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/PaymentGatewayServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/SimpleTaxServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.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/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
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=655016&r1=655015&r2=655016&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 May 9 23:24:19 2008
@@ -1110,7 +1110,7 @@
List orderItemAssocs = null;
try {
if (purchaseShipmentFound) {
- items = delegator.findByCondition("ShipmentReceipt", shipmentIdsCond, null, UtilMisc.toList("shipmentId"));
+ items = delegator.findList("ShipmentReceipt", shipmentIdsCond, null, UtilMisc.toList("shipmentId"), null, false);
// filter out items which have been received but are not actually owned by an internal organization, so they should not be on a purchase invoice
if (items != null) {
Iterator itemsIter = items.iterator();
@@ -1125,7 +1125,7 @@
}
} else if (dropShipmentFound) {
- List shipments = delegator.findByCondition("Shipment", shipmentIdsCond, null, null);
+ List shipments = delegator.findList("Shipment", shipmentIdsCond, null, null, null, false);
// Get the list of purchase order IDs related to the shipments
List purchaseOrderIds = EntityUtil.getFieldListFromEntityList(shipments, "primaryOrderId", true);
@@ -1134,17 +1134,17 @@
// If a sales invoice is being created for a drop shipment, we have to reference the original sales order items
// Get the list of the linked orderIds (original sales orders)
- orderItemAssocs = delegator.findByCondition("OrderItemAssoc", new EntityExpr("toOrderId", EntityOperator.IN, purchaseOrderIds), null, null);
+ orderItemAssocs = delegator.findList("OrderItemAssoc", new EntityExpr("toOrderId", EntityOperator.IN, purchaseOrderIds), null, null, null, false);
// Get only the order items which are indirectly related to the purchase order - this limits the list to the drop ship group(s)
items = EntityUtil.getRelated("FromOrderItem", orderItemAssocs);
} else {
// If it's a purchase invoice being created, the order items for that purchase orders can be used directly
- items = delegator.findByCondition("OrderItem", new EntityExpr("orderId", EntityOperator.IN, purchaseOrderIds), null, null);
+ items = delegator.findList("OrderItem", new EntityExpr("orderId", EntityOperator.IN, purchaseOrderIds), null, null, null, false);
}
} else {
- items = delegator.findByCondition("ItemIssuance", shipmentIdsCond, null, UtilMisc.toList("shipmentId"));
+ items = delegator.findList("ItemIssuance", shipmentIdsCond, null, UtilMisc.toList("shipmentId"), null, false);
}
} catch (GenericEntityException e) {
String errMsg = UtilProperties.getMessage(resource, "AccountingProblemGettingItemsFromShipments", locale);
@@ -1328,12 +1328,12 @@
List invoiceableShipmentConds = UtilMisc.toList(
new EntityExpr("primaryOrderId", EntityOperator.IN, invoiceablePrimaryOrderIds),
new EntityExpr("shipmentId", EntityOperator.IN, shipmentIds));
- invoiceableShipments = delegator.findByCondition("Shipment", new EntityConditionList(invoiceableShipmentConds, EntityOperator.AND), null, null);
+ invoiceableShipments = delegator.findList("Shipment", new EntityConditionList(invoiceableShipmentConds, EntityOperator.AND), null, null, null, false);
}
} else {
List invoiceableShipmentIds = EntityUtil.getFieldListFromEntityList(toBillItems, "shipmentId", true);
if (! UtilValidate.isEmpty(invoiceableShipmentIds)) {
- invoiceableShipments = delegator.findByCondition("Shipment", new EntityExpr("shipmentId", EntityOperator.IN, invoiceableShipmentIds), null, null);
+ invoiceableShipments = delegator.findList("Shipment", new EntityExpr("shipmentId", EntityOperator.IN, invoiceableShipmentIds), null, null, null, false);
}
}
} catch( GenericEntityException e ) {
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=655016&r1=655015&r2=655016&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 May 9 23:24:19 2008
@@ -103,7 +103,7 @@
new EntityExpr("invoiceId", EntityOperator.EQUALS, invoice.get("invoiceId")),
new EntityExpr("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator))
), EntityOperator.AND);
- invoiceTaxItems = delegator.findByCondition("InvoiceItem", condition, null, null);
+ invoiceTaxItems = delegator.findList("InvoiceItem", condition, null, null, null, false);
} catch (GenericEntityException e) {
Debug.logError(e, "Trouble getting InvoiceItem list", module);
}
@@ -420,7 +420,7 @@
EntityOperator.AND);
try {
- paymentApplications = delegator.findByCondition("PaymentAndApplication", conditions, null, UtilMisc.toList("effectiveDate"));
+ paymentApplications = delegator.findList("PaymentAndApplication", conditions, null, UtilMisc.toList("effectiveDate"), null, false);
} catch (GenericEntityException e) {
Debug.logError(e, "Trouble getting paymentApplicationlist", module);
}
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=655016&r1=655015&r2=655016&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 May 9 23:24:19 2008
@@ -79,7 +79,7 @@
EntityCondition barFindCond = new EntityConditionList(UtilMisc.toList(
new EntityExpr("partyId", EntityOperator.IN, relatedPartyIdList),
new EntityExpr("roleTypeId", EntityOperator.EQUALS, "BILL_TO_CUSTOMER")), EntityOperator.AND);
- List billingAccountRoleList = delegator.findByCondition("BillingAccountRole", barFindCond, null, null);
+ List<GenericValue> billingAccountRoleList = delegator.findList("BillingAccountRole", barFindCond, null, null, null, false);
billingAccountRoleList = EntityUtil.filterByDate(billingAccountRoleList);
if (billingAccountRoleList != null && billingAccountRoleList.size() > 0) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Fri May 9 23:24:19 2008
@@ -690,7 +690,7 @@
EntityExpr orderExpr = new EntityExpr("orderId", EntityOperator.EQUALS, orderId);
EntityCondition con4 = new EntityConditionList(UtilMisc.toList(con3, orderExpr), EntityOperator.AND);
- paymentPrefs = delegator.findByCondition("OrderPaymentPreference", con4, null, null);
+ paymentPrefs = delegator.findList("OrderPaymentPreference", con4, null, null, null, false);
} catch (GenericEntityException gee) {
Debug.logError(gee, "Problems getting entity record(s), see stack trace", module);
result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR);
@@ -1421,7 +1421,7 @@
new EntityExpr("invoiceId", EntityOperator.EQUALS, GenericEntity.NULL_FIELD));
EntityCondition conditions = new EntityConditionList(conditionList, EntityOperator.AND);
- List paymentApplications = delegator.findByCondition("PaymentApplication", conditions, null, UtilMisc.toList("-amountApplied"));
+ List paymentApplications = delegator.findList("PaymentApplication", conditions, null, UtilMisc.toList("-amountApplied"), null, false);
if (UtilValidate.isNotEmpty(paymentApplications)) {
Iterator paymentApplicationsIt = paymentApplications.iterator();
while (paymentApplicationsIt.hasNext()) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/SimpleTaxServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/SimpleTaxServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/SimpleTaxServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/SimpleTaxServices.java Fri May 9 23:24:19 2008
@@ -144,7 +144,7 @@
List orderList = UtilMisc.toList("minItemPrice", "minPurchase", "fromDate");
try {
- List lookupList = delegator.findByCondition("SimpleSalesTaxLookup", mainCondition, null, orderList);
+ List lookupList = delegator.findList("SimpleSalesTaxLookup", mainCondition, null, orderList, null, false);
List filteredList = EntityUtil.filterByDate(lookupList);
if (filteredList.size() == 0) {
@@ -228,7 +228,7 @@
ptiConditionList.add(new EntityExpr(new EntityExpr("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, new EntityExpr("thruDate", EntityOperator.GREATER_THAN, nowTimestamp)));
EntityCondition ptiCondition = new EntityConditionList(ptiConditionList, EntityOperator.AND);
// sort by -fromDate to get the newest (largest) first, just in case there is more than one, we only want the most recent valid one, should only be one per jurisdiction...
- List partyTaxAuthInfos = delegator.findByCondition("PartyTaxAuthInfo", ptiCondition, null, UtilMisc.toList("-fromDate"));
+ List partyTaxAuthInfos = delegator.findList("PartyTaxAuthInfo", ptiCondition, null, UtilMisc.toList("-fromDate"), null, false);
if (partyTaxAuthInfos.size() > 0) {
GenericValue partyTaxAuthInfo = (GenericValue) partyTaxAuthInfos.get(0);
adjMap.put("customerReferenceId", partyTaxAuthInfo.get("partyTaxId"));
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Fri May 9 23:24:19 2008
@@ -306,7 +306,7 @@
List orderList = UtilMisc.toList("minItemPrice", "minPurchase", "fromDate");
// finally ready... do the rate query
- List lookupList = delegator.findByCondition("TaxAuthorityRateProduct", mainCondition, null, orderList);
+ List lookupList = delegator.findList("TaxAuthorityRateProduct", mainCondition, null, orderList, null, false);
List filteredList = EntityUtil.filterByDate(lookupList, true);
if (filteredList.size() == 0) {
@@ -402,7 +402,7 @@
ptiConditionList.add(new EntityExpr(new EntityExpr("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, new EntityExpr("thruDate", EntityOperator.GREATER_THAN, nowTimestamp)));
EntityCondition ptiCondition = new EntityConditionList(ptiConditionList, EntityOperator.AND);
// sort by -fromDate to get the newest (largest) first, just in case there is more than one, we only want the most recent valid one, should only be one per jurisdiction...
- List partyTaxInfos = delegator.findByCondition("PartyTaxAuthInfo", ptiCondition, null, UtilMisc.toList("-fromDate"));
+ List partyTaxInfos = delegator.findList("PartyTaxAuthInfo", ptiCondition, null, UtilMisc.toList("-fromDate"), null, false);
boolean foundExemption = false;
if (partyTaxInfos.size() > 0) {
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java Fri May 9 23:24:19 2008
@@ -915,7 +915,7 @@
EntityCondition conditionType = new EntityConditionList(condList, EntityOperator.OR);
EntityCondition conditionMain = new EntityConditionList(UtilMisc.toList( new EntityExpr("contentIdTo", EntityOperator.EQUALS, contentIdTo), conditionType), EntityOperator.AND);
try {
- List listAll = delegator.findByCondition("ContentAssoc", conditionMain, null, UtilMisc.toList("sequenceNum", "fromDate", "createdDate"));
+ List listAll = delegator.findList("ContentAssoc", conditionMain, null, UtilMisc.toList("sequenceNum", "fromDate", "createdDate"), null, false);
List listFiltered = EntityUtil.filterByDate(listAll);
String contentId = (String)context.get("contentId");
String dir = (String)context.get("dir");
@@ -1341,7 +1341,7 @@
condList.add(expr);
EntityConditionList entityCondList = new EntityConditionList(condList, EntityOperator.AND);
try {
- List lst = delegator.findByCondition("ContentAssocDataResourceViewFrom", entityCondList, null, UtilMisc.toList("caSequenceNum", "caFromDate", "createdDate"));
+ List lst = delegator.findList("ContentAssocDataResourceViewFrom", entityCondList, null, UtilMisc.toList("caSequenceNum", "caFromDate", "createdDate"), null, false);
results.put("_LIST_", lst);
} catch(GenericEntityException e) {
Debug.logError(e, module);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java Fri May 9 23:24:19 2008
@@ -97,7 +97,7 @@
List contentRecs = null;
try {
- contentRecs = delegator.findByCondition("ContentAssocViewTo", new EntityConditionList(exprs, EntityOperator.AND), null, UtilMisc.toList("-caFromDate"));
+ contentRecs = delegator.findList("ContentAssocViewTo", new EntityConditionList(exprs, EntityOperator.AND), null, UtilMisc.toList("-caFromDate"), null, false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/compdoc/CompDocServices.java Fri May 9 23:24:19 2008
@@ -175,7 +175,7 @@
String [] fields = {"rootRevisionContentId", "itemContentId", "maxRevisionSeqId", "contentId", "dataResourceId", "contentIdTo", "contentAssocTypeId", "fromDate", "sequenceNum"};
List selectFields = UtilMisc.toListArray(fields);
List orderByFields = UtilMisc.toList("sequenceNum");
- List compDocParts = delegator.findByCondition("ContentAssocRevisionItemView", conditionList, selectFields, orderByFields);
+ List compDocParts = delegator.findList("ContentAssocRevisionItemView", conditionList, selectFields, orderByFields, null, false);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Document document = new Document();
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java Fri May 9 23:24:19 2008
@@ -820,7 +820,7 @@
}
EntityConditionList assocExprList = new EntityConditionList(exprList, EntityOperator.AND);
- List relatedAssocs = delegator.findByCondition("ContentAssoc", assocExprList, new ArrayList(), UtilMisc.toList("fromDate"));
+ List relatedAssocs = delegator.findList("ContentAssoc", assocExprList, null, UtilMisc.toList("fromDate"), null, false);
//if (Debug.infoOn()) Debug.logInfo("in deactivateAssocs, relatedAssocs:" + relatedAssocs, module);
List filteredAssocs = EntityUtil.filterByDate(relatedAssocs);
//if (Debug.infoOn()) Debug.logInfo("in deactivateAssocs, filteredAssocs:" + filteredAssocs, module);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Fri May 9 23:24:19 2008
@@ -157,8 +157,7 @@
List relatedAssocs = null;
try {
//relatedAssocs = delegator.findByCondition(viewName, joinExpr,
- relatedAssocs = delegator.findByCondition(viewName, assocExprList,
- new ArrayList(),UtilMisc.toList("caFromDate"));
+ relatedAssocs = delegator.findList(viewName, assocExprList, null,UtilMisc.toList("caFromDate"), null, false);
} catch(GenericEntityException e) {
return ServiceUtil.returnError(e.getMessage());
}
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Fri May 9 23:24:19 2008
@@ -295,7 +295,7 @@
if (cache) {
assocs = delegator.findByConditionCache("ContentAssoc", new EntityConditionList(exprs, EntityOperator.AND), null, orderBy);
} else {
- assocs = delegator.findByCondition("ContentAssoc", new EntityConditionList(exprs, EntityOperator.AND), null, orderBy);
+ assocs = delegator.findList("ContentAssoc", new EntityConditionList(exprs, EntityOperator.AND), null, orderBy, null, false);
}
assocs = EntityUtil.filterByDate(assocs);
GenericValue subContent = EntityUtil.getFirst(assocs);
@@ -784,7 +784,7 @@
}
EntityConditionList contentCondList = new EntityConditionList(exprListAnd, EntityOperator.AND);
GenericDelegator delegator = currentContent.getDelegator();
- contentList = delegator.findByCondition(contentAssocViewName, contentCondList, null, null);
+ contentList = delegator.findList(contentAssocViewName, contentCondList, null, null, null, false);
return contentList;
}
@@ -854,7 +854,7 @@
}
EntityConditionList assocExprList = new EntityConditionList(exprList, EntityOperator.AND);
//if (Debug.infoOn()) Debug.logInfo(" assocExprList:" + assocExprList , "");
- List relatedAssocs = delegator.findByCondition("ContentAssoc", assocExprList, new ArrayList(), UtilMisc.toList("-fromDate"));
+ List relatedAssocs = delegator.findList("ContentAssoc", assocExprList, null, UtilMisc.toList("-fromDate"), null, false);
//if (Debug.infoOn()) Debug.logInfo(" relatedAssoc:" + relatedAssocs.size() , "");
//for (int i = 0; i < relatedAssocs.size(); i++) {
//GenericValue a = (GenericValue) relatedAssocs.get(i);
@@ -1378,7 +1378,7 @@
}
EntityConditionList contentCondList = new EntityConditionList(exprListAnd, EntityOperator.AND);
- List contentList = delegator.findByCondition("ContentAssocDataResourceViewFrom", contentCondList, null, null);
+ List contentList = delegator.findList("ContentAssocDataResourceViewFrom", contentCondList, null, null, null, false);
List filteredList = EntityUtil.filterByDate(contentList, UtilDateTime.nowTimestamp(), "caFromDate", "caThruDate", true);
return filteredList;
}
Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Fri May 9 23:24:19 2008
@@ -2680,7 +2680,7 @@
findOutgoingProductionRunsStatusConds.add(new EntityExpr("currentStatusId", EntityOperator.EQUALS, "PRUN_RUNNING"));
findOutgoingProductionRunsConds.add(new EntityConditionList(findOutgoingProductionRunsStatusConds, EntityOperator.OR));
- List outgoingProductionRuns = delegator.findByCondition("WorkEffortAndGoods", new EntityConditionList(findOutgoingProductionRunsConds, EntityOperator.AND), null, UtilMisc.toList("-estimatedStartDate"));
+ List outgoingProductionRuns = delegator.findList("WorkEffortAndGoods", new EntityConditionList(findOutgoingProductionRunsConds, EntityOperator.AND), null, UtilMisc.toList("-estimatedStartDate"), null, false);
if (outgoingProductionRuns != null) {
for (int i = 0; i < outgoingProductionRuns.size(); i++) {
GenericValue outgoingProductionRun = (GenericValue)outgoingProductionRuns.get(i);
@@ -2949,7 +2949,7 @@
backordersCondList.add(new EntityExpr("quantityNotAvailable", EntityOperator.GREATER_THAN, new Double(0.0)));
//backordersCondList.add(new EntityExpr(new EntityExpr("statusId", EntityOperator.EQUALS, "ITEM_CREATED"), EntityOperator.OR, new EntityExpr("statusId", EntityOperator.LESS_THAN, "ITEM_APPROVED")));
- List backorders = delegator.findByCondition("OrderItemAndShipGrpInvResAndItem", new EntityConditionList(backordersCondList, EntityOperator.AND), null, UtilMisc.toList("shipBeforeDate"));
+ List backorders = delegator.findList("OrderItemAndShipGrpInvResAndItem", new EntityConditionList(backordersCondList, EntityOperator.AND), null, UtilMisc.toList("shipBeforeDate"), null, false);
Iterator backordersIt = backorders.iterator();
while (backordersIt.hasNext()) {
GenericValue genericResult = (GenericValue) backordersIt.next();
Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original)
+++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Fri May 9 23:24:19 2008
@@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.ListIterator;
import java.util.Map;
+import java.util.Set;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
@@ -248,8 +249,8 @@
List searchConditions = UtilMisc.toList(new EntityExpr("orderTypeId", EntityOperator.EQUALS, "PURCHASE_ORDER"),
new EntityExpr("oiStatusId", EntityOperator.EQUALS, "ITEM_APPROVED"),
new EntityExpr("contactMechId", EntityOperator.IN, facilityContactMechIds));
- List fieldsToSelect = UtilMisc.toList("orderId", "orderItemSeqId", "productId", "quantity", "cancelQuantity", "oiEstimatedDeliveryDate");
- resultList = delegator.findByCondition("OrderHeaderItemAndShipGroup", new EntityConditionList(searchConditions, EntityOperator.AND), fieldsToSelect, UtilMisc.toList("orderDate"));
+ Set fieldsToSelect = UtilMisc.toSet("orderId", "orderItemSeqId", "productId", "quantity", "cancelQuantity", "oiEstimatedDeliveryDate");
+ resultList = delegator.findList("OrderHeaderItemAndShipGroup", new EntityConditionList(searchConditions, EntityOperator.AND), fieldsToSelect, UtilMisc.toList("orderDate"), null, false);
} catch(GenericEntityException e) {
return ServiceUtil.returnError("Problem, we can not find the order items, for more detail look at the log");
@@ -631,7 +632,7 @@
filterByConditions = new EntityExpr("billOfMaterialLevel", EntityOperator.EQUALS, new Long(bomLevel));
}
try{
- listInventoryEventForMRP = delegator.findByCondition("MrpEventView", filterByConditions, null, UtilMisc.toList("productId", "eventDate"));
+ listInventoryEventForMRP = delegator.findList("MrpEventView", filterByConditions, null, UtilMisc.toList("productId", "eventDate"), null, false);
} catch(GenericEntityException e) {
return ServiceUtil.returnError("MRP Error retieving MRP event for the bom level: " + bomLevel + ". Error: " + e.getMessage());
}
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/finaccount/FinAccountHelper.java Fri May 9 23:24:19 2008
@@ -192,7 +192,7 @@
new EntityExpr("finAccountTransTypeId", EntityOperator.EQUALS, "ADJUSTMENT")),
EntityOperator.OR)),
EntityOperator.AND);
- List transSums = delegator.findByCondition("FinAccountTransSum", incrementConditions, UtilMisc.toList("amount"), null);
+ List transSums = delegator.findList("FinAccountTransSum", incrementConditions, UtilMisc.toSet("amount"), null, null, false);
incrementTotal = addFirstEntryAmount(incrementTotal, transSums, "amount", (decimals+1), rounding);
// now find sum of all transactions with decrease the value
@@ -202,7 +202,7 @@
new EntityExpr("currencyUomId", EntityOperator.EQUALS, currencyUomId),
new EntityExpr("finAccountTransTypeId", EntityOperator.EQUALS, "WITHDRAWAL")),
EntityOperator.AND);
- transSums = delegator.findByCondition("FinAccountTransSum", decrementConditions, UtilMisc.toList("amount"), null);
+ transSums = delegator.findList("FinAccountTransSum", decrementConditions, UtilMisc.toSet("amount"), null, null, false);
decrementTotal = addFirstEntryAmount(decrementTotal, transSums, "amount", (decimals+1), rounding);
// the net balance is just the incrementTotal minus the decrementTotal
@@ -229,7 +229,7 @@
EntityUtil.getFilterByDateExpr(asOfDateTime)),
EntityOperator.AND);
- List authSums = delegator.findByCondition("FinAccountAuthSum", authorizationConditions, UtilMisc.toList("amount"), null);
+ List authSums = delegator.findList("FinAccountAuthSum", authorizationConditions, UtilMisc.toSet("amount"), null, null, false);
BigDecimal authorizationsTotal = addFirstEntryAmount(ZERO, authSums, "amount", (decimals+1), rounding);
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Fri May 9 23:24:19 2008
@@ -1999,7 +1999,7 @@
List picked = null;
try {
- picked = orderHeader.getDelegator().findByCondition("PicklistAndBinAndItem", pickedConditions, null, null);
+ picked = orderHeader.getDelegator().findList("PicklistAndBinAndItem", pickedConditions, null, null, null, false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
this.orderHeader = null;
@@ -2675,7 +2675,7 @@
EntityCondition openOrdersCond = new EntityConditionList(openOrdersExprs, EntityOperator.AND);
List openOrders = null;
try {
- openOrders = delegator.findByCondition("OrderHeaderAndItems", openOrdersCond, null, null);
+ openOrders = delegator.findList("OrderHeaderAndItems", openOrdersCond, null, null, null, false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Fri May 9 23:24:19 2008
@@ -3460,7 +3460,7 @@
exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL, "PAYMENT_SETTLED"));
exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL, "PAYMENT_REFUNDED"));
EntityCondition cond = new EntityConditionList(exprs, EntityOperator.AND);
- paymentPrefsToCancel = delegator.findByCondition("OrderPaymentPreference", cond, null, null);
+ paymentPrefsToCancel = delegator.findList("OrderPaymentPreference", cond, null, null, null, false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
throw new GeneralException(e.getMessage());
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java Fri May 9 23:24:19 2008
@@ -163,7 +163,7 @@
new EntityExpr("orderItemStatusId", EntityOperator.NOT_IN, UtilMisc.toList("ITEM_REJECTED", "ITEM_CANCELLED")),
new EntityExpr("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, timePeriodStart)
), EntityOperator.AND);
- GenericValue count = EntityUtil.getFirst( delegator.findByCondition("OrderItemQuantityReportGroupByProduct", prodConditions, UtilMisc.toList("quantityOrdered"), null) );
+ GenericValue count = EntityUtil.getFirst( delegator.findList("OrderItemQuantityReportGroupByProduct", prodConditions, UtilMisc.toSet("quantityOrdered"), null, null, false));
if (count != null) {
sold = count.getDouble("quantityOrdered");
if (sold != null) productsSold.put(productId, sold);
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Fri May 9 23:24:19 2008
@@ -634,7 +634,7 @@
EntityCondition cond = new EntityConditionList(UtilMisc.toList(
new EntityExpr(new EntityExpr("productId", EntityOperator.EQUALS, productId), EntityOperator.OR, new EntityExpr("productIdTo", EntityOperator.EQUALS, productId)),
new EntityExpr("productAssocTypeId", EntityOperator.EQUALS, "PRODUCT_INCOMPATABLE")), EntityOperator.AND);
- productAssocs = delegator.findByCondition("ProductAssoc", cond, null, null);
+ productAssocs = delegator.findList("ProductAssoc", cond, null, null, null, false);
productAssocs = EntityUtil.filterByDate(productAssocs);
List productList = FastList.newInstance();
Iterator iter = productAssocs.iterator();
@@ -666,9 +666,7 @@
EntityCondition cond = new EntityConditionList(UtilMisc.toList(
new EntityExpr("productIdTo", EntityOperator.EQUALS, productId),
new EntityExpr("productAssocTypeId", EntityOperator.EQUALS, "PRODUCT_UPGRADE")), EntityOperator.AND);
- List fieldsToSelect = FastList.newInstance();
- fieldsToSelect.add("productId");
- productList = delegator.findByCondition("ProductAssoc", cond, fieldsToSelect, null);
+ productList = delegator.findList("ProductAssoc", cond, UtilMisc.toSet("productId"), null, null, false);
if (productList != null) {
Iterator sciIter = cart.iterator();
while (sciIter.hasNext()) {
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Fri May 9 23:24:19 2008
@@ -233,7 +233,7 @@
exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL, "PAYMENT_DECLINED"));
exprs.add(new EntityExpr("statusId", EntityOperator.NOT_EQUAL, "PAYMENT_SETTLED"));
EntityCondition cond = new EntityConditionList(exprs, EntityOperator.AND);
- orderPaymentPrefs = delegator.findByCondition("OrderPaymentPreference", cond, null, null);
+ orderPaymentPrefs = delegator.findList("OrderPaymentPreference", cond, null, null, null, false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Fri May 9 23:24:19 2008
@@ -378,7 +378,7 @@
// get all promo codes entered, do a query with an IN condition to see if any of those are related
EntityCondition codeCondition = new EntityExpr(new EntityExpr("productPromoId", EntityOperator.EQUALS, productPromoId), EntityOperator.AND, new EntityExpr("productPromoCodeId", EntityOperator.IN, enteredCodes));
// may want to sort by something else to decide which code to use if there is more than one candidate
- List productPromoCodeList = delegator.findByCondition("ProductPromoCode", codeCondition, null, UtilMisc.toList("productPromoCodeId"));
+ List productPromoCodeList = delegator.findList("ProductPromoCode", codeCondition, null, UtilMisc.toList("productPromoCodeId"), null, false);
Iterator productPromoCodeIter = productPromoCodeList.iterator();
// support multiple promo codes for a single promo, ie if we run into a use limit for one code see if we can find another for this promo
// check the use limit before each pass so if the promo use limit has been hit we don't keep on trying for the promo code use limit, if there is one of course
Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java Fri May 9 23:24:19 2008
@@ -265,7 +265,7 @@
List sort = UtilMisc.toList("-fromDate");
EntityCondition addrCond = new EntityConditionList(addrExprs, EntityOperator.AND);
- List addresses = EntityUtil.filterByDate(delegator.findByCondition("PartyAndPostalAddress", addrCond, null, sort));
+ List addresses = EntityUtil.filterByDate(delegator.findList("PartyAndPostalAddress", addrCond, null, sort, null, false));
//Debug.log("Checking for matching address: " + addrCond.toString() + "[" + addresses.size() + "]", module);
List validFound = FastList.newInstance();
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java Fri May 9 23:24:19 2008
@@ -23,6 +23,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javolution.util.FastMap;
@@ -56,8 +57,8 @@
new EntityExpr("itemStatusId", EntityOperator.NOT_EQUAL, "ITEM_REJECTED"));
purchaseOrderConditions.add(new EntityExpr("orderTypeId", EntityOperator.EQUALS, "PURCHASE_ORDER"));
purchaseOrderConditions.add(new EntityExpr("productId", EntityOperator.EQUALS, productId));
- List purchaseOrders = delegator.findByCondition("OrderHeaderAndItems", new EntityConditionList(purchaseOrderConditions, EntityOperator.AND),
- null, UtilMisc.toList("estimatedDeliveryDate DESC", "orderDate"));
+ List purchaseOrders = delegator.findList("OrderHeaderAndItems", new EntityConditionList(purchaseOrderConditions, EntityOperator.AND),
+ null, UtilMisc.toList("estimatedDeliveryDate DESC", "orderDate"), null, false);
return purchaseOrders;
} catch (GenericEntityException ex) {
Debug.logError("Unable to find outstanding purchase orders for product [" + productId + "] due to " + ex.getMessage() + " - returning null", module);
@@ -106,7 +107,7 @@
* @return Map of productIds to quantities outstanding.
*/
public static Map getOutstandingProductQuantities(Collection productIds, String orderTypeId, GenericDelegator delegator) {
- List fieldsToSelect = UtilMisc.toList("productId", "quantityOpen");
+ Set fieldsToSelect = UtilMisc.toSet("productId", "quantityOpen");
List condList = UtilMisc.toList(
new EntityExpr("orderTypeId", EntityOperator.EQUALS, orderTypeId),
new EntityExpr("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED"),
@@ -123,7 +124,7 @@
Map results = FastMap.newInstance();
try {
- List orderedProducts = delegator.findByCondition("OrderItemQuantityReportGroupByProduct", conditions, fieldsToSelect, null);
+ List orderedProducts = delegator.findList("OrderItemQuantityReportGroupByProduct", conditions, fieldsToSelect, null, null, false);
for (Iterator iter = orderedProducts.iterator(); iter.hasNext(); ) {
GenericValue value = (GenericValue) iter.next();
results.put(value.getString("productId"), value.getDouble("quantityOpen"));
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java Fri May 9 23:24:19 2008
@@ -73,7 +73,7 @@
// run the query
try {
- orderHeaderList = delegator.findByCondition("OrderHeader", cond, null, UtilMisc.toList("+orderDate"));
+ orderHeaderList = delegator.findList("OrderHeader", cond, null, UtilMisc.toList("+orderDate"), null, false);
} catch (GenericEntityException e) {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Fri May 9 23:24:19 2008
@@ -195,7 +195,7 @@
if (allowCOD) {
// Get the paymentMethodTypeIds of all the orderPaymentPreferences involved with the shipment
- List opps = delegator.findByCondition("OrderPaymentPreference", new EntityExpr("orderId", EntityOperator.IN, orderIdSet), null, null);
+ List opps = delegator.findList("OrderPaymentPreference", new EntityExpr("orderId", EntityOperator.IN, orderIdSet), null, null, null, false);
List paymentMethodTypeIds = EntityUtil.getFieldListFromEntityList(opps, "paymentMethodTypeId", true);
if (paymentMethodTypeIds.size() > 1 || ! paymentMethodTypeIds.contains("EXT_COD")) {
Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Fri May 9 23:24:19 2008
@@ -618,7 +618,7 @@
EntityConditionList findIncomingProductionRunsCondition = new EntityConditionList(findIncomingProductionRunsConds, EntityOperator.AND);
- List incomingProductionRuns = delegator.findByCondition("WorkEffortAndGoods", findIncomingProductionRunsCondition, null, UtilMisc.toList("-estimatedCompletionDate"));
+ List incomingProductionRuns = delegator.findList("WorkEffortAndGoods", findIncomingProductionRunsCondition, null, UtilMisc.toList("-estimatedCompletionDate"), null, false);
Iterator incomingProductionRunsIter = incomingProductionRuns.iterator();
while (incomingProductionRunsIter.hasNext()) {
GenericValue incomingProductionRun = (GenericValue)incomingProductionRunsIter.next();
@@ -689,7 +689,7 @@
findOutgoingProductionRunsConds.add(new EntityConditionList(findOutgoingProductionRunsStatusConds, EntityOperator.OR));
EntityConditionList findOutgoingProductionRunsCondition = new EntityConditionList(findOutgoingProductionRunsConds, EntityOperator.AND);
- List outgoingProductionRuns = delegator.findByCondition("WorkEffortAndGoods", findOutgoingProductionRunsCondition, null, UtilMisc.toList("-estimatedStartDate"));
+ List outgoingProductionRuns = delegator.findList("WorkEffortAndGoods", findOutgoingProductionRunsCondition, null, UtilMisc.toList("-estimatedStartDate"), null, false);
Iterator outgoingProductionRunsIter = outgoingProductionRuns.iterator();
while (outgoingProductionRunsIter.hasNext()) {
GenericValue outgoingProductionRun = (GenericValue)outgoingProductionRunsIter.next();
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Fri May 9 23:24:19 2008
@@ -463,7 +463,7 @@
try {
EntityCondition condition = new EntityExpr("userLoginId", true, EntityOperator.EQUALS, userLoginId, true);
- if (UtilValidate.isNotEmpty(delegator.findByCondition("UserLogin", condition, null, null))) {
+ if (UtilValidate.isNotEmpty(delegator.findList("UserLogin", condition, null, null, null, false))) {
Map messageMap = UtilMisc.toMap("userLoginId", userLoginId);
errMsg = UtilProperties.getMessage(resource,"loginservices.could_not_create_login_user_with_ID_exists", messageMap, locale);
errorMessageList.add(errMsg);
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/period/PeriodServices.java Fri May 9 23:24:19 2008
@@ -64,9 +64,9 @@
// if a periodTypeId was supplied, use it
findClosedConditions.add(new EntityExpr("periodTypeId", EntityOperator.EQUALS, periodTypeId));
}
- List closedTimePeriods = delegator.findByCondition("CustomTimePeriod", new EntityConditionList(findClosedConditions, EntityOperator.AND),
- UtilMisc.toList("customTimePeriodId", "periodTypeId", "isClosed", "fromDate", "thruDate"),
- UtilMisc.toList("thruDate DESC"));
+ List closedTimePeriods = delegator.findList("CustomTimePeriod", new EntityConditionList(findClosedConditions, EntityOperator.AND),
+ UtilMisc.toSet("customTimePeriodId", "periodTypeId", "isClosed", "fromDate", "thruDate"),
+ UtilMisc.toList("thruDate DESC"), null, false);
if ((closedTimePeriods != null) && (closedTimePeriods.size() > 0) && (((GenericValue) closedTimePeriods.get(0)).get("thruDate") != null)) {
lastClosedTimePeriod = (GenericValue) closedTimePeriods.get(0);
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Fri May 9 23:24:19 2008
@@ -1992,7 +1992,7 @@
}
/** Finds Generic Entity records by all of the specified expressions (ie: combined using AND)
- * NOTE 20080502: 24 references
+ * NOTE 20080502: 24 references; all changed to findList
*@param entityName The Name of the Entity as defined in the entity XML file
*@param expressions The expressions to use for the lookup, each consisting of at least a field name, an EntityOperator, and a value to compare to
*@param orderBy The fields of the named entity to order the query by; optionally add a " ASC" for ascending or " DESC" for descending
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java Fri May 9 23:24:19 2008
@@ -403,7 +403,7 @@
new EntityFieldMap(search, EntityOperator.AND),
EntityUtil.getFilterByDateExpr(now)
), EntityOperator.AND);
- return delegator.findByCondition(entityName,searchCondition,null,UtilMisc.toList("-fromDate"));
+ return delegator.findList(entityName, searchCondition, null, UtilMisc.toList("-fromDate"), null, false);
}
public static GenericValue newDatedInclusionEntity(GenericDelegator delegator, String entityName, Map<String, ? extends Object> search) throws GenericEntityException {
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Fri May 9 23:24:19 2008
@@ -925,7 +925,7 @@
List partyRelationships = null;
try {
- partyRelationships = delegator.findByCondition("PartyRelationship", condition, null, null);
+ partyRelationships = delegator.findList("PartyRelationship", condition, null, null, null, false);
} catch (GenericEntityException e) {
Debug.logError(e, "Problem finding PartyRelationships. ", module);
return false;
Modified: ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java (original)
+++ ofbiz/trunk/framework/security/src/org/ofbiz/security/OFBizSecurity.java Fri May 9 23:24:19 2008
@@ -267,7 +267,7 @@
List<GenericValue> roleTest = null;
try {
//Debug.logInfo("Doing Role Security Check on [" + entityName + "]" + "using [" + condition + "]", module);
- roleTest = delegator.findByCondition(entityName, condition, null, null);
+ roleTest = delegator.findList(entityName, condition, null, null, null, false);
} catch (GenericEntityException e) {
Debug.logError(e, "Problems doing role security lookup on entity [" + entityName + "] using [" + condition + "]", module);
return false;
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Fri May 9 23:24:19 2008
@@ -1691,7 +1691,7 @@
if (this.cache) {
values = delegator.findByConditionCache(this.entityName, findCondition, null, this.orderByList);
} else {
- values = delegator.findByCondition(this.entityName, findCondition, null, this.orderByList);
+ values = delegator.findList(this.entityName, findCondition, null, this.orderByList, null, false);
}
// filter-by-date if requested
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Fri May 9 23:24:19 2008
@@ -923,7 +923,7 @@
EntityCondition bySerialNumberCondition = new EntityExpr(new EntityExpr("serialNumber", EntityOperator.EQUALS, serialNum),
EntityOperator.AND, new EntityExpr("productId", EntityOperator.IN, productIdSet));
- List inventoryItemsBySerialNumber = delegator.findByCondition("InventoryItem", bySerialNumberCondition, null, null);
+ List inventoryItemsBySerialNumber = delegator.findList("InventoryItem", bySerialNumberCondition, null, null, null, false);
if (OagisServices.requireSerialNumberExist != null) {
// according to requireSerialNumberExist make sure serialNumber does or does not exist in database, add an error message as needed
@@ -1395,7 +1395,7 @@
EntityCondition bySerialNumberCondition = new EntityExpr(new EntityExpr("serialNumber", EntityOperator.EQUALS, serialNum),
EntityOperator.AND, new EntityExpr("productId", EntityOperator.IN, productIdSet));
- List inventoryItemsBySerialNumber = delegator.findByCondition("InventoryItem", bySerialNumberCondition, null, null);
+ List inventoryItemsBySerialNumber = delegator.findList("InventoryItem", bySerialNumberCondition, null, null, null, false);
// this is a status update, so referenced serial number MUST already exist
if (inventoryItemsBySerialNumber.size() == 0) {
Modified: ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=655016&r1=655015&r2=655016&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original)
+++ ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Fri May 9 23:24:19 2008
@@ -465,7 +465,7 @@
EntityCondition bySerialNumberCondition = new EntityExpr(new EntityExpr("serialNumber", EntityOperator.EQUALS, serialNumber),
EntityOperator.AND, new EntityExpr("productId", EntityOperator.IN, productIdSet));
- List inventoryItemsBySerialNumber = delegator.findByCondition("InventoryItem", bySerialNumberCondition, null, null);
+ List inventoryItemsBySerialNumber = delegator.findList("InventoryItem", bySerialNumberCondition, null, null, null, false);
if (OagisServices.requireSerialNumberExist.booleanValue()) {
if (inventoryItemsBySerialNumber.size() == 0) {
String errMsg = "Referenced serial numbers must already exist, but serial number [" + serialNumber + "] was not found. Product ID(s) considered are: " + productIdSet;
@@ -811,7 +811,7 @@
new EntityExpr("primaryOrderId", EntityOperator.EQUALS, orderId),
new EntityExpr("statusId", EntityOperator.NOT_EQUAL, "SHIPMENT_CANCELLED")
), EntityOperator.AND);
- List shipmentList = delegator.findByCondition("Shipment", findShipmentCondition, null, null);
+ List shipmentList = delegator.findList("Shipment", findShipmentCondition, null, null, null, false);
GenericValue shipment = EntityUtil.getFirst(shipmentList);
if (shipment != null) {