svn commit: r821643 [9/15] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r821643 [9/15] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,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.util.EntityUtil; @@ -55,7 +55,7 @@ public static final String module = ProductStoreWorker.class.getName(); - public static GenericValue getProductStore(String productStoreId, GenericDelegator delegator) { + public static GenericValue getProductStore(String productStoreId, Delegator delegator) { if (productStoreId == null || delegator == null) { return null; } @@ -69,7 +69,7 @@ } public static GenericValue getProductStore(ServletRequest request) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String productStoreId = ProductStoreWorker.getProductStoreId(request); return ProductStoreWorker.getProductStore(productStoreId, delegator); } @@ -112,7 +112,7 @@ } } - public static String determineSingleFacilityForStore(GenericDelegator delegator, String productStoreId) { + public static String determineSingleFacilityForStore(Delegator delegator, String productStoreId) { GenericValue productStore = null; try { productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId)); @@ -127,7 +127,7 @@ return null; } - public static boolean autoSaveCart(GenericDelegator delegator, String productStoreId) { + public static boolean autoSaveCart(Delegator delegator, String productStoreId) { return autoSaveCart(getProductStore(productStoreId, delegator)); } @@ -135,7 +135,7 @@ return productStore == null ? false : "Y".equalsIgnoreCase(productStore.getString("autoSaveCart")); } - public static String getProductStorePayToPartyId(String productStoreId, GenericDelegator delegator) { + public static String getProductStorePayToPartyId(String productStoreId, Delegator delegator) { return getProductStorePayToPartyId(getProductStore(productStoreId, delegator)); } @@ -148,12 +148,12 @@ } public static String getProductStorePaymentProperties(ServletRequest request, String paymentMethodTypeId, String paymentServiceTypeEnumId, boolean anyServiceType) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String productStoreId = ProductStoreWorker.getProductStoreId(request); return ProductStoreWorker.getProductStorePaymentProperties(delegator, productStoreId, paymentMethodTypeId, paymentServiceTypeEnumId, anyServiceType); } - public static String getProductStorePaymentProperties(GenericDelegator delegator, String productStoreId, String paymentMethodTypeId, String paymentServiceTypeEnumId, boolean anyServiceType) { + public static String getProductStorePaymentProperties(Delegator delegator, String productStoreId, String paymentMethodTypeId, String paymentServiceTypeEnumId, boolean anyServiceType) { GenericValue setting = ProductStoreWorker.getProductStorePaymentSetting(delegator, productStoreId, paymentMethodTypeId, paymentServiceTypeEnumId, anyServiceType); String payProps = "payment.properties"; @@ -163,7 +163,7 @@ return payProps; } - public static GenericValue getProductStorePaymentSetting(GenericDelegator delegator, String productStoreId, String paymentMethodTypeId, String paymentServiceTypeEnumId, boolean anyServiceType) { + public static GenericValue getProductStorePaymentSetting(Delegator delegator, String productStoreId, String paymentMethodTypeId, String paymentServiceTypeEnumId, boolean anyServiceType) { GenericValue storePayment = null; try { storePayment = delegator.findByPrimaryKeyCache("ProductStorePaymentSetting", UtilMisc.toMap("productStoreId", productStoreId, "paymentMethodTypeId", paymentMethodTypeId, "paymentServiceTypeEnumId", paymentServiceTypeEnumId)); @@ -194,7 +194,7 @@ return storePayment; } - public static List<GenericValue> getProductStoreShipmentMethods(GenericDelegator delegator, String productStoreId, + public static List<GenericValue> getProductStoreShipmentMethods(Delegator delegator, String productStoreId, String shipmentMethodTypeId, String carrierPartyId, String carrierRoleTypeId) { // check for an external service call Map<String, String> storeFields = UtilMisc.toMap("productStoreId", productStoreId, "shipmentMethodTypeId", shipmentMethodTypeId, @@ -210,14 +210,14 @@ return storeShipMethods; } - public static GenericValue getProductStoreShipmentMethod(GenericDelegator delegator, String productStoreId, + public static GenericValue getProductStoreShipmentMethod(Delegator delegator, String productStoreId, String shipmentMethodTypeId, String carrierPartyId, String carrierRoleTypeId) { // TODO: selecting the first record is a far from optimal solution but, since the productStoreShipmentMethod // is currently used to get the service name to get the online estimate, this should not be a huge deal for now. return EntityUtil.getFirst(getProductStoreShipmentMethods(delegator, productStoreId, shipmentMethodTypeId, carrierPartyId, carrierRoleTypeId)); } - public static List<GenericValue> getAvailableStoreShippingMethods(GenericDelegator delegator, String productStoreId, GenericValue shippingAddress, List<BigDecimal> itemSizes, Map<String, BigDecimal> featureIdMap, BigDecimal weight, BigDecimal orderTotal) { + public static List<GenericValue> getAvailableStoreShippingMethods(Delegator delegator, String productStoreId, GenericValue shippingAddress, List<BigDecimal> itemSizes, Map<String, BigDecimal> featureIdMap, BigDecimal weight, BigDecimal orderTotal) { if (featureIdMap == null) { featureIdMap = FastMap.newInstance(); } @@ -439,7 +439,7 @@ return getRandomSurveyWrapper(productStore.getDelegator(), productStore.getString("productStoreId"), groupName, partyId, passThruFields); } - public static ProductStoreSurveyWrapper getRandomSurveyWrapper(GenericDelegator delegator, String productStoreId, String groupName, String partyId, Map<String, Object> passThruFields) { + public static ProductStoreSurveyWrapper getRandomSurveyWrapper(Delegator delegator, String productStoreId, String groupName, String partyId, Map<String, Object> passThruFields) { List<GenericValue> randomSurveys = getSurveys(delegator, productStoreId, groupName, null, "RANDOM_POLL", null); if (!UtilValidate.isEmpty(randomSurveys)) { Random rand = new Random(); @@ -451,15 +451,15 @@ } } - public static List<GenericValue> getProductSurveys(GenericDelegator delegator, String productStoreId, String productId, String surveyApplTypeId) { + public static List<GenericValue> getProductSurveys(Delegator delegator, String productStoreId, String productId, String surveyApplTypeId) { return getSurveys(delegator, productStoreId, null, productId, surveyApplTypeId, null); } - public static List<GenericValue> getProductSurveys(GenericDelegator delegator, String productStoreId, String productId, String surveyApplTypeId, String parentProductId) { + public static List<GenericValue> getProductSurveys(Delegator delegator, String productStoreId, String productId, String surveyApplTypeId, String parentProductId) { return getSurveys(delegator, productStoreId, null, productId, surveyApplTypeId,parentProductId); } - public static List<GenericValue> getSurveys(GenericDelegator delegator, String productStoreId, String groupName, String productId, String surveyApplTypeId, String parentProductId) { + public static List<GenericValue> getSurveys(Delegator delegator, String productStoreId, String groupName, String productId, String surveyApplTypeId, String parentProductId) { List<GenericValue> surveys = FastList.newInstance(); List<GenericValue> storeSurveys = null; try { @@ -536,7 +536,7 @@ /** Returns the number of responses for this survey by party */ public static int checkSurveyResponse(HttpServletRequest request, String surveyId) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin"); String productStoreId = getProductStoreId(request); if (userLogin == null) { @@ -547,7 +547,7 @@ } /** Returns the number of responses for this survey by party */ - public static int checkSurveyResponse(GenericDelegator delegator, String partyId, String productStoreId, String surveyId) { + public static int checkSurveyResponse(Delegator delegator, String partyId, String productStoreId, String surveyId) { if (delegator == null || partyId == null || productStoreId == null) { return -1; } @@ -643,13 +643,13 @@ } String productStoreId = productStore.getString("productStoreId"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); return isStoreInventoryAvailable(productStoreId, productConfig, quantity, delegator, dispatcher); } /** check inventory availability for the given catalog, product, quantity, etc */ - public static boolean isStoreInventoryAvailable(String productStoreId, ProductConfigWrapper productConfig, BigDecimal quantity, GenericDelegator delegator, LocalDispatcher dispatcher) { + public static boolean isStoreInventoryAvailable(String productStoreId, ProductConfigWrapper productConfig, BigDecimal quantity, Delegator delegator, LocalDispatcher dispatcher) { GenericValue productStore = getProductStore(productStoreId, delegator); if (productStore == null) { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java Mon Oct 5 00:08:27 2009 @@ -30,7 +30,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.util.EntityUtil; @@ -49,7 +49,7 @@ public static final String module = SubscriptionServices.class.getName(); public static Map<String, Object> processExtendSubscription(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Timestamp nowTimestamp = UtilDateTime.nowTimestamp(); @@ -166,7 +166,7 @@ } public static Map<String, Object> processExtendSubscriptionByProduct(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String productId = (String) context.get("productId"); Integer qty = (Integer) context.get("quantity"); @@ -219,7 +219,7 @@ } public static Map<String, Object> processExtendSubscriptionByOrder(DispatchContext dctx, Map<String, ? extends Object> context) throws GenericServiceException{ - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Map<String, Object> subContext = UtilMisc.makeMapWritable(context); String orderId = (String) context.get("orderId"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/supplier/SupplierProductServices.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilGenerics; 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; @@ -57,7 +57,7 @@ */ public static Map<String, Object> getSuppliersForProduct(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> results = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); GenericValue product = null; String productId = (String) context.get("productId"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Mon Oct 5 00:08:27 2009 @@ -35,6 +35,7 @@ import org.ofbiz.base.util.UtilFormatOut; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -68,7 +69,7 @@ protected int packageSeq = -1; protected int status = 1; - private transient GenericDelegator _delegator = null; + private transient Delegator _delegator = null; private transient LocalDispatcher _dispatcher = null; public PackingSession(LocalDispatcher dispatcher, GenericValue userLogin, String facilityId, String binId, String orderId, String shipGrp) { @@ -498,7 +499,7 @@ return _dispatcher; } - public GenericDelegator getDelegator() { + public Delegator getDelegator() { if (_delegator == null) { _delegator = GenericDelegator.getGenericDelegator(delegatorName); } @@ -709,7 +710,7 @@ protected void createShipment() throws GeneralException { // first create the shipment - GenericDelegator delegator = this.getDelegator(); + Delegator delegator = this.getDelegator(); Map<String, Object> newShipment = FastMap.newInstance(); newShipment.put("originFacilityId", this.facilityId); newShipment.put("primaryShipGroupSeqId", primaryShipGrp); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java Mon Oct 5 00:08:27 2009 @@ -27,7 +27,7 @@ import org.ofbiz.base.util.UtilFormatOut; import org.ofbiz.base.util.Debug; import org.ofbiz.entity.GenericValue; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ServiceUtil; @@ -204,7 +204,7 @@ if (picklistBinId != null) { // find the pick list item Debug.log("Looking up picklist item for bin ID #" + picklistBinId, module); - GenericDelegator delegator = dispatcher.getDelegator(); + Delegator delegator = dispatcher.getDelegator(); Map<String, Object> itemLookup = FastMap.newInstance(); itemLookup.put("picklistBinId", picklistBinId); itemLookup.put("orderId", this.getOrderId()); 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -29,7 +29,7 @@ import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.condition.EntityConditionList; import org.ofbiz.entity.condition.EntityCondition; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.base.util.UtilMisc; @@ -43,7 +43,7 @@ public static final String module = PickListServices.class.getName(); public static Map<String, Object> convertOrderIdListToHeaders(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); List<GenericValue> orderHeaderList = UtilGenerics.checkList(context.get("orderHeaderList")); List<String> orderIdList = UtilGenerics.checkList(context.get("orderIdList")); @@ -87,7 +87,7 @@ return result; } - public static boolean isBinComplete(GenericDelegator delegator, String picklistBinId) throws GeneralException { + public static boolean isBinComplete(Delegator delegator, String picklistBinId) throws GeneralException { // lookup the items in the bin List<GenericValue> items; try { Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentEvents.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ import org.ofbiz.base.util.UtilHttp; 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.service.GenericServiceException; @@ -43,7 +43,7 @@ public static String viewShipmentPackageRouteSegLabelImage(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String shipmentId = request.getParameter("shipmentId"); String shipmentRouteSegmentId = request.getParameter("shipmentRouteSegmentId"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Mon Oct 5 00:08:27 2009 @@ -27,7 +27,7 @@ import org.ofbiz.base.util.*; import org.ofbiz.base.util.collections.ResourceBundleMapWrapper; 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; @@ -56,7 +56,7 @@ public static Map<String, Object> createShipmentEstimate(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); List<GenericValue> storeAll = FastList.newInstance(); String productStoreShipMethId = (String)context.get("productStoreShipMethId"); @@ -127,7 +127,7 @@ } public static Map<String, Object> removeShipmentEstimate(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String shipmentCostEstimateId = (String) context.get("shipmentCostEstimateId"); GenericValue estimate = null; @@ -163,7 +163,7 @@ return ServiceUtil.returnSuccess(); } - private static boolean applyQuantityBreak(Map context, Map<String, Object> result, List<GenericValue> storeAll, GenericDelegator delegator, + private static boolean applyQuantityBreak(Map context, Map<String, Object> result, List<GenericValue> storeAll, Delegator delegator, GenericValue estimate, String prefix, String breakType, String breakTypeString) { BigDecimal min = (BigDecimal) context.get(prefix + "min"); BigDecimal max = (BigDecimal) context.get(prefix + "max"); @@ -206,7 +206,7 @@ // ShippingEstimate Calc Service public static Map<String, Object> calcShipmentCostEstimate(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); // prepare the data String productStoreShipMethId = (String) context.get("productStoreShipMethId"); @@ -583,7 +583,7 @@ } public static Map<String, Object> fillShipmentStagingTables(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String shipmentId = (String) context.get("shipmentId"); GenericValue shipment = null; @@ -687,7 +687,7 @@ public static Map<String, Object> updateShipmentsFromStaging(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); List<String> orderBy = UtilMisc.toList("shipmentId", "shipmentPackageSeqId", "voidIndicator"); @@ -848,7 +848,7 @@ } public static Map<String, Object> clearShipmentStagingInfo(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String shipmentId = (String) context.get("shipmentId"); try { delegator.removeByAnd("OdbcPackageIn", UtilMisc.toMap("shipmentId", shipmentId)); @@ -869,7 +869,7 @@ * products received (from ShipmentReceipt). */ public static Map<String, Object> updatePurchaseShipmentFromReceipt(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String shipmentId = (String) context.get("shipmentId"); GenericValue userLogin = (GenericValue) context.get("userLogin"); @@ -928,7 +928,7 @@ } public static Map<String, Object> duplicateShipmentRouteSegment(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"); @@ -970,7 +970,7 @@ * Service to call a ShipmentRouteSegment.carrierPartyId's confirm shipment method asynchronously */ public static Map<String, Object> quickScheduleShipmentRouteSegment(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"); @@ -1017,7 +1017,7 @@ */ public static Map<String, Object> getShipmentPackageValueFromOrders(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -1091,7 +1091,7 @@ public static Map<String, Object> sendShipmentCompleteNotification(DispatchContext dctx, Map<String, ? extends Object> context) { LocalDispatcher dispatcher = dctx.getDispatcher(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String shipmentId = (String) context.get("shipmentId"); String sendTo = (String) context.get("sendTo"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentWorker.java Mon Oct 5 00:08:27 2009 @@ -32,7 +32,7 @@ import org.ofbiz.base.util.UtilHttp; 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.util.EntityUtil; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java Mon Oct 5 00:08:27 2009 @@ -48,7 +48,7 @@ import org.ofbiz.base.util.UtilXml; import org.ofbiz.service.ModelService; import org.ofbiz.content.content.ContentWorker; -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; @@ -151,7 +151,7 @@ * If this service returns a null shippingEstimateAmount, then the shipment has not been processed */ public static Map<String, Object> dhlRateEstimate(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); @@ -499,7 +499,7 @@ */ public static Map<String, Object> dhlShipmentConfirm(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); Locale locale = (Locale) context.get("locale"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java Mon Oct 5 00:08:27 2009 @@ -42,7 +42,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.template.FreeMarkerWorker; -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; @@ -134,7 +134,7 @@ * Register a Fedex account for shipping by obtaining the meter number */ public static Map<String, Object> fedexSubscriptionRequest(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); List<Object> errorList = FastList.newInstance(); Boolean replaceMeterNumber = (Boolean) context.get("replaceMeterNumber"); @@ -370,7 +370,7 @@ * Send a FDXShipRequest via the Ship Manager Direct API */ public static Map<String, Object> fedexShipRequest(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"); //Locale locale = (Locale) context.get("locale"); 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -49,7 +49,7 @@ import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -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; @@ -91,7 +91,7 @@ public static Map<String, Object> upsShipmentConfirm(DispatchContext dctx, Map<String, ? extends Object> context) { Map<String, Object> result = FastMap.newInstance(); - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -776,7 +776,7 @@ } public static Map<String, Object> upsShipmentAccept(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String shipmentId = (String) context.get("shipmentId"); String shipmentRouteSegmentId = (String) context.get("shipmentRouteSegmentId"); @@ -1184,7 +1184,7 @@ } public static Map<String, Object> upsVoidShipment(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String shipmentId = (String) context.get("shipmentId"); String shipmentRouteSegmentId = (String) context.get("shipmentRouteSegmentId"); @@ -1370,7 +1370,7 @@ } public static Map<String, Object> upsTrackShipment(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String shipmentId = (String) context.get("shipmentId"); String shipmentRouteSegmentId = (String) context.get("shipmentRouteSegmentId"); @@ -1596,7 +1596,7 @@ } public static Map<String, Object> upsRateInquire(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); // prepare the data String shippingContactMechId = (String) context.get("shippingContactMechId"); String shippingOriginContactMechId = (String) context.get("shippingOriginContactMechId"); @@ -1982,7 +1982,7 @@ public static Map<String, Object> upsRateInquireByPostalCode(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); // prepare the data String serviceConfigProps = (String) context.get("serviceConfigProps"); @@ -2332,7 +2332,7 @@ } public static Map<String, Object> upsEmailReturnLabel(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String shipmentId = (String) context.get("shipmentId"); String shipmentRouteSegmentId = (String) context.get("shipmentRouteSegmentId"); @@ -2693,7 +2693,7 @@ } public static Map<String, Object> upsShipmentAlternateRatesInquiry(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); // prepare the data String upsRateInquireMode = (String) context.get("upsRateInquireMode"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Mon Oct 5 00:08:27 2009 @@ -52,7 +52,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.common.uom.UomWorker; -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; @@ -90,7 +90,7 @@ public static Map<String, Object> uspsRateInquire(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); // check for 0 weight BigDecimal shippableWeight = (BigDecimal) context.get("shippableWeight"); @@ -270,7 +270,7 @@ */ public static Map<String, Object> uspsInternationalRateInquire(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); // check for 0 weight BigDecimal shippableWeight = (BigDecimal) context.get("shippableWeight"); @@ -980,7 +980,7 @@ public static Map<String, Object> uspsUpdateShipmentRateInfo(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); String shipmentId = (String) context.get("shipmentId"); @@ -1256,7 +1256,7 @@ public static Map<String, Object> uspsDeliveryConfirmation(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String shipmentId = (String) context.get("shipmentId"); String shipmentRouteSegmentId = (String) context.get("shipmentRouteSegmentId"); @@ -1448,7 +1448,7 @@ // testing utility service - remove this public static Map<String, Object> uspsDumpShipmentLabelImages(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); try { @@ -1486,7 +1486,7 @@ } public static Map<String, Object> uspsPriorityMailInternationalLabel(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); LocalDispatcher dispatcher = dctx.getDispatcher(); GenericValue shipmentRouteSegment = (GenericValue) context.get("shipmentRouteSegment"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ModelService; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java Mon Oct 5 00:08:27 2009 @@ -32,6 +32,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -51,7 +52,7 @@ protected String facilityId = null; protected List<VerifyPickSessionRow> pickRows = null; - private transient GenericDelegator _delegator = null; + private transient Delegator _delegator = null; private transient LocalDispatcher _dispatcher = null; private static BigDecimal ZERO = BigDecimal.ZERO; @@ -74,7 +75,7 @@ return _dispatcher; } - public GenericDelegator getDelegator() { + public Delegator getDelegator() { if (_delegator == null) { _delegator = GenericDelegator.getGenericDelegator(delegatorName); } @@ -384,7 +385,7 @@ } protected String createShipment(VerifyPickSessionRow line) throws GeneralException { - GenericDelegator delegator = this.getDelegator(); + Delegator delegator = this.getDelegator(); String orderId = line.getOrderId(); Map<String, Object> newShipment = FastMap.newInstance(); newShipment.put("originFacilityId", facilityId); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSessionRow.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ import org.ofbiz.base.util.GeneralException; 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.GenericValue; import org.ofbiz.service.LocalDispatcher; import org.ofbiz.service.ServiceUtil; @@ -150,7 +150,7 @@ if (picklistBinId != null) { // find the pick list item - GenericDelegator delegator = dispatcher.getDelegator(); + Delegator delegator = dispatcher.getDelegator(); Map<String, Object> picklistItemMap = FastMap.newInstance(); picklistItemMap.put("picklistBinId", picklistBinId); picklistItemMap.put("orderId", this.getOrderId()); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java Mon Oct 5 00:08:27 2009 @@ -29,7 +29,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.GenericValue; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.ServiceUtil; @@ -39,7 +39,7 @@ private static BigDecimal ZERO = BigDecimal.ZERO; public static Map<String, Object> setPackageInfo(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); WeightPackageSession weightPackageSession = (WeightPackageSession) context.get("weightPackageSession"); Locale locale = (Locale) context.get("locale"); @@ -126,7 +126,7 @@ } public static Map<String, Object> completePackage(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); WeightPackageSession weightPackageSession = (WeightPackageSession) context.get("weightPackageSession"); Locale locale = (Locale) context.get("locale"); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Mon Oct 5 00:08:27 2009 @@ -34,6 +34,7 @@ import org.ofbiz.base.util.UtilNumber; import org.ofbiz.base.util.UtilProperties; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericDelegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; @@ -62,7 +63,7 @@ protected int weightPackageSeqId = 1; protected List<WeightPackageSessionLine> weightPackageLines = null; - private transient GenericDelegator _delegator = null; + private transient Delegator _delegator = null; private transient LocalDispatcher _dispatcher = null; private static BigDecimal ZERO = BigDecimal.ZERO; private static int rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding"); @@ -100,7 +101,7 @@ return _dispatcher; } - public GenericDelegator getDelegator() { + public Delegator getDelegator() { if (_delegator == null) { _delegator = GenericDelegator.getGenericDelegator(delegatorName); } @@ -348,7 +349,7 @@ } protected BigDecimal upsShipmentConfirm() throws GeneralException { - GenericDelegator delegator = this.getDelegator(); + Delegator delegator = this.getDelegator(); BigDecimal actualCost = ZERO; List<GenericValue> shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", UtilMisc.toMap("shipmentId", shipmentId)); if (UtilValidate.isNotEmpty(shipmentRouteSegments)) { Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java (original) +++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java Mon Oct 5 00:08:27 2009 @@ -21,7 +21,7 @@ import org.ofbiz.base.util.KeyStoreUtil; 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; @@ -41,7 +41,7 @@ public static final String module = CertificateServices.class.getName(); public static Map<String, Object> importIssuerCertificate(DispatchContext dctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = dctx.getDelegator(); + Delegator delegator = dctx.getDelegator(); String certString = (String) context.get("certString"); String componentName = (String) context.get("componentName"); String keystoreName = (String) context.get("keystoreName"); Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java (original) +++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java Mon Oct 5 00:08:27 2009 @@ -23,7 +23,7 @@ import javolution.util.FastMap; import org.ofbiz.base.util.Debug; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.security.authz.da.DynamicAccessHandler; import org.ofbiz.service.GenericDispatcher; import org.ofbiz.service.GenericServiceException; @@ -34,7 +34,7 @@ private static final String module = ServiceDaHandler.class.getName(); protected LocalDispatcher dispatcher; - protected GenericDelegator delegator; + protected Delegator delegator; public String getPattern() { return "^service:(.*)$"; @@ -67,7 +67,7 @@ } } - public void setDelegator(GenericDelegator delegator) { + public void setDelegator(Delegator delegator) { this.delegator = delegator; this.dispatcher = GenericDispatcher.getLocalDispatcher("SecurityDA", delegator); } Modified: ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java (original) +++ ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/login/LoginEvents.java Mon Oct 5 00:08:27 2009 @@ -37,7 +37,7 @@ import org.ofbiz.base.util.UtilValidate; import org.ofbiz.common.login.LoginServices; import org.ofbiz.base.crypto.HashCrypt; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.party.contact.ContactHelper; @@ -118,7 +118,7 @@ *@return String specifying the exit status of this event */ public static String showPasswordHint(HttpServletRequest request, HttpServletResponse response) { - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); String userLoginId = request.getParameter("USERNAME"); String errMsg = null; @@ -173,7 +173,7 @@ public static String emailPassword(HttpServletRequest request, HttpServletResponse response) { String defaultScreenLocation = "component://securityext/widget/EmailSecurityScreens.xml#PasswordEmail"; - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); String productStoreId = ProductStoreWorker.getProductStoreId(request); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ import org.ofbiz.content.content.ContentWrapper; import org.ofbiz.content.content.ContentWorker; import org.ofbiz.entity.GenericValue; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.entity.model.ModelUtil; import org.ofbiz.entity.model.ModelEntity; @@ -175,7 +175,7 @@ } public String getTypeDescription(String contentTypeId) { - GenericDelegator delegator = null; + Delegator delegator = null; if (workEffort != null) { delegator = workEffort.getDelegator(); } @@ -215,12 +215,12 @@ } public static String getWorkEffortContentAsText(GenericValue workEffort, String workEffortContentTypeId, - Locale locale, String mimeTypeId, GenericDelegator delegator, LocalDispatcher dispatcher, boolean useCache) { + Locale locale, String mimeTypeId, Delegator delegator, LocalDispatcher dispatcher, boolean useCache) { return getWorkEffortContentAsText(workEffort, null, workEffortContentTypeId, locale, mimeTypeId, delegator, dispatcher, useCache); } public static String getWorkEffortContentAsText(GenericValue workEffort, String contentId, String workEffortContentTypeId, - Locale locale, String mimeTypeId, GenericDelegator delegator, LocalDispatcher dispatcher, boolean useCache) { + Locale locale, String mimeTypeId, Delegator delegator, LocalDispatcher dispatcher, boolean useCache) { if (workEffort == null) { return null; } @@ -263,7 +263,7 @@ } } - public static void getWorkEffortContentAsText(String contentId, String workEffortId, GenericValue workEffort, String workEffortContentTypeId, Locale locale, String mimeTypeId, GenericDelegator delegator, LocalDispatcher dispatcher, Writer outWriter) throws GeneralException, IOException { + public static void getWorkEffortContentAsText(String contentId, String workEffortId, GenericValue workEffort, String workEffortContentTypeId, Locale locale, String mimeTypeId, Delegator delegator, LocalDispatcher dispatcher, Writer outWriter) throws GeneralException, IOException { if (workEffortId == null && workEffort != null) { workEffortId = workEffort.getString("workEffortId"); } @@ -312,7 +312,7 @@ } } - public static List<String> getWorkEffortContentTextList(GenericValue workEffort, String workEffortContentTypeId, Locale locale, String mimeTypeId, GenericDelegator delegator, LocalDispatcher dispatcher) throws GeneralException, IOException { + public static List<String> getWorkEffortContentTextList(GenericValue workEffort, String workEffortContentTypeId, Locale locale, String mimeTypeId, Delegator delegator, LocalDispatcher dispatcher) throws GeneralException, IOException { List<GenericValue> partyContentList = delegator.findByAndCache("WorkEffortContent", UtilMisc.toMap("workEffortId", workEffort.getString("partyId"), "workEffortContentTypeId", workEffortContentTypeId), UtilMisc.toList("-fromDate")); partyContentList = EntityUtil.filterByDate(partyContentList); @@ -331,7 +331,7 @@ return contentList; } - public static GenericValue getFirstWorkEffortContentByType(String workEffortId, GenericValue workEffort, String workEffortContentTypeId, GenericDelegator delegator) { + public static GenericValue getFirstWorkEffortContentByType(String workEffortId, GenericValue workEffort, String workEffortContentTypeId, Delegator delegator) { if (workEffortId == null && workEffort != null) { workEffortId = workEffort.getString("workEffortId"); } @@ -341,7 +341,7 @@ } if (delegator == null) { - throw new IllegalArgumentException("GenericDelegator missing"); + throw new IllegalArgumentException("Delegator missing"); } List<GenericValue> workEffortContentList = null; Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/project/ProjectWorker.java Mon Oct 5 00:08:27 2009 @@ -27,7 +27,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; import org.ofbiz.entity.condition.EntityCondition; @@ -45,7 +45,7 @@ /** @deprecated */ @Deprecated public static void getAssignedProjects(PageContext pageContext, String projectsAttrName) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); Collection<GenericValue> validWorkEfforts = null; @@ -74,7 +74,7 @@ /** @deprecated */ @Deprecated public static void getAllAssignedProjects(PageContext pageContext, String projectsAttrName) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); Collection validWorkEfforts = null; @@ -100,7 +100,7 @@ /** @deprecated */ @Deprecated public static void getAllProjectPhases(PageContext pageContext, String phasesAttrName) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); String projectWorkEffortId = pageContext.getRequest().getParameter("projectWorkEffortId"); @@ -149,7 +149,7 @@ /** @deprecated */ @Deprecated public static void getAllPhaseTasks(PageContext pageContext, String tasksAttrName) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); String phaseWorkEffortId = pageContext.getRequest().getParameter("phaseWorkEffortId"); @@ -197,7 +197,7 @@ /** @deprecated */ @Deprecated public static void getTaskNotes(PageContext pageContext, String notesAttrName) { - GenericDelegator delegator = (GenericDelegator) pageContext.getRequest().getAttribute("delegator"); + Delegator delegator = (Delegator) pageContext.getRequest().getAttribute("delegator"); GenericValue userLogin = (GenericValue) pageContext.getSession().getAttribute("userLogin"); String workEffortId = pageContext.getRequest().getParameter("workEffortId"); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java Mon Oct 5 00:08:27 2009 @@ -49,7 +49,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; @@ -292,7 +292,7 @@ description = new Description(workEffort.getString("workEffortName")); } Summary summary = new Summary(UtilProperties.getMessage("WorkEffortUiLabels", "WorkEffortEventReminder", Locale.getDefault())); - GenericDelegator delegator = workEffort.getDelegator(); + Delegator delegator = workEffort.getDelegator(); String workEffortId = workEffort.getString("workEffortId"); List<GenericValue> reminderList = delegator.findList("WorkEffortEventReminder", EntityCondition.makeCondition("workEffortId", EntityOperator.EQUALS, workEffort.get("workEffortId")), null, null, null, false); for (GenericValue reminder : reminderList) { @@ -353,7 +353,7 @@ * @throws GenericEntityException */ public static ResponseProperties getICalendar(String workEffortId, Map<String, Object> context) throws GenericEntityException { - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); GenericValue publishProperties = delegator.findOne("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId), false); if (!isCalendarPublished(publishProperties)) { Debug.logInfo("WorkEffort calendar is not published: " + workEffortId, module); @@ -679,7 +679,7 @@ " on URL workEffortId " + context.get("workEffortId"), module); return ICalWorker.createForbiddenResponse(null); } - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); GenericValue publishProperties = delegator.findOne("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId), false); if (!isCalendarPublished(publishProperties)) { Debug.logInfo("WorkEffort calendar is not published: " + workEffortId, module); @@ -773,7 +773,7 @@ serviceMap.put("workEffortId", workEffortId); serviceMap.put("partyId", partyId); serviceMap.put("roleTypeId", fromRoleMap.get(property.getName())); - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); List<GenericValue> assignments = null; try { assignments = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortPartyAssignment", serviceMap)); @@ -793,7 +793,7 @@ protected static ResponseProperties storeWorkEffort(Component component, Map<String, Object> context) throws GenericEntityException, GenericServiceException { PropertyList propertyList = component.getProperties(); String workEffortId = fromXProperty(propertyList, workEffortIdXPropName); - GenericDelegator delegator = (GenericDelegator) context.get("delegator"); + Delegator delegator = (Delegator) context.get("delegator"); GenericValue workEffort = delegator.findOne("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId), false); if (workEffort == null) { return ICalWorker.createNotFoundResponse(null); @@ -810,7 +810,7 @@ @SuppressWarnings("unchecked") protected static ResponseProperties toCalendarComponent(ComponentList components, GenericValue workEffort, Map<String, Object> context) throws GenericEntityException { - GenericDelegator delegator = workEffort.getDelegator(); + Delegator delegator = workEffort.getDelegator(); String workEffortId = workEffort.getString("workEffortId"); String workEffortUid = workEffort.getString("universalId"); String workEffortTypeId = workEffort.getString("workEffortTypeId"); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalWorker.java Mon Oct 5 00:08:27 2009 @@ -43,7 +43,7 @@ import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.GenericServiceException; @@ -132,7 +132,7 @@ protected static Date getLastModifiedDate(HttpServletRequest request) throws GenericEntityException { String workEffortId = (String) request.getAttribute("workEffortId"); - GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator"); + Delegator delegator = (Delegator) request.getAttribute("delegator"); GenericValue publishProperties = delegator.findOne("WorkEffort", UtilMisc.toMap("workEffortId", workEffortId), false); GenericValue iCalData = publishProperties.getRelatedOne("WorkEffortIcalData"); if (iCalData != null) { Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Mon Oct 5 00:08:27 2009 @@ -36,7 +36,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; @@ -46,7 +46,7 @@ public static void indexKeywords(GenericValue workEffort) throws GenericEntityException { if (workEffort == null) return; - GenericDelegator delegator = workEffort.getDelegator(); + Delegator delegator = workEffort.getDelegator(); if (delegator == null) return; String workEffortId = workEffort.getString("workEffortId"); String separators = KeywordSearchUtil.getSeparators(); @@ -125,7 +125,7 @@ } - public static void addWeightedDataResourceString(GenericValue dataResource, int weight, List<String> strings, GenericDelegator delegator, GenericValue workEffort) { + public static void addWeightedDataResourceString(GenericValue dataResource, int weight, List<String> strings, Delegator delegator, GenericValue workEffort) { Map<String, Object> workEffortCtx = UtilMisc.<String, Object>toMap("workEffort", workEffort); try { String contentText = DataResourceWorker.renderDataResourceAsText(delegator, dataResource.getString("dataResourceId"), workEffortCtx, null, null, false); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java Mon Oct 5 00:08:27 2009 @@ -23,7 +23,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; import org.ofbiz.service.GenericServiceException; @@ -39,7 +39,7 @@ public static void updateWorkflowEngine(GenericValue wepa, GenericValue userLogin, LocalDispatcher dispatcher) { // if the WorkEffort is an ACTIVITY, check for accept or complete new status... - GenericDelegator delegator = wepa.getDelegator(); + Delegator delegator = wepa.getDelegator(); GenericValue workEffort = null; try { Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.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.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; @@ -82,7 +82,7 @@ public static final String module = WorkEffortSearch.class.getName(); public static final String resource = "WorkEffortUiLabels"; - public static ArrayList<String> searchWorkEfforts(List<? extends WorkEffortSearchConstraint> workEffortSearchConstraintList, ResultSortOrder resultSortOrder, GenericDelegator delegator, String visitId) { + public static ArrayList<String> searchWorkEfforts(List<? extends WorkEffortSearchConstraint> workEffortSearchConstraintList, ResultSortOrder resultSortOrder, Delegator delegator, String visitId) { WorkEffortSearchContext workEffortSearchContext = new WorkEffortSearchContext(delegator, visitId); workEffortSearchContext.addWorkEffortSearchConstraints(workEffortSearchConstraintList); @@ -92,7 +92,7 @@ return workEffortIds; } - public static void getAllSubWorkEffortIds(String workEffortId, Set<String> workEffortIdSet, GenericDelegator delegator, Timestamp nowTimestamp) { + public static void getAllSubWorkEffortIds(String workEffortId, Set<String> workEffortIdSet, Delegator delegator, Timestamp nowTimestamp) { if (nowTimestamp == null) { nowTimestamp = UtilDateTime.nowTimestamp(); } @@ -151,17 +151,17 @@ 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; - public WorkEffortSearchContext(GenericDelegator delegator, String visitId) { + public WorkEffortSearchContext(Delegator delegator, String visitId) { this.delegator = delegator; this.visitId = visitId; dynamicViewEntity.addMemberEntity("WEFF", "WorkEffort"); } - public GenericDelegator getDelegator() { + public Delegator getDelegator() { return this.delegator; } @@ -298,7 +298,7 @@ } } - public EntityListIterator doQuery(GenericDelegator delegator) { + public EntityListIterator doQuery(Delegator delegator) { // handle the now assembled or and and keyword fixed lists this.finishKeywordConstraints(); @@ -488,7 +488,7 @@ public abstract void addConstraint(WorkEffortSearchContext workEffortSearchContext); /** 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); } @@ -573,7 +573,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 workEffort = null; GenericValue workEffortAssocType = null; try { @@ -666,7 +666,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, "WorkEffortReviews", locale) + ": \""); ppBuf.append(this.reviewTextString).append("\", ").append(UtilProperties.getMessage(resource, "WorkEffortKeywordWhere", locale)).append(" "); @@ -730,7 +730,7 @@ } @Override - public String prettyPrintConstraint(GenericDelegator delegator, boolean detailed, Locale locale) { + public String prettyPrintConstraint(Delegator delegator, boolean detailed, Locale locale) { GenericValue partyNameView = null; GenericValue roleType = null; try { @@ -844,7 +844,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 { Iterator<String> productIdIter = this.productIdSet.iterator(); @@ -911,7 +911,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>(); @@ -970,7 +970,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, "WorkEffortKeywords", locale)).append(": \""); ppBuf.append(this.keywordsString).append("\", ").append(UtilProperties.getMessage(resource, "WorkEffortKeywordWhere", locale)).append(" "); @@ -1057,7 +1057,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, "WorkEffortLastModified", locale)).append(": \""); ppBuf.append(fromDate).append("-").append(thruDate).append("\", ").append(UtilProperties.getMessage(resource, "WorkEffortLastModified", locale)).append(" "); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchEvents.java Mon Oct 5 00:08:27 2009 @@ -28,7 +28,7 @@ import javolution.util.FastMap; import org.ofbiz.base.util.UtilValidate; -import org.ofbiz.entity.GenericDelegator; +import org.ofbiz.entity.Delegator; import org.ofbiz.webapp.stats.VisitHandler; import org.ofbiz.workeffort.workeffort.WorkEffortSearch.ResultSortOrder; import org.ofbiz.workeffort.workeffort.WorkEffortSearch.WorkEffortSearchConstraint; @@ -40,7 +40,7 @@ public static final String module = WorkEffortSearchEvents.class.getName(); - public static Map getWorkEffortSearchResult(HttpServletRequest request, GenericDelegator delegator) { + public static Map getWorkEffortSearchResult(HttpServletRequest request, Delegator delegator) { // ========== Create View Indexes int viewIndex = 0; Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=821643&r1=821642&r2=821643&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Mon Oct 5 00:08:27 2009 @@ -34,7 +34,7 @@ import org.ofbiz.base.util.UtilHttp; 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.workeffort.workeffort.WorkEffortSearch.ResultSortOrder; import org.ofbiz.workeffort.workeffort.WorkEffortSearch.WorkEffortSearchConstraint; import org.ofbiz.workeffort.workeffort.WorkEffortSearch.SortKeywordRelevancy; @@ -129,7 +129,7 @@ this.viewSize = viewSize; } - public List<String> searchGetConstraintStrings(boolean detailed, GenericDelegator delegator, Locale locale) { + public List<String> searchGetConstraintStrings(boolean detailed, Delegator delegator, Locale locale) { List<WorkEffortSearchConstraint> workEffortSearchConstraintList = this.getConstraintList(); List<String> constraintStrings = FastList.newInstance(); if (workEffortSearchConstraintList == null) { @@ -297,7 +297,7 @@ return optionsHistoryList; } - 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); WorkEffortSearchOptions workEffortSearchOptions = getWorkEffortSearchOptions(session); return workEffortSearchOptions.searchGetConstraintStrings(detailed, delegator, locale); 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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009 @@ -41,7 +41,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; @@ -67,7 +67,7 @@ public static final String module = WorkEffortServices.class.getName(); public static Map<String, Object> getWorkEffortAssignedEventsForRole(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String roleTypeId = (String) context.get("roleTypeId"); @@ -103,7 +103,7 @@ } public static Map<String, Object> getWorkEffortAssignedEventsForRoleOfAllParties(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); String roleTypeId = (String) context.get("roleTypeId"); List validWorkEfforts = null; @@ -135,7 +135,7 @@ } public static Map<String, Object> getWorkEffortAssignedTasks(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); List<GenericValue> validWorkEfforts = null; @@ -174,7 +174,7 @@ } public static Map<String, Object> getWorkEffortAssignedActivities(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); List<GenericValue> validWorkEfforts = null; @@ -209,7 +209,7 @@ } public static Map<String, Object> getWorkEffortAssignedActivitiesByRole(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); List<GenericValue> roleWorkEfforts = null; @@ -246,7 +246,7 @@ } public static Map<String, Object> getWorkEffortAssignedActivitiesByGroup(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); List<GenericValue> groupWorkEfforts = null; @@ -283,7 +283,7 @@ } public static Map<String, Object> getWorkEffort(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Security security = ctx.getSecurity(); Map<String, Object> resultMap = FastMap.newInstance(); @@ -454,7 +454,7 @@ if you select the proper fixed asset you should see the task. */ - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Security security = ctx.getSecurity(); GenericValue userLogin = (GenericValue) context.get("userLogin"); Locale locale = (Locale) context.get("locale"); @@ -711,7 +711,7 @@ } public static Map<String, Object> getProductManufacturingSummaryByFacility(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); String productId = (String) context.get("productId"); String facilityId = (String) context.get("facilityId"); // optional @@ -851,7 +851,7 @@ * @return */ public static Map<String, Object> processWorkEffortEventReminders(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); Timestamp now = new Timestamp(System.currentTimeMillis()); List<GenericValue> eventReminders = null; try { @@ -998,14 +998,13 @@ * @param context * @return */ - @SuppressWarnings("deprecation") public static Map<String, Object> migrateWorkEffortEventReminders(DispatchContext ctx, Map<String, ? extends Object> context) { - GenericDelegator delegator = ctx.getDelegator(); + Delegator delegator = ctx.getDelegator(); ModelEntity modelEntity = delegator.getModelEntity("WorkEffortEventReminder"); if (modelEntity != null && modelEntity.getField("recurrenceOffset") != null) { List<GenericValue> eventReminders = null; try { - eventReminders = delegator.findAll("WorkEffortEventReminder"); + eventReminders = delegator.findList("WorkEffortEventReminder", null, null, null, null, false); for (GenericValue reminder : eventReminders) { if (UtilValidate.isNotEmpty(reminder.get("recurrenceOffset"))) { reminder.set("reminderOffset", reminder.get("recurrenceOffset")); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |