You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/10/05 02:08:39 UTC
svn commit: r821643 [8/15] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/test/
applications/accounting/src/org/ofbiz/accounting/
applications/accounting/src/org/ofbiz/accounting/agreement/
applications/accounting/src/org/ofbiz/...
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009
@@ -30,7 +30,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -47,7 +47,7 @@
* @param delegator
* @return
*/
- public static List<GenericValue> getOutstandingPurchaseOrders(String productId, GenericDelegator delegator) {
+ public static List<GenericValue> getOutstandingPurchaseOrders(String productId, Delegator delegator) {
try {
List<EntityCondition> purchaseOrderConditions = UtilMisc.<EntityCondition>toList(EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED"),
EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED"),
@@ -72,7 +72,7 @@
* @param delegator
* @return
*/
- public static BigDecimal getOutstandingPurchasedQuantity(String productId, GenericDelegator delegator) {
+ public static BigDecimal getOutstandingPurchasedQuantity(String productId, Delegator delegator) {
BigDecimal qty = BigDecimal.ZERO;
List<GenericValue> purchaseOrders = getOutstandingPurchaseOrders(productId, delegator);
if (UtilValidate.isEmpty(purchaseOrders)) {
@@ -105,7 +105,7 @@
* @param delegator The delegator to use
* @return Map of productIds to quantities outstanding.
*/
- public static Map<String, BigDecimal> getOutstandingProductQuantities(Collection<String> productIds, String orderTypeId, GenericDelegator delegator) {
+ public static Map<String, BigDecimal> getOutstandingProductQuantities(Collection<String> productIds, String orderTypeId, Delegator delegator) {
Set<String> fieldsToSelect = UtilMisc.toSet("productId", "quantityOpen");
List<EntityCondition> condList = UtilMisc.<EntityCondition>toList(
EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, orderTypeId),
@@ -134,12 +134,12 @@
}
/** As above, but for sales orders */
- public static Map<String, BigDecimal> getOutstandingProductQuantitiesForSalesOrders(Collection<String> productIds, GenericDelegator delegator) {
+ public static Map<String, BigDecimal> getOutstandingProductQuantitiesForSalesOrders(Collection<String> productIds, Delegator delegator) {
return getOutstandingProductQuantities(productIds, "SALES_ORDER", delegator);
}
/** As above, but for purchase orders */
- public static Map<String, BigDecimal> getOutstandingProductQuantitiesForPurchaseOrders(Collection<String> productIds, GenericDelegator delegator) {
+ public static Map<String, BigDecimal> getOutstandingProductQuantitiesForPurchaseOrders(Collection<String> productIds, Delegator delegator) {
return getOutstandingProductQuantities(productIds, "PURCHASE_ORDER", delegator);
}
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java Mon Oct 5 00:08:27 2009
@@ -35,7 +35,7 @@
import org.ofbiz.base.util.UtilNumber;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -84,7 +84,7 @@
// utilTimer.timerString("Starting price calc", module);
// utilTimer.setLog(false);
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
Map<String, Object> result = FastMap.newInstance();
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
@@ -711,7 +711,7 @@
return null;
}
- public static List<GenericValue> makeProducePriceRuleList(GenericDelegator delegator, boolean optimizeForLargeRuleSet, String productId, String virtualProductId, String prodCatalogId, String productStoreGroupId, String webSiteId, String partyId, String currencyUomId) throws GenericEntityException {
+ public static List<GenericValue> makeProducePriceRuleList(Delegator delegator, boolean optimizeForLargeRuleSet, String productId, String virtualProductId, String prodCatalogId, String productStoreGroupId, String webSiteId, String partyId, String currencyUomId) throws GenericEntityException {
List<GenericValue> productPriceRules = null;
// At this point we have two options: optimize for large ruleset, or optimize for small ruleset
@@ -863,7 +863,7 @@
public static Map<String, Object> calcPriceResultFromRules(List<GenericValue> productPriceRules, BigDecimal listPrice, BigDecimal defaultPrice, BigDecimal promoPrice,
BigDecimal wholesalePrice, GenericValue maximumPriceValue, GenericValue minimumPriceValue, boolean validPriceFound,
GenericValue averageCostValue, String productId, String virtualProductId, String prodCatalogId, String productStoreGroupId,
- String webSiteId, String partyId, BigDecimal quantity, String currencyUomId, GenericDelegator delegator, Timestamp nowTimestamp) throws GenericEntityException {
+ String webSiteId, String partyId, BigDecimal quantity, String currencyUomId, Delegator delegator, Timestamp nowTimestamp) throws GenericEntityException {
Map<String, Object> calcResults = FastMap.newInstance();
@@ -1108,7 +1108,7 @@
public static boolean checkPriceCondition(GenericValue productPriceCond, String productId, String virtualProductId, String prodCatalogId,
String productStoreGroupId, String webSiteId, String partyId, BigDecimal quantity, BigDecimal listPrice,
- String currencyUomId, GenericDelegator delegator, Timestamp nowTimestamp) throws GenericEntityException {
+ String currencyUomId, Delegator delegator, Timestamp nowTimestamp) throws GenericEntityException {
if (Debug.verboseOn()) Debug.logVerbose("Checking price condition: " + productPriceCond, module);
int compare = 0;
@@ -1284,7 +1284,7 @@
* Calculates the purchase price of a product
*/
public static Map<String, Object> calculatePurchasePrice(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
Map<String, Object> result = FastMap.newInstance();
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java Mon Oct 5 00:08:27 2009
@@ -35,7 +35,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.common.KeywordSearchUtil;
import org.ofbiz.content.data.DataResourceWorker;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
@@ -73,7 +73,7 @@
}
}
- GenericDelegator delegator = product.getDelegator();
+ Delegator delegator = product.getDelegator();
if (delegator == null) return;
String productId = product.getString("productId");
@@ -206,7 +206,7 @@
}
}
- public static void addWeightedDataResourceString(GenericValue drView, int weight, List<String> strings, GenericDelegator delegator, GenericValue product) {
+ public static void addWeightedDataResourceString(GenericValue drView, int weight, List<String> strings, Delegator delegator, GenericValue product) {
Map<String, Object> drContext = UtilMisc.<String, Object>toMap("product", product);
try {
String contentText = DataResourceWorker.renderDataResourceAsText(delegator, drView.getString("dataResourceId"), drContext, null, null, false);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java Mon Oct 5 00:08:27 2009
@@ -39,7 +39,7 @@
import org.ofbiz.base.util.cache.UtilCache;
import org.ofbiz.content.content.ContentWorker;
import org.ofbiz.content.content.ContentWrapper;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.model.ModelUtil;
@@ -96,7 +96,7 @@
return getProductContentAsText(product, productContentTypeId, locale, null, null, null, null, dispatcher);
}
- public static String getProductContentAsText(GenericValue product, String productContentTypeId, Locale locale, String mimeTypeId, String partyId, String roleTypeId, GenericDelegator delegator, LocalDispatcher dispatcher) {
+ public static String getProductContentAsText(GenericValue product, String productContentTypeId, Locale locale, String mimeTypeId, String partyId, String roleTypeId, Delegator delegator, LocalDispatcher dispatcher) {
if (product == null) {
return null;
}
@@ -134,7 +134,7 @@
}
}
- public static void getProductContentAsText(String productId, GenericValue product, String productContentTypeId, Locale locale, String mimeTypeId, String partyId, String roleTypeId, GenericDelegator delegator, LocalDispatcher dispatcher, Writer outWriter) throws GeneralException, IOException {
+ public static void getProductContentAsText(String productId, GenericValue product, String productContentTypeId, Locale locale, String mimeTypeId, String partyId, String roleTypeId, Delegator delegator, LocalDispatcher dispatcher, Writer outWriter) throws GeneralException, IOException {
if (productId == null && product != null) {
productId = product.getString("productId");
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java Mon Oct 5 00:08:27 2009
@@ -40,7 +40,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericPK;
import org.ofbiz.entity.GenericValue;
@@ -72,7 +72,7 @@
*/
public static String updateAllKeywords(HttpServletRequest request, HttpServletResponse response) {
//String errMsg = "";
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Security security = (Security) request.getAttribute("security");
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
@@ -199,7 +199,7 @@
public static String updateProductAssoc(HttpServletRequest request, HttpServletResponse response) {
String errMsg = "";
List<Object> errMsgList = FastList.newInstance();
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Security security = (Security) request.getAttribute("security");
String updateMode = request.getParameter("UPDATE_MODE");
@@ -415,7 +415,7 @@
}
public static String updateProductQuickAdminShipping(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
String variantProductId = request.getParameter("productId0");
@@ -526,7 +526,7 @@
* @return
* @throws GenericEntityException
*/
- private static void setOrCreateProdFeature(GenericDelegator delegator, String productId, List<GenericValue> currentProductFeatureAndAppls,
+ private static void setOrCreateProdFeature(Delegator delegator, String productId, List<GenericValue> currentProductFeatureAndAppls,
String uomId, String productFeatureTypeId, BigDecimal numberSpecified) throws GenericEntityException {
GenericValue productFeatureType = delegator.findByPrimaryKey("ProductFeatureType", UtilMisc.toMap("productFeatureTypeId", productFeatureTypeId));
@@ -584,7 +584,7 @@
}
public static String updateProductQuickAdminSelFeat(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
//GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
String productId = request.getParameter("productId");
@@ -657,7 +657,7 @@
protected static void checkUpdateFeatureApplByDescription(String productId, GenericValue product, String description,
String productFeatureTypeId, GenericValue productFeatureType, String productFeatureApplTypeId,
- Timestamp nowTimestamp, GenericDelegator delegator, Set<String> descriptionsToRemove, Set<String> descriptionsRemoved) throws GenericEntityException {
+ Timestamp nowTimestamp, Delegator delegator, Set<String> descriptionsToRemove, Set<String> descriptionsRemoved) throws GenericEntityException {
if (productFeatureType == null) {
return;
}
@@ -759,7 +759,7 @@
}
public static String removeFeatureApplsByFeatureTypeId(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
//Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
//GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
String productId = request.getParameter("productId");
@@ -795,7 +795,7 @@
}
public static String removeProductFeatureAppl(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
//Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
//GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
String productId = request.getParameter("productId");
@@ -818,7 +818,7 @@
}
public static String addProductToCategories(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productId = request.getParameter("productId");
String fromDate = request.getParameter("fromDate");
if ((fromDate == null) || (fromDate.trim().length() == 0)) {
@@ -848,7 +848,7 @@
}
public static String updateProductCategoryMember(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productId = request.getParameter("productId");
String productCategoryId = request.getParameter("productCategoryId");
String thruDate = request.getParameter("thruDate");
@@ -875,7 +875,7 @@
}
public static String addProductFeatures(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productId = request.getParameter("productId");
String productFeatureApplTypeId = request.getParameter("productFeatureApplTypeId");
String fromDate = request.getParameter("fromDate");
@@ -953,7 +953,7 @@
*/
public static String checkStoreCustomerRole(HttpServletRequest request, HttpServletResponse response) {
HttpSession session = request.getSession();
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
GenericValue productStore = ProductStoreWorker.getProductStore(request);
if (productStore != null && userLogin != null) {
@@ -983,7 +983,7 @@
public static String tellAFriend(HttpServletRequest request, HttpServletResponse response) {
HttpSession session = request.getSession();
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String emailType = "PRDS_TELL_FRIEND";
String defaultScreenLocation = "component://ecommerce/widget/EmailProductScreens.xml#TellFriend";
@@ -1071,7 +1071,7 @@
public static String addProductToComparisonList(HttpServletRequest request, HttpServletResponse response) {
HttpSession session = request.getSession();
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productId = request.getParameter("productId");
GenericValue product = null;
@@ -1109,7 +1109,7 @@
public static String removeProductFromComparisonList(HttpServletRequest request, HttpServletResponse response) {
HttpSession session = request.getSession();
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productId = request.getParameter("productId");
GenericValue product = null;
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java Mon Oct 5 00:08:27 2009
@@ -38,7 +38,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.common.KeywordSearchUtil;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityComparisonOperator;
@@ -70,7 +70,7 @@
public static final String resource = "ProductUiLabels";
public static final String resourceCommon = "CommonUiLabels";
- public static ArrayList parametricKeywordSearch(Map<?, String> featureIdByType, String keywordsString, GenericDelegator delegator, String productCategoryId, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
+ public static ArrayList parametricKeywordSearch(Map<?, String> featureIdByType, String keywordsString, Delegator delegator, String productCategoryId, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
Set<String> featureIdSet = FastSet.newInstance();
if (featureIdByType != null) {
featureIdSet.addAll(featureIdByType.values());
@@ -79,7 +79,7 @@
return parametricKeywordSearch(featureIdSet, keywordsString, delegator, productCategoryId, true, visitId, anyPrefix, anySuffix, isAnd);
}
- public static ArrayList parametricKeywordSearch(Set<String> featureIdSet, String keywordsString, GenericDelegator delegator, String productCategoryId, boolean includeSubCategories, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
+ public static ArrayList parametricKeywordSearch(Set<String> featureIdSet, String keywordsString, Delegator delegator, String productCategoryId, boolean includeSubCategories, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
List<ProductSearchConstraint> productSearchConstraintList = FastList.newInstance();
if (UtilValidate.isNotEmpty(productCategoryId)) {
@@ -99,7 +99,7 @@
return searchProducts(productSearchConstraintList, new SortKeywordRelevancy(), delegator, visitId);
}
- public static ArrayList<String> searchProducts(List<ProductSearchConstraint> productSearchConstraintList, ResultSortOrder resultSortOrder, GenericDelegator delegator, String visitId) {
+ public static ArrayList<String> searchProducts(List<ProductSearchConstraint> productSearchConstraintList, ResultSortOrder resultSortOrder, Delegator delegator, String visitId) {
ProductSearchContext productSearchContext = new ProductSearchContext(delegator, visitId);
productSearchContext.addProductSearchConstraints(productSearchConstraintList);
@@ -109,12 +109,12 @@
return productIds;
}
- public static void getAllSubCategoryIds(String productCategoryId, Set<String> productCategoryIdSet, GenericDelegator delegator, Timestamp nowTimestamp) {
+ public static void getAllSubCategoryIds(String productCategoryId, Set<String> productCategoryIdSet, Delegator delegator, Timestamp nowTimestamp) {
if (nowTimestamp == null) {
nowTimestamp = UtilDateTime.nowTimestamp();
}
- // this will use the GenericDelegator cache as much as possible, but not a dedicated cache because it would get stale to easily and is too much of a pain to maintain in development and production
+ // this will use the Delegator cache as much as possible, but not a dedicated cache because it would get stale to easily and is too much of a pain to maintain in development and production
// first make sure the current category id is in the Set
productCategoryIdSet.add(productCategoryId);
@@ -155,7 +155,7 @@
public ResultSortOrder resultSortOrder = null;
public Integer resultOffset = null;
public Integer maxResults = null;
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected String visitId = null;
protected Integer totalResults = null;
@@ -181,7 +181,7 @@
public Set<String> excludeFeatureGroupIds = FastSet.newInstance();
public Set<String> alwaysIncludeFeatureGroupIds = FastSet.newInstance();
- public ProductSearchContext(GenericDelegator delegator, String visitId) {
+ public ProductSearchContext(Delegator delegator, String visitId) {
this.delegator = delegator;
this.visitId = visitId;
dynamicViewEntity.addMemberEntity("PROD", "Product");
@@ -189,7 +189,7 @@
dynamicViewEntity.addViewLink("PROD", "PRODCI", Boolean.TRUE, ModelKeyMap.makeKeyMapList("productId"));
}
- public GenericDelegator getDelegator() {
+ public Delegator getDelegator() {
return this.delegator;
}
@@ -624,7 +624,7 @@
Debug.logInfo("topCond=" + topCond.makeWhereString(null, FastList.<EntityConditionParam>newInstance(), EntityConfigUtil.getDatasourceInfo(delegator.getEntityHelperName("Product"))), module);
}
- public EntityListIterator doQuery(GenericDelegator delegator) {
+ public EntityListIterator doQuery(Delegator delegator) {
// handle the now assembled or and and keyword fixed lists
this.finishKeywordConstraints();
@@ -817,7 +817,7 @@
public abstract void addConstraint(ProductSearchContext productSearchContext);
/** pretty print for log messages and even UI stuff */
- public abstract String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale);
+ public abstract String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale);
}
@@ -858,7 +858,7 @@
/** pretty print for log messages and even UI stuff */
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue prodCatalog = null;
try {
prodCatalog = delegator.findByPrimaryKeyCache("ProdCatalog", UtilMisc.toMap("prodCatalogId", prodCatalogId));
@@ -938,7 +938,7 @@
/** pretty print for log messages and even UI stuff */
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue productCategory = null;
try {
productCategory = delegator.findByPrimaryKeyCache("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
@@ -1021,7 +1021,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue productFeature = null;
GenericValue productFeatureType = null;
try {
@@ -1103,7 +1103,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue productFeatureCategory = null;
try {
productFeatureCategory = delegator.findByPrimaryKeyCache("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureCategoryId));
@@ -1183,7 +1183,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
GenericValue productFeatureGroup = null;
try {
productFeatureGroup = delegator.findByPrimaryKeyCache("ProductFeatureGroup", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId));
@@ -1272,7 +1272,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
StringBuilder infoOut = new StringBuilder();
try {
for (String featureId: this.productFeatureIdSet) {
@@ -1344,7 +1344,7 @@
}
}
- public Set<String> makeFullKeywordSet(GenericDelegator delegator) {
+ public Set<String> makeFullKeywordSet(Delegator delegator) {
Set<String> keywordSet = KeywordSearchUtil.makeKeywordSet(this.keywordsString, null, true);
Set<String> fullKeywordSet = new TreeSet<String>();
@@ -1403,7 +1403,7 @@
/** pretty print for log messages and even UI stuff */
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
StringBuilder ppBuf = new StringBuilder();
ppBuf.append(UtilProperties.getMessage(resource, "ProductKeywords", locale)).append(": \"");
ppBuf.append(this.keywordsString).append("\", ").append(UtilProperties.getMessage(resource, "ProductKeywordWhere", locale)).append(" ");
@@ -1461,7 +1461,7 @@
/** pretty print for log messages and even UI stuff */
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
// TODO: implement the pretty print for log messages and even UI stuff
return null;
}
@@ -1532,7 +1532,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
StringBuilder buff = new StringBuilder();
buff.append("Product Store Mandatory Price Constraint: ");
buff.append("Product Store Group [").append(productStoreGroupId).append("], ");
@@ -1605,7 +1605,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
if (this.lowPrice == null && this.highPrice == null) {
// dummy constraint, no values
return null;
@@ -1686,7 +1686,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
return UtilProperties.getMessage(resource, "ProductSupplier", locale)+": " + PartyHelper.getPartyName(delegator, supplierPartyId, false);
}
@@ -1727,7 +1727,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
return UtilProperties.getMessage(resource, "ProductExcludeVariants", locale);
}
@@ -1758,7 +1758,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
return UtilProperties.getMessage(resource, "ProductFilterByAvailabilityDates", locale);
}
@@ -1823,7 +1823,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
if (UtilValidate.isEmpty(goodIdentificationTypeId) &&
UtilValidate.isEmpty(goodIdentificationValue) &&
UtilValidate.isEmpty(include)) {
@@ -1884,7 +1884,7 @@
}
@Override
- public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) {
+ public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) {
return UtilProperties.getMessage(resource, "ProductKeywords", locale);
}
@@ -2096,7 +2096,7 @@
/** A rather large and verbose method that doesn't use the cool constraint and sort order objects */
/*
- public static ArrayList parametricKeywordSearchStandAlone(Set featureIdSet, String keywordsString, GenericDelegator delegator, String productCategoryId, boolean includeSubCategories, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
+ public static ArrayList parametricKeywordSearchStandAlone(Set featureIdSet, String keywordsString, Delegator delegator, String productCategoryId, boolean includeSubCategories, String visitId, boolean anyPrefix, boolean anySuffix, boolean isAnd) {
// TODO: implement this for the new features
boolean removeStems = UtilProperties.propertyValueEquals("prodsearch", "remove.stems", "true");
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java Mon Oct 5 00:08:27 2009
@@ -37,7 +37,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.webapp.stats.VisitHandler;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.transaction.GenericTransactionException;
@@ -62,7 +62,7 @@
*@return String specifying the exit status of this event
*/
public static String searchRemoveFromCategory(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productCategoryId = request.getParameter("SE_SEARCH_CATEGORY_ID");
String errMsg=null;
@@ -112,7 +112,7 @@
*@return String specifying the exit status of this event
*/
public static String searchExpireFromCategory(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productCategoryId = request.getParameter("SE_SEARCH_CATEGORY_ID");
String thruDateStr = request.getParameter("thruDate");
String errMsg=null;
@@ -185,7 +185,7 @@
*@return String specifying the exit status of this event
*/
public static String searchAddToCategory(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productCategoryId = request.getParameter("SE_SEARCH_CATEGORY_ID");
String fromDateStr = request.getParameter("fromDate");
Timestamp fromDate = null;
@@ -254,7 +254,7 @@
*@return String specifying the exit status of this event
*/
public static String searchAddFeature(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Locale locale = UtilHttp.getLocale(request);
String productFeatureId = request.getParameter("productFeatureId");
@@ -343,7 +343,7 @@
*@return String specifying the exit status of this event
*/
public static String searchRemoveFeature(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Locale locale = UtilHttp.getLocale(request);
String productFeatureId = request.getParameter("productFeatureId");
@@ -393,7 +393,7 @@
*@return String specifying the exit status of this event
*/
public static String searchExportProductList(HttpServletRequest request, HttpServletResponse response) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String errMsg = null;
List<Map<String, Object>> productExportList = FastList.newInstance();
@@ -450,7 +450,7 @@
public static EntityListIterator getProductSearchResults(HttpServletRequest request) {
HttpSession session = request.getSession();
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String visitId = VisitHandler.getVisitId(session);
List<ProductSearch.ProductSearchConstraint> productSearchConstraintList = ProductSearchSession.ProductSearchOptions.getConstraintList(session);
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java Mon Oct 5 00:08:27 2009
@@ -44,7 +44,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -266,7 +266,7 @@
}
}
- public List<String> searchGetConstraintStrings(boolean detailed, GenericDelegator delegator, Locale locale) {
+ public List<String> searchGetConstraintStrings(boolean detailed, Delegator delegator, Locale locale) {
List<ProductSearchConstraint> productSearchConstraintList = this.getConstraintList();
List<String> constraintStrings = FastList.newInstance();
if (productSearchConstraintList == null) {
@@ -364,7 +364,7 @@
/** A ControlServlet event method used to check to see if there is an override for any of the current keywords in the search */
public static final String checkDoKeywordOverride(HttpServletRequest request, HttpServletResponse response) {
HttpSession session = request.getSession();
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Map<String, Object> requestParams = UtilHttp.getParameterMap(request);
ProductSearchSession.processSearchParameters(requestParams, request);
@@ -432,7 +432,7 @@
return "success";
}
- public static ArrayList<String> searchDo(HttpSession session, GenericDelegator delegator, String prodCatalogId) {
+ public static ArrayList<String> searchDo(HttpSession session, Delegator delegator, String prodCatalogId) {
String visitId = VisitHandler.getVisitId(session);
ProductSearchOptions productSearchOptions = getProductSearchOptions(session);
List<ProductSearchConstraint> productSearchConstraintList = productSearchOptions.getConstraintList();
@@ -453,7 +453,7 @@
ProductSearchOptions.clearSearchOptions(session);
}
- public static List<String> searchGetConstraintStrings(boolean detailed, HttpSession session, GenericDelegator delegator) {
+ public static List<String> searchGetConstraintStrings(boolean detailed, HttpSession session, Delegator delegator) {
Locale locale = UtilHttp.getLocale(session);
ProductSearchOptions productSearchOptions = getProductSearchOptions(session);
return productSearchOptions.searchGetConstraintStrings(detailed, delegator, locale);
@@ -496,7 +496,7 @@
}
public static void processSearchParameters(Map<String, Object> parameters, HttpServletRequest request) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Boolean alreadyRun = (Boolean) request.getAttribute("processSearchParametersAlreadyRun");
if (Boolean.TRUE.equals(alreadyRun)) {
// even if already run, check the VIEW_SIZE and VIEW_INDEX again, just for kicks
@@ -836,7 +836,7 @@
productSearchOptions.setPaging((String) parameters.get("PAGING"));
}
- public static Map getProductSearchResult(HttpServletRequest request, GenericDelegator delegator, String prodCatalogId) {
+ public static Map getProductSearchResult(HttpServletRequest request, Delegator delegator, String prodCatalogId) {
// ========== Create View Indexes
int viewIndex = 0;
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java Mon Oct 5 00:08:27 2009
@@ -40,7 +40,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -79,7 +79,7 @@
public static Map<String, Object> prodFindSelectedVariant(DispatchContext dctx, Map<String, ? extends Object> context) {
// * String productId -- Parent (virtual) product ID
// * Map selectedFeatures -- Selected features
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Locale locale = (Locale) context.get("locale");
Map selectedFeatures = UtilGenerics.checkMap(context.get("selectedFeatures"));
List<GenericValue> products = FastList.newInstance();
@@ -133,7 +133,7 @@
public static Map<String, Object> prodFindDistinctVariants(DispatchContext dctx, Map<String, ? extends Object> context) {
// * String productId -- Parent (virtual) product ID
// * String feature -- Distinct feature name
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String productId = (String) context.get("productId");
String feature = (String) context.get("feature");
@@ -145,7 +145,7 @@
*/
public static Map<String, Object> prodFindFeatureTypes(DispatchContext dctx, Map<String, ? extends Object> context) {
// * String productId -- Product ID to look up feature types
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String productId = (String) context.get("productId");
String productFeatureApplTypeId = (String) context.get("productFeatureApplTypeId");
if (UtilValidate.isEmpty(productFeatureApplTypeId)) {
@@ -191,7 +191,7 @@
String productStoreId = (String) context.get("productStoreId");
Locale locale = (Locale) context.get("locale");
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
Map<String, Object> result = FastMap.newInstance();
List<String> featureOrder = UtilMisc.makeListWritable(UtilGenerics.<String>checkCollection(context.get("featureOrder")));
@@ -334,7 +334,7 @@
// * String productId -- Product ID to find
// * String type -- Type of feature (STANDARD_FEATURE, SELECTABLE_FEATURE)
// * String distinct -- Distinct feature (SIZE, COLOR)
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Map<String, Object> result = FastMap.newInstance();
String productId = (String) context.get("productId");
String distinct = (String) context.get("distinct");
@@ -366,7 +366,7 @@
*/
public static Map<String, Object> prodFindProduct(DispatchContext dctx, Map<String, ? extends Object> context) {
// * String productId -- Product ID to find
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Map<String, Object> result = FastMap.newInstance();
String productId = (String) context.get("productId");
Locale locale = (Locale) context.get("locale");
@@ -416,7 +416,7 @@
public static Map<String, Object> prodFindAssociatedByType(DispatchContext dctx, Map<String, ? extends Object> context) {
// * String productId -- Current Product ID
// * String type -- Type of association (ie PRODUCT_UPGRADE, PRODUCT_COMPLEMENT, PRODUCT_VARIANT)
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Map<String, Object> result = FastMap.newInstance();
String productId = (String) context.get("productId");
String productIdTo = (String) context.get("productIdTo");
@@ -520,7 +520,7 @@
}
// Builds a product feature tree
- private static Map<String, Object> makeGroup(GenericDelegator delegator, Map<String, List<String>> featureList, List<String> items, List<String> order, int index)
+ private static Map<String, Object> makeGroup(Delegator delegator, Map<String, List<String>> featureList, List<String> items, List<String> order, int index)
throws IllegalArgumentException, IllegalStateException {
//List featureKey = FastList.newInstance();
Map<String, List<String>> tempGroup = FastMap.newInstance();
@@ -618,7 +618,7 @@
}
// builds a variant sample (a single sku for a featureType)
- private static Map<String, GenericValue> makeVariantSample(GenericDelegator delegator, Map<String, List<String>> featureList, List<String> items, String feature) {
+ private static Map<String, GenericValue> makeVariantSample(Delegator delegator, Map<String, List<String>> featureList, List<String> items, String feature) {
Map<String, GenericValue> tempSample = FastMap.newInstance();
Map<String, GenericValue> sample = new LinkedHashMap<String, GenericValue>();
for (String productId: items) {
@@ -658,7 +658,7 @@
}
public static Map<String, Object> quickAddVariant(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Map<String, Object> result = FastMap.newInstance();
Locale locale = (Locale) context.get("locale");
String errMsg=null;
@@ -751,7 +751,7 @@
* It will not put the selectable features on the virtual or standard features on the variant.
*/
public static Map<String, Object> quickCreateVirtualWithVariants(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
// get the various IN attributes
@@ -872,7 +872,7 @@
public static Map<String, Object> updateProductIfAvailableFromShipment(DispatchContext dctx, Map<String, ? extends Object> context) {
if ("Y".equals(UtilProperties.getPropertyValue("catalog.properties", "reactivate.product.from.receipt", "N"))) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String inventoryItemId = (String) context.get("inventoryItemId");
@@ -937,7 +937,7 @@
throws IOException, JDOMException {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String productId = (String) context.get("productId");
String productContentTypeId = (String) context.get("productContentTypeId");
@@ -1118,7 +1118,7 @@
* @return a GenericValue with a productId and a List of complementary productId found
*/
public static Map<String, Object> findProductById(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
String idToFind = (String) context.get("idToFind");
String goodIdentificationTypeId = (String) context.get("goodIdentificationTypeId");
String searchProductFirstContext = (String) context.get("searchProductFirst");
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Mon Oct 5 00:08:27 2009
@@ -34,7 +34,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericPK;
import org.ofbiz.entity.GenericValue;
@@ -60,7 +60,7 @@
/** First expire all ProductAssocs for all disc variants, then disc all virtuals that have all expired variant ProductAssocs */
public static Map<String, Object> discVirtualsWithDiscVariants(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
Locale locale = (Locale) context.get("locale");
String errMsg = null;
@@ -129,7 +129,7 @@
/** for all disc products, remove from category memberships */
public static Map<String, Object> removeCategoryMembersOfDiscProducts(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
Locale locale = (Locale) context.get("locale");
String errMsg = null;
@@ -169,7 +169,7 @@
}
public static Map<String, Object> removeDuplicateOpenEndedCategoryMembers(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
Locale locale = (Locale) context.get("locale");
String errMsg = null;
@@ -218,7 +218,7 @@
}
public static Map<String, Object> makeStandAloneFromSingleVariantVirtuals(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
@@ -326,7 +326,7 @@
}
public static Map<String, Object> mergeVirtualWithSingleVariant(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
String productId = (String) context.get("productId");
@@ -439,7 +439,7 @@
return ServiceUtil.returnSuccess();
}
- protected static void duplicateRelated(GenericValue product, String title, String relatedEntityName, String productIdField, String variantProductId, Timestamp nowTimestamp, boolean removeOld, GenericDelegator delegator, boolean test) throws GenericEntityException {
+ protected static void duplicateRelated(GenericValue product, String title, String relatedEntityName, String productIdField, String variantProductId, Timestamp nowTimestamp, boolean removeOld, Delegator delegator, boolean test) throws GenericEntityException {
List<GenericValue> relatedList = EntityUtil.filterByDate(product.getRelated(title + relatedEntityName), nowTimestamp);
for (GenericValue relatedValue: relatedList) {
GenericValue newRelatedValue = (GenericValue) relatedValue.clone();
@@ -484,7 +484,7 @@
* NOTE: only works on fields of Product right now
*/
public static Map<String, Object> setAllProductImageNames(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String pattern = (String) context.get("pattern");
Locale locale = (Locale) context.get("locale");
String errMsg = null;
@@ -547,7 +547,7 @@
}
public static Map<String, Object> clearAllVirtualProductImageNames(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Locale locale = (Locale) context.get("locale");
String errMsg = null;
@@ -602,7 +602,7 @@
public static Map<String, Object> attachProductFeaturesToCategory(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String productCategoryId = (String) context.get("productCategoryId");
String doSubCategoriesStr = (String) context.get("doSubCategories");
Locale locale = (Locale) context.get("locale");
@@ -643,7 +643,7 @@
/** Get all features associated with products and associate them with a feature group attached to the category for each feature type;
* includes products associated with this category only, but will also associate all feature groups of sub-categories with this category, optionally calls this method for all sub-categories too
*/
- public static void attachProductFeaturesToCategory(String productCategoryId, Set<String> productFeatureTypeIdsToInclude, Set<String> productFeatureTypeIdsToExclude, GenericDelegator delegator, boolean doSubCategories, Timestamp nowTimestamp) throws GenericEntityException {
+ public static void attachProductFeaturesToCategory(String productCategoryId, Set<String> productFeatureTypeIdsToInclude, Set<String> productFeatureTypeIdsToExclude, Delegator delegator, boolean doSubCategories, Timestamp nowTimestamp) throws GenericEntityException {
if (nowTimestamp == null) {
nowTimestamp = UtilDateTime.nowTimestamp();
}
@@ -756,7 +756,7 @@
return ServiceUtil.returnSuccess();
}
- public static void getFeatureGroupsForCategory(String productCategoryId, Set<String> productFeatureGroupIdsToRemove, GenericDelegator delegator, boolean doSubCategories, Timestamp nowTimestamp) throws GenericEntityException {
+ public static void getFeatureGroupsForCategory(String productCategoryId, Set<String> productFeatureGroupIdsToRemove, Delegator delegator, boolean doSubCategories, Timestamp nowTimestamp) throws GenericEntityException {
}
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java Mon Oct 5 00:08:27 2009
@@ -40,7 +40,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.common.geo.GeoWorker;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -96,7 +96,7 @@
}
private static boolean isAllowedToAddress(GenericValue product, GenericValue postalAddress, String productGeoPrefix) {
if (UtilValidate.isNotEmpty(product) && UtilValidate.isNotEmpty(postalAddress)) {
- GenericDelegator delegator = product.getDelegator();
+ Delegator delegator = product.getDelegator();
List<GenericValue> productGeos = null;
try {
productGeos = product.getRelated("ProductGeo");
@@ -156,7 +156,7 @@
/** @deprecated */
@Deprecated
public static void getProduct(PageContext pageContext, String attributeName, String productId) {
- GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator");
+ Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator");
ServletRequest request = pageContext.getRequest();
if (productId == null)
@@ -177,7 +177,7 @@
pageContext.setAttribute(attributeName, product);
}
- public static String getInstanceAggregatedId(GenericDelegator delegator, String instanceProductId) throws GenericEntityException {
+ public static String getInstanceAggregatedId(Delegator delegator, String instanceProductId) throws GenericEntityException {
GenericValue instanceProduct = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", instanceProductId));
if (UtilValidate.isNotEmpty(instanceProduct) && "AGGREGATED_CONF".equals(instanceProduct.getString("productTypeId"))) {
@@ -190,7 +190,7 @@
return null;
}
- public static String getAggregatedInstanceId(GenericDelegator delegator, String aggregatedProductId, String configId) throws GenericEntityException {
+ public static String getAggregatedInstanceId(Delegator delegator, String aggregatedProductId, String configId) throws GenericEntityException {
List<GenericValue> productAssocs = getAggregatedAssocs(delegator, aggregatedProductId);
if (UtilValidate.isNotEmpty(productAssocs) && UtilValidate.isNotEmpty(configId)) {
for (GenericValue productAssoc: productAssocs) {
@@ -203,7 +203,7 @@
return null;
}
- public static List<GenericValue> getAggregatedAssocs(GenericDelegator delegator, String aggregatedProductId) throws GenericEntityException {
+ public static List<GenericValue> getAggregatedAssocs(Delegator delegator, String aggregatedProductId) throws GenericEntityException {
GenericValue aggregatedProduct = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", aggregatedProductId));
if (UtilValidate.isNotEmpty(aggregatedProduct) && "AGGREGATED".equals(aggregatedProduct.getString("productTypeId"))) {
@@ -346,7 +346,7 @@
if (!"Y".equals(variantProduct.getString("isVariant"))) {
throw new IllegalArgumentException("Cannot get distinguishing features for a product that is not a variant (ie isVariant!=Y).");
}
- GenericDelegator delegator = variantProduct.getDelegator();
+ Delegator delegator = variantProduct.getDelegator();
String virtualProductId = getVariantVirtualId(variantProduct);
// find all selectable features on the virtual product that are also standard features on the variant
@@ -387,7 +387,7 @@
* Get the name to show to the customer for GWP alternative options.
* If the alternative is a variant, find the distinguishing features and show those instead of the name; if it is not a variant then show the PRODUCT_NAME content.
*/
- public static String getGwpAlternativeOptionName(LocalDispatcher dispatcher, GenericDelegator delegator, String alternativeOptionProductId, Locale locale) {
+ public static String getGwpAlternativeOptionName(LocalDispatcher dispatcher, Delegator delegator, String alternativeOptionProductId, Locale locale) {
try {
GenericValue alternativeOptionProduct = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", alternativeOptionProductId));
if (alternativeOptionProduct != null) {
@@ -433,7 +433,7 @@
* @param productFeatureApplTypeId - if null, returns ALL productFeatures, regardless of applType
* @return List
*/
- public static List<GenericValue> getProductFeaturesByApplTypeId(GenericDelegator delegator, String productId, String productFeatureApplTypeId) {
+ public static List<GenericValue> getProductFeaturesByApplTypeId(Delegator delegator, String productId, String productFeatureApplTypeId) {
if (productId == null) {
return null;
}
@@ -473,7 +473,7 @@
return features;
}
- public static String getProductvirtualVariantMethod(GenericDelegator delegator, String productId) {
+ public static String getProductvirtualVariantMethod(Delegator delegator, String productId) {
GenericValue product = null;
try {
product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
@@ -500,7 +500,7 @@
List <List<Map<String,String>>> featureTypeFeatures = FastList.newInstance();
try {
if (product != null) {
- GenericDelegator delegator = product.getDelegator();
+ Delegator delegator = product.getDelegator();
Map<String,String> fields = UtilMisc.toMap("productId", product.getString("productId"), "productFeatureApplTypeId", "SELECTABLE_FEATURE");
List<String> order = UtilMisc.toList("productFeatureTypeId", "sequenceNum");
List<GenericValue> features = delegator.findByAndCache("ProductFeatureAndAppl", fields, order);
@@ -581,7 +581,7 @@
return result;
}
- public static Map<String, List<GenericValue>> getOptionalProductFeatures(GenericDelegator delegator, String productId) {
+ public static Map<String, List<GenericValue>> getOptionalProductFeatures(Delegator delegator, String productId) {
Map<String, List<GenericValue>> featureMap = new LinkedHashMap<String, List<GenericValue>>();
List<GenericValue> productFeatureAppls = null;
@@ -665,11 +665,11 @@
return newOrderAdjustmentsList;
}
- public static BigDecimal getAverageProductRating(GenericDelegator delegator, String productId) {
+ public static BigDecimal getAverageProductRating(Delegator delegator, String productId) {
return getAverageProductRating(delegator, productId, null);
}
- public static BigDecimal getAverageProductRating(GenericDelegator delegator, String productId, String productStoreId) {
+ public static BigDecimal getAverageProductRating(Delegator delegator, String productId, String productStoreId) {
GenericValue product = null;
try {
product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
@@ -751,7 +751,7 @@
return productRating;
}
- public static List<GenericValue> getCurrentProductCategories(GenericDelegator delegator, String productId) {
+ public static List<GenericValue> getCurrentProductCategories(Delegator delegator, String productId) {
GenericValue product = null;
try {
product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
@@ -761,7 +761,7 @@
return getCurrentProductCategories(delegator, product);
}
- public static List<GenericValue> getCurrentProductCategories(GenericDelegator delegator, GenericValue product) {
+ public static List<GenericValue> getCurrentProductCategories(Delegator delegator, GenericValue product) {
if (product == null) {
return null;
}
@@ -777,7 +777,7 @@
}
//get parent product
- public static GenericValue getParentProduct(String productId, GenericDelegator delegator) {
+ public static GenericValue getParentProduct(String productId, Delegator delegator) {
GenericValue _parentProduct = null;
if (productId == null) {
Debug.logWarning("Bad product id", module);
@@ -832,7 +832,7 @@
return isPhysical;
}
- public static boolean isVirtual(GenericDelegator delegator, String productI) {
+ public static boolean isVirtual(Delegator delegator, String productI) {
try {
GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productI));
if (product != null) {
@@ -845,7 +845,7 @@
return false;
}
- public static boolean isAmountRequired(GenericDelegator delegator, String productI) {
+ public static boolean isAmountRequired(Delegator delegator, String productI) {
try {
GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productI));
if (product != null) {
@@ -858,7 +858,7 @@
return false;
}
- public static String getProductTypeId(GenericDelegator delegator, String productId) {
+ public static String getProductTypeId(Delegator delegator, String productId) {
try {
GenericValue product = delegator.findByPrimaryKeyCache("Product", UtilMisc.toMap("productId", productId));
if (product != null) {
@@ -878,7 +878,7 @@
* been supplied and the product specifies a weightUomId then an attempt will be made to
* convert the value otherwise the weight is returned as is.
*/
- public static BigDecimal getProductWeight(GenericValue product, String desiredUomId, GenericDelegator delegator, LocalDispatcher dispatcher) {
+ public static BigDecimal getProductWeight(GenericValue product, String desiredUomId, Delegator delegator, LocalDispatcher dispatcher) {
BigDecimal weight = product.getBigDecimal("weight");
String weightUomId = product.getString("weightUomId");
@@ -928,7 +928,7 @@
* @return
* @throws GenericEntityException
*/
- public static List<GenericValue> findProductsById(GenericDelegator delegator,
+ public static List<GenericValue> findProductsById(Delegator delegator,
String idToFind, String goodIdentificationTypeId,
boolean searchProductFirst, boolean searchAllId) throws GenericEntityException {
@@ -963,12 +963,12 @@
return productsFound;
}
- public static List<GenericValue> findProductsById(GenericDelegator delegator, String idToFind, String goodIdentificationTypeId)
+ public static List<GenericValue> findProductsById(Delegator delegator, String idToFind, String goodIdentificationTypeId)
throws GenericEntityException {
return findProductsById(delegator, idToFind, goodIdentificationTypeId, true, false);
}
- public static String findProductId(GenericDelegator delegator, String idToFind, String goodIdentificationTypeId) throws GenericEntityException {
+ public static String findProductId(Delegator delegator, String idToFind, String goodIdentificationTypeId) throws GenericEntityException {
GenericValue product = findProduct(delegator, idToFind, goodIdentificationTypeId);
if (UtilValidate.isNotEmpty(product)) {
return product.getString("productId");
@@ -977,17 +977,17 @@
}
}
- public static String findProductId(GenericDelegator delegator, String idToFind) throws GenericEntityException {
+ public static String findProductId(Delegator delegator, String idToFind) throws GenericEntityException {
return findProductId(delegator, idToFind, null);
}
- public static GenericValue findProduct(GenericDelegator delegator, String idToFind, String goodIdentificationTypeId) throws GenericEntityException {
+ public static GenericValue findProduct(Delegator delegator, String idToFind, String goodIdentificationTypeId) throws GenericEntityException {
List<GenericValue> products = findProductsById(delegator, idToFind, goodIdentificationTypeId);
GenericValue product = EntityUtil.getFirst(products);
return product;
}
- public static List<GenericValue> findProducts(GenericDelegator delegator, String idToFind, String goodIdentificationTypeId) throws GenericEntityException {
+ public static List<GenericValue> findProducts(Delegator delegator, String idToFind, String goodIdentificationTypeId) throws GenericEntityException {
List<GenericValue> productsByIds = findProductsById(delegator, idToFind, goodIdentificationTypeId);
List<GenericValue> products = null;
if (UtilValidate.isNotEmpty(productsByIds)) {
@@ -1009,19 +1009,19 @@
return products;
}
- public static List<GenericValue> findProducts(GenericDelegator delegator, String idToFind) throws GenericEntityException {
+ public static List<GenericValue> findProducts(Delegator delegator, String idToFind) throws GenericEntityException {
return findProducts(delegator, idToFind, null);
}
- public static GenericValue findProduct(GenericDelegator delegator, String idToFind) throws GenericEntityException {
+ public static GenericValue findProduct(Delegator delegator, String idToFind) throws GenericEntityException {
return findProduct(delegator, idToFind, null);
}
- public static boolean isSellable(GenericDelegator delegator, String productId, Timestamp atTime) throws GenericEntityException {
+ public static boolean isSellable(Delegator delegator, String productId, Timestamp atTime) throws GenericEntityException {
return isSellable(findProduct(delegator, productId), atTime);
}
- public static boolean isSellable(GenericDelegator delegator, String productId) throws GenericEntityException {
+ public static boolean isSellable(Delegator delegator, String productId) throws GenericEntityException {
return isSellable(findProduct(delegator, productId));
}
@@ -1042,7 +1042,7 @@
return false;
}
- public static Set<String> getRefurbishedProductIdSet(String productId, GenericDelegator delegator) throws GenericEntityException {
+ public static Set<String> getRefurbishedProductIdSet(String productId, Delegator delegator) throws GenericEntityException {
Set<String> productIdSet = FastSet.newInstance();
// find associated refurb items, we want serial number for main item or any refurb items too
@@ -1062,7 +1062,7 @@
return productIdSet;
}
- public static String getVariantFromFeatureTree(String productId, List<String> selectedFeatures, GenericDelegator delegator) {
+ public static String getVariantFromFeatureTree(String productId, List<String> selectedFeatures, Delegator delegator) {
// all method code moved here from ShoppingCartEvents.addToCart event
String variantProductId = null;
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/VariantEvents.java Mon Oct 5 00:08:27 2009
@@ -27,7 +27,7 @@
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilHttp;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.transaction.GenericTransactionException;
@@ -50,7 +50,7 @@
*/
public static String quickAddChosenVariant(HttpServletRequest request, HttpServletResponse response) {
String errMsg = "";
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
String productId = request.getParameter("productId");
String variantProductId = request.getParameter("variantProductId");
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java Mon Oct 5 00:08:27 2009
@@ -24,7 +24,7 @@
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -51,7 +51,7 @@
public final static String module = PromoServices.class.getName();
public static Map<String, Object> createProductPromoCodeSet(DispatchContext dctx, Map<String, ? extends Object> context) {
- //GenericDelegator delegator = dctx.getDelegator();
+ //Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
Long quantity = (Long) context.get("quantity");
//Long useLimitPerCode = (Long) context.get("useLimitPerCode");
@@ -79,7 +79,7 @@
}
public static Map<String, Object> purgeOldStoreAutoPromos(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String productStoreId = (String) context.get("productStoreId");
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductHelper.java Mon Oct 5 00:08:27 2009
@@ -26,7 +26,7 @@
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -61,7 +61,7 @@
// check if product already exists in database
public static boolean checkProductExists(String productId,
- GenericDelegator delegator) {
+ Delegator delegator) {
GenericValue tmpProductGV;
boolean productExists = false;
try {
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/spreadsheetimport/ImportProductServices.java Mon Oct 5 00:08:27 2009
@@ -35,7 +35,7 @@
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.DispatchContext;
@@ -59,7 +59,7 @@
* @return
*/
public static Map<String, Object> productImportFromSpreadsheet(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
// System.getProperty("user.dir") returns the path upto ofbiz home
// directory
String path = System.getProperty("user.dir") + "/spreadsheet";