Author: lektran
Date: Fri May 9 04:52:37 2008 New Revision: 654771 URL: http://svn.apache.org/viewvc?rev=654771&view=rev Log: Removed all calls to the deprecated GenericDelegator.findAll(String, List) Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.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/product/src/org/ofbiz/product/catalog/CatalogWorker.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java 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=654771&r1=654770&r2=654771&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 May 9 04:52:37 2008 @@ -887,7 +887,7 @@ // none found; pick one from our set stores try { - GenericValue store = EntityUtil.getFirst(delegator.findAll("ProductStore", UtilMisc.toList("productStoreId"))); + GenericValue store = EntityUtil.getFirst(delegator.findList("ProductStore", null, null, UtilMisc.toList("productStoreId"), null, false)); if (store != null) return store.getString("productStoreId"); } catch (GenericEntityException e) { Modified: ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=654771&r1=654770&r2=654771&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java (original) +++ ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java Fri May 9 04:52:37 2008 @@ -210,7 +210,7 @@ LocalDispatcher dispatcher = dctx.getDispatcher(); try { - List products = delegator.findAll("Product", UtilMisc.toList("isVirtual DESC")); + List products = delegator.findList("Product", null, null, UtilMisc.toList("isVirtual DESC"), null, false); Iterator productsIt = products.iterator(); Long zero = new Long(0); List allProducts = new ArrayList(); Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=654771&r1=654770&r2=654771&view=diff ============================================================================== --- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Fri May 9 04:52:37 2008 @@ -942,7 +942,7 @@ // get the role types try { - List roleTypes = delegator.findAll("RoleType", UtilMisc.toList("description")); + List roleTypes = delegator.findList("RoleType", null, null, UtilMisc.toList("description"), null, false); result.put("roleTypes", roleTypes); } catch (GenericEntityException e) { String errMsg = "Error looking up RoleTypes: " + e.toString(); 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=654771&r1=654770&r2=654771&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 04:52:37 2008 @@ -352,7 +352,7 @@ // replace mapped words List addressMap = null; try { - addressMap = delegator.findAll("AddressMatchMap", UtilMisc.toList("sequenceNum")); + addressMap = delegator.findList("AddressMatchMap", null, null, UtilMisc.toList("sequenceNum"), null, false); } catch (GenericEntityException e) { Debug.logError(e, module); } Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java?rev=654771&r1=654770&r2=654771&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/catalog/CatalogWorker.java Fri May 9 04:52:37 2008 @@ -62,7 +62,7 @@ List catalogs = null; GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); try { - catalogs = delegator.findAll("ProdCatalog", UtilMisc.toList("catalogName")); + catalogs = delegator.findList("ProdCatalog", null, null, UtilMisc.toList("catalogName"), null, false); } catch (GenericEntityException e) { Debug.logError(e, "Error looking up all catalogs", module); } 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=654771&r1=654770&r2=654771&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 04:52:37 2008 @@ -1819,7 +1819,7 @@ *@deprecated Use findList() instead */ public List<GenericValue> findAll(String entityName, String... orderBy) throws GenericEntityException { - return findAll(entityName, Arrays.asList(orderBy)); + return findList(entityName, null, null, Arrays.asList(orderBy), null, false); } /** Finds all Generic entities Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java?rev=654771&r1=654770&r2=654771&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java Fri May 9 04:52:37 2008 @@ -398,7 +398,7 @@ for (int i = 0; i < TEST_COUNT; i++){ delegator.create(delegator.makeValue("Testing", "testingId", getTestId("T2-", i))); } - List<GenericValue> newlyCreatedValues = delegator.findAll("Testing", UtilMisc.toList("testingId")); + List<GenericValue> newlyCreatedValues = delegator.findList("Testing", null, null, UtilMisc.toList("testingId"), null, false); TestCase.assertEquals("Test to create " + TEST_COUNT + " and store one at a time: ", TEST_COUNT, newlyCreatedValues.size()); } catch (GenericEntityException e){ assertTrue("GenericEntityException:" + e.toString(), false); |
Free forum by Nabble | Edit this page |