You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2007/10/18 04:47:02 UTC
svn commit: r585803 [1/2] - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/tax/
applications/accounting/src/org/ofbiz...
Author: doogie
Date: Wed Oct 17 19:46:57 2007
New Revision: 585803
URL: http://svn.apache.org/viewvc?rev=585803&view=rev
Log:
Make use of the single-arg variants of makePK/makeValue, removeAll,
and clearCacheLine
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/editaddprep.bsh
ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/price/PriceServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductEvents.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearch.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductWorker.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductsExportToGoogle.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java
ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/facility/EditFacility.bsh
ofbiz/trunk/applications/securityext/src/org/ofbiz/securityext/cert/CertificateServices.java
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/OfbizStore.java
ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonServices.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/PrimaryKeyFinder.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityCrypto.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceInfo.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/RecurrenceRule.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Activity.java
ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Assignment.java
ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Process.java
ofbiz/trunk/framework/shark/src/org/ofbiz/shark/instance/Resource.java
ofbiz/trunk/framework/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java
ofbiz/trunk/framework/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java
ofbiz/trunk/framework/shark/src/org/ofbiz/shark/user/GenericUserGroupMgr.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/ServerHitBin.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/stats/VisitHandler.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/GenericWebEvent.java
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.bsh
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.bsh
ofbiz/trunk/framework/workflow/src/org/ofbiz/workflow/definition/XpdlReader.java
ofbiz/trunk/specialpurpose/bi/src/org/ofbiz/bi/util/DimensionServices.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Wed Oct 17 19:46:57 2007
@@ -2516,7 +2516,7 @@
BigDecimal newPaymentApplyAvailable = paymentApplyAvailable;
GenericValue paymentApplication = null;
if (paymentApplicationId == null) {
- paymentApplication = delegator.makeValue("PaymentApplication", null);
+ paymentApplication = delegator.makeValue("PaymentApplication");
// prepare for creation
} else { // retrieve existing paymentApplication
try {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Wed Oct 17 19:46:57 2007
@@ -1085,7 +1085,7 @@
GenericDelegator delegator = dctx.getDelegator();
// create the fulfillment record
- GenericValue gcFulFill = delegator.makeValue("GiftCardFulfillment", null);
+ GenericValue gcFulFill = delegator.makeValue("GiftCardFulfillment");
gcFulFill.set("fulfillmentId", delegator.getNextSeqId("GiftCardFulfillment"));
gcFulFill.set("typeEnumId", context.get("typeEnumId"));
gcFulFill.set("merchantId", context.get("merchantId"));
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Wed Oct 17 19:46:57 2007
@@ -861,7 +861,7 @@
// create the PaymentGatewayResponse
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue pgResponse = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue pgResponse = delegator.makeValue("PaymentGatewayResponse");
pgResponse.set("paymentGatewayResponseId", responseId);
pgResponse.set("paymentServiceTypeEnumId", RELEASE_SERVICE_TYPE);
pgResponse.set("orderPaymentPreferenceId", paymentPref.get("orderPaymentPreferenceId"));
@@ -885,7 +885,7 @@
if (messages != null && messages.size() > 0) {
Iterator i = messages.iterator();
while (i.hasNext()) {
- GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg", null);
+ GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg");
String respMsgId = delegator.getNextSeqId("PaymentGatewayRespMsg");
String message = (String) i.next();
respMsg.set("paymentGatewayRespMsgId", respMsgId);
@@ -1368,7 +1368,7 @@
GenericValue productStore = order.getRelatedOne("ProductStore");
if (productStore.getString("manualAuthIsCapture") == null || (! productStore.getString("manualAuthIsCapture").equalsIgnoreCase("Y"))) {
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue pgResponse = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue pgResponse = delegator.makeValue("PaymentGatewayResponse");
pgResponse.set("paymentGatewayResponseId", responseId);
pgResponse.set("paymentServiceTypeEnumId", CAPTURE_SERVICE_TYPE);
pgResponse.set("orderPaymentPreferenceId", orderPaymentPreference.getString("orderPaymentPreferenceId"));
@@ -1614,7 +1614,7 @@
Map result = (Map) context.get("serviceResultMap");
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue response = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue response = delegator.makeValue("PaymentGatewayResponse");
String message = ServiceUtil.getErrorMessage(result);
if (message.length() > 255) {
message = message.substring(0, 255);
@@ -1714,7 +1714,7 @@
// create the PaymentGatewayResponse
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue response = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue response = delegator.makeValue("PaymentGatewayResponse");
response.set("paymentGatewayResponseId", responseId);
response.set("paymentServiceTypeEnumId", authType);
response.set("orderPaymentPreferenceId", orderPaymentPreference.get("orderPaymentPreferenceId"));
@@ -1749,7 +1749,7 @@
if (messages != null && messages.size() > 0) {
Iterator i = messages.iterator();
while (i.hasNext()) {
- GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg", null);
+ GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg");
String respMsgId = delegator.getNextSeqId("PaymentGatewayRespMsg");
String message = (String) i.next();
respMsg.set("paymentGatewayRespMsgId", respMsgId);
@@ -2015,7 +2015,7 @@
if (!"EXT_BILLACT".equals(paymentMethodTypeId)) {
// create the PaymentGatewayResponse record
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue response = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue response = delegator.makeValue("PaymentGatewayResponse");
response.set("paymentGatewayResponseId", responseId);
response.set("paymentServiceTypeEnumId", serviceType);
response.set("orderPaymentPreferenceId", paymentPreference.get("orderPaymentPreferenceId"));
@@ -2046,7 +2046,7 @@
if (messages != null && messages.size() > 0) {
Iterator i = messages.iterator();
while (i.hasNext()) {
- GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg", null);
+ GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg");
String respMsgId = delegator.getNextSeqId("PaymentGatewayRespMsg");
String message = (String) i.next();
respMsg.set("paymentGatewayRespMsgId", respMsgId);
@@ -2262,7 +2262,7 @@
// create the PaymentGatewayResponse record
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue response = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue response = delegator.makeValue("PaymentGatewayResponse");
response.set("paymentGatewayResponseId", responseId);
response.set("paymentServiceTypeEnumId", REFUND_SERVICE_TYPE);
response.set("orderPaymentPreferenceId", paymentPref.get("orderPaymentPreferenceId"));
@@ -2288,7 +2288,7 @@
if (messages != null && messages.size() > 0) {
Iterator i = messages.iterator();
while (i.hasNext()) {
- GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg", null);
+ GenericValue respMsg = delegator.makeValue("PaymentGatewayRespMsg");
String respMsgId = delegator.getNextSeqId("PaymentGatewayRespMsg");
String message = (String) i.next();
respMsg.set("paymentGatewayRespMsgId", respMsgId);
@@ -2692,7 +2692,7 @@
}
if (paymentMethodTypeId.equals("CREDIT_CARD")) {
- GenericValue creditCard = delegator.makeValue("CreditCard", null);
+ GenericValue creditCard = delegator.makeValue("CreditCard");
creditCard.setAllFields(context, true, null, null);
if (creditCard.get("firstNameOnCard") == null || creditCard.get("lastNameOnCard") == null || creditCard.get("cardType") == null || creditCard.get("cardNumber") == null) {
return ServiceUtil.returnError("Credit card is missing required fields.");
@@ -2704,7 +2704,7 @@
requestContext.put("creditCard", creditCard);
requestContext.put("cardSecurityCode", context.get("cardSecurityCode"));
- GenericValue billingAddress = delegator.makeValue("PostalAddress", null);
+ GenericValue billingAddress = delegator.makeValue("PostalAddress");
billingAddress.setAllFields(context, true, null, null);
if (billingAddress.get("address1") == null || billingAddress.get("city") == null || billingAddress.get("postalCode") == null) {
return ServiceUtil.returnError("Credit card billing address is missing required fields.");
@@ -2712,7 +2712,7 @@
requestContext.put("billingAddress", billingAddress);
/* This is not needed any more, using names on CC as a kludge instead of these kludge names until we get a firstName/lastName on the shipping PostalAddress
- GenericValue contactPerson = delegator.makeValue("Person", null);
+ GenericValue contactPerson = delegator.makeValue("Person");
contactPerson.setAllFields(context, true, null, null);
if (contactPerson.get("firstName") == null || contactPerson.get("lastName") == null) {
return ServiceUtil.returnError("Contact person is missing required fields.");
@@ -2720,7 +2720,7 @@
requestContext.put("contactPerson", contactPerson);
*/
- GenericValue billToEmail = delegator.makeValue("ContactMech", null);
+ GenericValue billToEmail = delegator.makeValue("ContactMech");
billToEmail.set("infoString", context.get("infoString"));
if (billToEmail.get("infoString") == null) {
return ServiceUtil.returnError("Email address field cannot be empty.");
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Wed Oct 17 19:46:57 2007
@@ -146,10 +146,10 @@
}
List toBeStored = new LinkedList();
- GenericValue newPm = delegator.makeValue("PaymentMethod", null);
+ GenericValue newPm = delegator.makeValue("PaymentMethod");
toBeStored.add(newPm);
- GenericValue newCc = delegator.makeValue("CreditCard", null);
+ GenericValue newCc = delegator.makeValue("CreditCard");
toBeStored.add(newCc);
@@ -458,9 +458,9 @@
return result;
List toBeStored = new LinkedList();
- GenericValue newPm = delegator.makeValue("PaymentMethod", null);
+ GenericValue newPm = delegator.makeValue("PaymentMethod");
toBeStored.add(newPm);
- GenericValue newGc = delegator.makeValue("GiftCard", null);
+ GenericValue newGc = delegator.makeValue("GiftCard");
toBeStored.add(newGc);
String newPmId = (String) context.get("paymentMethodId");
@@ -636,10 +636,10 @@
if (result.size() > 0) return result;
List toBeStored = new LinkedList();
- GenericValue newPm = delegator.makeValue("PaymentMethod", null);
+ GenericValue newPm = delegator.makeValue("PaymentMethod");
toBeStored.add(newPm);
- GenericValue newEa = delegator.makeValue("EftAccount", null);
+ GenericValue newEa = delegator.makeValue("EftAccount");
toBeStored.add(newEa);
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Wed Oct 17 19:46:57 2007
@@ -344,7 +344,7 @@
// TODO: what to do if no TaxAuthorityGlAccount found? Use some default, or is that done elsewhere later on?
}
- GenericValue adjValue = delegator.makeValue("OrderAdjustment", null);
+ GenericValue adjValue = delegator.makeValue("OrderAdjustment");
adjValue.set("taxAuthorityRateSeqId", taxAuthorityRateProduct.getString("taxAuthorityRateSeqId"));
adjValue.set("amount", taxAmount);
adjValue.set("sourcePercentage", taxRate);
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Wed Oct 17 19:46:57 2007
@@ -434,7 +434,7 @@
// create the PaymentGatewayResponse
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue response = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue response = delegator.makeValue("PaymentGatewayResponse");
response.set("paymentGatewayResponseId", responseId);
response.set("paymentServiceTypeEnumId", "PRDS_PAY_EXTERNAL");
response.set("orderPaymentPreferenceId", paymentPreference.get("orderPaymentPreferenceId"));
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java Wed Oct 17 19:46:57 2007
@@ -194,7 +194,7 @@
if (Debug.infoOn()) Debug.logInfo("in persist... textData(0):" + context.get("textData"), null);
- GenericValue content = delegator.makeValue("Content", null);
+ GenericValue content = delegator.makeValue("Content");
content.setPKFields(context);
content.setNonPKFields(context);
String contentId = (String) content.get("contentId");
@@ -203,7 +203,7 @@
String origDataResourceId = (String) content.get("dataResourceId");
if (Debug.infoOn()) Debug.logInfo("in persist... contentId(0):" + contentId, null);
- GenericValue dataResource = delegator.makeValue("DataResource", null);
+ GenericValue dataResource = delegator.makeValue("DataResource");
dataResource.setPKFields(context);
dataResource.setNonPKFields(context);
dataResource.setAllFields(context, false, "dr", null);
@@ -212,7 +212,7 @@
String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId");
if (Debug.infoOn()) Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, null);
- GenericValue contentAssoc = delegator.makeValue("ContentAssoc", null);
+ GenericValue contentAssoc = delegator.makeValue("ContentAssoc");
String contentAssocTypeId = (String)context.get("contentAssocTypeId");
if (UtilValidate.isNotEmpty(contentAssocTypeId)) {
context.put("caContentAssocTypeId", contentAssocTypeId);
@@ -222,7 +222,7 @@
contentAssoc.put("contentId", context.get("caContentId"));
context.putAll(contentAssoc);
- GenericValue electronicText = delegator.makeValue("ElectronicText", null);
+ GenericValue electronicText = delegator.makeValue("ElectronicText");
electronicText.setPKFields(context);
electronicText.setNonPKFields(context);
@@ -581,13 +581,13 @@
LocalDispatcher dispatcher = dctx.getDispatcher();
Map result = new HashMap();
Map newDrContext = new HashMap();
- GenericValue dataResource = delegator.makeValue("DataResource", null);
+ GenericValue dataResource = delegator.makeValue("DataResource");
dataResource.setPKFields(context);
dataResource.setNonPKFields(context);
dataResource.setAllFields(context, false, "dr", null);
context.putAll(dataResource);
- GenericValue electronicText = delegator.makeValue("ElectronicText", null);
+ GenericValue electronicText = delegator.makeValue("ElectronicText");
electronicText.setPKFields(context);
electronicText.setNonPKFields(context);
String textData = (String)electronicText.get("textData");
@@ -1480,7 +1480,7 @@
}
if (contentRole == null) {
- contentRole = delegator.makeValue("ContentRole", null);
+ contentRole = delegator.makeValue("ContentRole");
contentRole.set("contentId", webPubPt);
contentRole.set("partyId", partyId);
contentRole.set("roleTypeId", roleTypeId);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Wed Oct 17 19:46:57 2007
@@ -237,7 +237,7 @@
Map paramMap = UtilHttp.getParameterMap(request);
// Build the primary key that may have been passed in as key values
- GenericValue v = delegator.makeValue(entityName, null);
+ GenericValue v = delegator.makeValue(entityName);
GenericPK passedPK = v.getPrimaryKey();
Collection keyColl = passedPK.getAllKeys();
Iterator keyIt = keyColl.iterator();
@@ -647,7 +647,7 @@
List valueList = (List)results.get("entityList");
if (valueList.size() > 0) {
GenericValue value = (GenericValue)valueList.get(0);
- authorContent = delegator.makeValue("Content", null);
+ authorContent = delegator.makeValue("Content");
authorContent.setPKFields(value);
authorContent.setNonPKFields(value);
//if (Debug.infoOn()) Debug.logInfo("in getAuthorContent, authorContent:" + authorContent, module);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java Wed Oct 17 19:46:57 2007
@@ -714,7 +714,7 @@
context.put("targetOperationList", targetOperationList);
context.put("contentPurposeList", contentPurposeList);
- GenericValue pk = delegator.makeValue("ContentAssoc",null);
+ GenericValue pk = delegator.makeValue("ContentAssoc");
pk.setAllFields(context, false, null, Boolean.TRUE);
pk.setAllFields(context, false, "ca", Boolean.TRUE);
//String contentIdFrom = (String) context.get("contentId");
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Wed Oct 17 19:46:57 2007
@@ -320,11 +320,11 @@
if (contentTypes != null && contentTypes.size() > 0) {
String contentTypeId = (String)content.get("contentTypeId");
if (contentTypes.contains(contentTypeId)) {
- contentAssocDataResourceView = delegator.makeValue(viewName, null);
+ contentAssocDataResourceView = delegator.makeValue(viewName);
contentAssocDataResourceView.setAllFields(content, true, null, null);
}
} else {
- contentAssocDataResourceView = delegator.makeValue(viewName, null);
+ contentAssocDataResourceView = delegator.makeValue(viewName);
contentAssocDataResourceView.setAllFields(content, true, null, null);
}
SimpleMapProcessor.runSimpleMapProcessor("org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocOut", contentAssoc, contentAssocDataResourceView, new ArrayList(), locale);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Wed Oct 17 19:46:57 2007
@@ -999,7 +999,7 @@
}
public static Map pullEntityValues(GenericDelegator delegator, String entityName, Map context) {
- GenericValue entOut = delegator.makeValue(entityName, null);
+ GenericValue entOut = delegator.makeValue(entityName);
entOut.setPKFields(context);
entOut.setNonPKFields(context);
return (Map) entOut;
@@ -1184,7 +1184,7 @@
return content;
}
GenericDelegator delegator = view.getDelegator();
- content = delegator.makeValue("Content", null);
+ content = delegator.makeValue("Content");
content.setPKFields(view);
content.setNonPKFields(view);
String dataResourceId = null;
@@ -1235,7 +1235,7 @@
GenericValue content = (GenericValue)trailNode.get("value");
String contentId = (String)trailNode.get("contentId");
if (contentAssoc == null && content != null && (content.getEntityName().indexOf("Assoc") >= 0)) {
- contentAssoc = delegator.makeValue("ContentAssoc", null);
+ contentAssoc = delegator.makeValue("ContentAssoc");
try {
// TODO: locale needs to be gotten correctly
SimpleMapProcessor.runSimpleMapProcessor("org/ofbiz/content/ContentManagementMapProcessors.xml", "contentAssocIn", content, contentAssoc, new ArrayList(), Locale.getDefault());
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/UploadContentAndImage.java Wed Oct 17 19:46:57 2007
@@ -300,7 +300,7 @@
//if (Debug.infoOn()) Debug.logInfo("[UploadContentAndImage]currentAuthorAssocList " + currentAuthorAssocList, module);
if (currentAuthorAssocList.size() == 0) {
// Don't want to bother with permission checking on this association
- GenericValue authorAssoc = delegator.makeValue("ContentAssoc", null);
+ GenericValue authorAssoc = delegator.makeValue("ContentAssoc");
authorAssoc.set("contentId", ftlContentId);
authorAssoc.set("contentIdTo", userLoginId);
authorAssoc.set("contentAssocTypeId", "AUTHOR");
@@ -457,7 +457,7 @@
}
}
- GenericValue contentAssocDataResourceViewFrom = delegator.makeValue("ContentAssocDataResourceViewFrom",null);
+ GenericValue contentAssocDataResourceViewFrom = delegator.makeValue("ContentAssocDataResourceViewFrom");
ModelEntity modelEntity = delegator.getModelEntity("ContentAssocDataResourceViewFrom");
List fieldNames = modelEntity.getAllFieldNames();
Iterator iter = fieldNames.iterator();
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataEvents.java Wed Oct 17 19:46:57 2007
@@ -311,7 +311,7 @@
GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
Map paramMap = UtilHttp.getParameterMap(request);
String dataResourceId = (String)paramMap.get("dataResourceId");
- GenericValue dataResource = delegator.makeValue("DataResource", null);
+ GenericValue dataResource = delegator.makeValue("DataResource");
dataResource.setPKFields(paramMap);
dataResource.setNonPKFields(paramMap);
Map serviceInMap = new HashMap(dataResource);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataServices.java Wed Oct 17 19:46:57 2007
@@ -347,7 +347,7 @@
electronicText.put("textData", textData);
electronicText.store();
} else {
- electronicText = delegator.makeValue("ElectronicText", null);
+ electronicText = delegator.makeValue("ElectronicText");
electronicText.put("dataResourceId", dataResourceId);
electronicText.put("textData", textData);
electronicText.create();
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/layout/LayoutEvents.java Wed Oct 17 19:46:57 2007
@@ -370,7 +370,7 @@
newContent.create();
Debug.logVerbose("in cloneLayout, newContent:" + newContent, "");
- GenericValue newContentAssoc = delegator.makeValue("ContentAssoc", null);
+ GenericValue newContentAssoc = delegator.makeValue("ContentAssoc");
newContentAssoc.set("contentId", newId);
newContentAssoc.set("contentIdTo", "TEMPLATE_MASTER");
newContentAssoc.set("contentAssocTypeId", "SUB_CONTENT");
@@ -447,7 +447,7 @@
}
- GenericValue view = delegator.makeValue("ContentDataResourceView", null);
+ GenericValue view = delegator.makeValue("ContentDataResourceView");
view.set("contentId", newId);
view.set("drDataResourceId", newDataResourceId);
Debug.logVerbose("in cloneLayout, view:" + view, "");
@@ -619,7 +619,7 @@
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
- GenericValue v = delegator.makeValue(entityName, null);
+ GenericValue v = delegator.makeValue(entityName);
GenericPK passedPK = v.getPrimaryKey();
Collection keyColl = passedPK.getAllKeys();
Iterator keyIt = keyColl.iterator();
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Wed Oct 17 19:46:57 2007
@@ -121,7 +121,7 @@
}
if (currentContent == null) {
- currentContent = delegator.makeValue("Content", null);
+ currentContent = delegator.makeValue("Content");
currentContent.put("ownerContentId", templateCtx.get("ownerContentId"));
}
//Debug.logInfo("in CheckPermission, currentContent(1):" + currentContent.get("contentId"),"");
Modified: ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh (original)
+++ ofbiz/trunk/applications/content/widget/cms/cmseditaddprep.bsh Wed Oct 17 19:46:57 2007
@@ -52,7 +52,7 @@
delegator = (GenericDelegator) request.getAttribute("delegator");
userLogin = session.getAttribute("userLogin");
-contentAssocDataResourceViewFrom = delegator.makeValue("ContentAssocDataResourceViewFrom", null);
+contentAssocDataResourceViewFrom = delegator.makeValue("ContentAssocDataResourceViewFrom");
//singleWrapper = context.get("singleWrapper");
//context.put("contentPurposeTypeId", page.getProperty("contentPurposeTypeId"));
@@ -61,7 +61,7 @@
contentId = context.get("contentId");
- contentAssocPK = delegator.makeValue("ContentAssoc", null);
+ contentAssocPK = delegator.makeValue("ContentAssoc");
contentAssocPK.setAllFields(context, false, "ca", new Boolean(true));
Debug.logInfo("in cmseditaddprep, contentAssocPK:" + contentAssocPK,"");
//Debug.logInfo("in cmseditaddprep, context:" + context,"");
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/comboprep.bsh Wed Oct 17 19:46:57 2007
@@ -98,7 +98,7 @@
singleWrapper.putInContext("nodeTrailCsv", paramMap.get("nodeTrailCsv"));
} else if (currentValue == null || (mode != null && mode.equalsIgnoreCase("add"))) {
- view = delegator.makeValue("SubContentDataResourceView", null);
+ view = delegator.makeValue("SubContentDataResourceView");
view.put("localeString", locale.toString());
singleWrapper = new HtmlFormWrapper(formDefFile, addFormName, request, response);
currentMap = new HashMap(view);
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/currentvalprep.bsh Wed Oct 17 19:46:57 2007
@@ -61,7 +61,7 @@
// Build a key from param or attribute values.
Map paramMap = UtilHttp.getParameterMap(request);
//Debug.logInfo("paramMap:" + paramMap, null);
-GenericValue v = delegator.makeValue(currentEntityName, null);
+GenericValue v = delegator.makeValue(currentEntityName);
passedPK = v.getPrimaryKey();
keyColl = passedPK.getAllKeys();
keyIt = keyColl.iterator();
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/editaddprep.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/editaddprep.bsh?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/editaddprep.bsh (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/editaddprep.bsh Wed Oct 17 19:46:57 2007
@@ -73,7 +73,7 @@
if (currentValue == null) {
parentValue = delegator.findByPrimaryKeyCache("Content", UtilMisc.toMap("contentId", contentIdTo));
- currentValue = delegator.makeValue("Content", null);
+ currentValue = delegator.makeValue("Content");
subject = parentValue.get("contentName");
if (mapKey != null && mapKey.equals("SUMMARY")) {
subject = "Short " + subject;
Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java (original)
+++ ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java Wed Oct 17 19:46:57 2007
@@ -139,7 +139,7 @@
//if trackingCode is still null then the defaultTrackingCode thing didn't work out, use empty TrackingCode
if (trackingCode == null) {
- trackingCode = delegator.makeValue("TrackingCode", null);
+ trackingCode = delegator.makeValue("TrackingCode");
trackingCode.set("trackingCodeId", trackingCodeId);
trackingCode.set("trackingCodeTypeId", "PARTNER_MGD");
//leave userLogin fields empty, no use tracking to customer, or is there?; set dates to current
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java Wed Oct 17 19:46:57 2007
@@ -955,7 +955,7 @@
// create the PaymentGatewayResponse
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue response = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue response = delegator.makeValue("PaymentGatewayResponse");
response.set("paymentGatewayResponseId", responseId);
response.set("paymentServiceTypeEnumId", "PRDS_PAY_EXTERNAL");
response.set("orderPaymentPreferenceId", paymentPreference.get("orderPaymentPreferenceId"));
@@ -1178,7 +1178,7 @@
geo = EntityUtil.getFirst(delegator.findByAnd("Geo", UtilMisc.toMap("geoCode", geoCode.toUpperCase(), "geoTypeId", "COUNTRY")));
Debug.logInfo("Found a geo entity " + geo, module);
if (UtilValidate.isEmpty(geo)) {
- geo = delegator.makeValue("Geo", null);
+ geo = delegator.makeValue("Geo");
geo.set("geoId", geoCode + "_IMPORTED");
geo.set("geoTypeId", "COUNTRY");
geo.set("geoName", geoCode + "_IMPORTED");
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Wed Oct 17 19:46:57 2007
@@ -1176,7 +1176,7 @@
// Create the PaymentGatewayResponse record
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
- GenericValue response = delegator.makeValue("PaymentGatewayResponse", null);
+ GenericValue response = delegator.makeValue("PaymentGatewayResponse");
response.set("paymentGatewayResponseId", responseId);
response.set("paymentServiceTypeEnumId", "PRDS_PAY_REFUND");
response.set("orderPaymentPreferenceId", paymentPref.get("orderPaymentPreferenceId"));
@@ -1650,7 +1650,7 @@
}
// create the replacement adjustment
- GenericValue adj = delegator.makeValue("OrderAdjustment", null);
+ GenericValue adj = delegator.makeValue("OrderAdjustment");
adj.set("orderAdjustmentTypeId", "REPLACE_ADJUSTMENT");
adj.set("amount", new Double(orderPriceTotal * -1));
adj.set("comments", "Replacement Item Return #" + returnId);
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Wed Oct 17 19:46:57 2007
@@ -372,7 +372,7 @@
if (selFixedAssetProduct != null && selFixedAssetProduct.size() > 0) {
Iterator firstOne = selFixedAssetProduct.iterator();
if(firstOne.hasNext()) {
- GenericValue fixedAssetProduct = delegator.makeValue("FixedAssetProduct", null);
+ GenericValue fixedAssetProduct = delegator.makeValue("FixedAssetProduct");
fixedAssetProduct = (GenericValue) firstOne.next();
workEffort.set("fixedAssetId",fixedAssetProduct.get("fixedAssetId"));
workEffort.set("quantityToProduce",orderItem.get("quantity")); // have quantity easy available later...
@@ -629,7 +629,7 @@
while (we.hasNext()) {
// create the entity maps required.
GenericValue workEffort = (GenericValue) we.next();
- GenericValue workOrderItemFulfillment = delegator.makeValue("WorkOrderItemFulfillment", null);
+ GenericValue workOrderItemFulfillment = delegator.makeValue("WorkOrderItemFulfillment");
// find fixed asset supplied on the workeffort map
GenericValue fixedAsset = null;
Debug.logInfo("find the fixedAsset",module);
@@ -651,7 +651,7 @@
Debug.logInfo("TechData calendar does not exist yet so create for fixedAsset: " + fixedAsset.get("fixedAssetId") ,module);
}
if(techDataCalendar == null ) {
- techDataCalendar = delegator.makeValue("TechDataCalendar", null);
+ techDataCalendar = delegator.makeValue("TechDataCalendar");
Debug.logInfo("create techdata calendar because it does not exist",module);
String calendarId = delegator.getNextSeqId("TechDataCalendar");
techDataCalendar.set("calendarId", calendarId);
@@ -690,7 +690,7 @@
Debug.logInfo(" techData excday record not found so creating........", module);
}
if (techDataCalendarExcDay == null) {
- techDataCalendarExcDay = delegator.makeValue("TechDataCalendarExcDay", null);
+ techDataCalendarExcDay = delegator.makeValue("TechDataCalendarExcDay");
techDataCalendarExcDay.set("calendarId", fixedAsset.get("calendarId"));
techDataCalendarExcDay.set("exceptionDateStartTime", exceptionDateStartTime);
techDataCalendarExcDay.set("usedCapacity",new Double(00.00)); // initialise to zero
@@ -1013,7 +1013,7 @@
// if a workEffortId is passed, then prepare a OrderHeaderWorkEffort value
String workEffortId = (String) context.get("workEffortId");
if (UtilValidate.isNotEmpty(workEffortId)) {
- GenericValue orderHeaderWorkEffort = delegator.makeValue("OrderHeaderWorkEffort", null);
+ GenericValue orderHeaderWorkEffort = delegator.makeValue("OrderHeaderWorkEffort");
orderHeaderWorkEffort.set("orderId", orderId);
orderHeaderWorkEffort.set("workEffortId", workEffortId);
toBeStored.add(orderHeaderWorkEffort);
@@ -1999,7 +1999,7 @@
orderHeader.set("statusId", statusId);
// now create a status change
- GenericValue orderStatus = delegator.makeValue("OrderStatus", null);
+ GenericValue orderStatus = delegator.makeValue("OrderStatus");
orderStatus.put("orderStatusId", delegator.getNextSeqId("OrderStatus"));
orderStatus.put("statusId", statusId);
orderStatus.put("orderId", orderId);
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CartEventListener.java Wed Oct 17 19:46:57 2007
@@ -79,7 +79,7 @@
int seqId = 1;
while (cartItems.hasNext()) {
ShoppingCartItem cartItem = (ShoppingCartItem) cartItems.next();
- GenericValue cartAbandonedLine = delegator.makeValue("CartAbandonedLine", null);
+ GenericValue cartAbandonedLine = delegator.makeValue("CartAbandonedLine");
cartAbandonedLine.set("visitId", visit.get("visitId"));
cartAbandonedLine.set("cartAbandonedLineSeqId", (new Integer(seqId)).toString());
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java Wed Oct 17 19:46:57 2007
@@ -1099,7 +1099,7 @@
} catch (ParseException e) {
throw new GeneralException("Problem getting parsed currency amount from DecimalFormat", e);
}
- GenericValue newPref = delegator.makeValue("OrderPaymentPreference", null);
+ GenericValue newPref = delegator.makeValue("OrderPaymentPreference");
newPref.set("orderId", orderId);
newPref.set("paymentMethodTypeId", "CASH");
newPref.set("statusId", "PAYMENT_RECEIVED");
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Wed Oct 17 19:46:57 2007
@@ -3261,7 +3261,7 @@
status = initialStatus;
}
- GenericValue orderItem = getDelegator().makeValue("OrderItem", null);
+ GenericValue orderItem = getDelegator().makeValue("OrderItem");
orderItem.set("orderItemSeqId", item.getOrderItemSeqId());
orderItem.set("externalId", item.getExternalId());
orderItem.set("orderItemTypeId", item.getItemType());
@@ -3310,7 +3310,7 @@
while (itemIter.hasNext()) {
ShoppingCartItem item = (ShoppingCartItem) itemIter.next();
if ("RENTAL_ORDER_ITEM".equals(item.getItemType())) { // prepare workeffort when the order item is a rental item
- GenericValue workEffort = getDelegator().makeValue("WorkEffort", null);
+ GenericValue workEffort = getDelegator().makeValue("WorkEffort");
workEffort.set("workEffortId",item.getOrderItemSeqId()); // fill temporary with sequence number
workEffort.set("estimatedStartDate",item.getReservStart());
workEffort.set("estimatedCompletionDate",item.getReservStart(item.getReservLength()));
@@ -3428,7 +3428,7 @@
while (orderAdjsIter.hasNext()) {
GenericValue orderAdj = (GenericValue) orderAdjsIter.next();
- GenericValue quoteAdj = this.getDelegator().makeValue("QuoteAdjustment", null);
+ GenericValue quoteAdj = this.getDelegator().makeValue("QuoteAdjustment");
quoteAdj.put("quoteAdjustmentId", orderAdj.get("orderAdjustmentId"));
quoteAdj.put("quoteAdjustmentTypeId", orderAdj.get("orderAdjustmentTypeId"));
quoteAdj.put("quoteItemSeqId", orderAdj.get("orderItemSeqId"));
@@ -3533,7 +3533,7 @@
Iterator productPromoUseInfoIter = this.productPromoUseInfoList.iterator();
while (productPromoUseInfoIter.hasNext()) {
ProductPromoUseInfo productPromoUseInfo = (ProductPromoUseInfo) productPromoUseInfoIter.next();
- GenericValue productPromoUse = this.getDelegator().makeValue("ProductPromoUse", null);
+ GenericValue productPromoUse = this.getDelegator().makeValue("ProductPromoUse");
productPromoUse.set("promoSequenceId", UtilFormatOut.formatPaddedNumber(sequenceValue, 5));
productPromoUse.set("productPromoId", productPromoUseInfo.getProductPromoId());
productPromoUse.set("productPromoCodeId", productPromoUseInfo.getProductPromoCodeId());
@@ -3584,7 +3584,7 @@
while (cMechIdsIter.hasNext()) {
Map.Entry entry = (Map.Entry) cMechIdsIter.next();
- GenericValue orderContactMech = getDelegator().makeValue("OrderContactMech", null);
+ GenericValue orderContactMech = getDelegator().makeValue("OrderContactMech");
orderContactMech.set("contactMechPurposeTypeId", entry.getKey());
orderContactMech.set("contactMechId", entry.getValue());
@@ -3610,7 +3610,7 @@
while (cMechIdsIter.hasNext()) {
Map.Entry entry = (Map.Entry) cMechIdsIter.next();
- GenericValue orderContactMech = getDelegator().makeValue("OrderItemContactMech", null);
+ GenericValue orderContactMech = getDelegator().makeValue("OrderItemContactMech");
orderContactMech.set("contactMechPurposeTypeId", entry.getKey());
orderContactMech.set("contactMechId", entry.getValue());
@@ -3645,7 +3645,7 @@
Iterator i = attrs.entrySet().iterator();
while (i.hasNext()) {
Map.Entry entry = (Map.Entry) i.next();
- GenericValue itemAtt = this.getDelegator().makeValue("OrderItemAttribute", null);
+ GenericValue itemAtt = this.getDelegator().makeValue("OrderItemAttribute");
itemAtt.set("orderItemSeqId", item.getOrderItemSeqId());
itemAtt.set("attrName", entry.getKey());
itemAtt.set("attrValue", entry.getValue());
@@ -3661,7 +3661,7 @@
Iterator i = orderAttributes.entrySet().iterator();
while (i.hasNext()) {
Map.Entry entry = (Map.Entry) i.next();
- GenericValue orderAtt = this.getDelegator().makeValue("OrderAttribute", null);
+ GenericValue orderAtt = this.getDelegator().makeValue("OrderAttribute");
orderAtt.put("attrName", entry.getKey());
orderAtt.put("attrValue", entry.getValue());
allOrderAttributes.add(orderAtt);
@@ -3683,7 +3683,7 @@
// TODO: multiple commitments for the same requirement are still not supported
GenericValue commitment = EntityUtil.getFirst(commitments);
if (commitment != null) {
- GenericValue orderItemAssociation = getDelegator().makeValue("OrderItemAssoc", null);
+ GenericValue orderItemAssociation = getDelegator().makeValue("OrderItemAssoc");
orderItemAssociation.set("orderId", commitment.getString("orderId"));
orderItemAssociation.set("orderItemSeqId", commitment.getString("orderItemSeqId"));
orderItemAssociation.set("shipGroupSeqId", "_NA_");
@@ -3697,7 +3697,7 @@
}
}
if (item.getAssociatedOrderId() != null && item.getAssociatedOrderItemSeqId() != null) {
- GenericValue orderItemAssociation = getDelegator().makeValue("OrderItemAssoc", null);
+ GenericValue orderItemAssociation = getDelegator().makeValue("OrderItemAssoc");
orderItemAssociation.set("orderId", item.getAssociatedOrderId());
orderItemAssociation.set("orderItemSeqId", item.getAssociatedOrderItemSeqId());
orderItemAssociation.set("shipGroupSeqId", "_NA_");
@@ -4006,7 +4006,7 @@
}
protected GenericValue makeOrderItemGroup(GenericDelegator delegator) {
- GenericValue orderItemGroup = delegator.makeValue("OrderItemGroup", null);
+ GenericValue orderItemGroup = delegator.makeValue("OrderItemGroup");
orderItemGroup.set("orderItemGroupSeqId", this.getGroupNumber());
orderItemGroup.set("groupName", this.getGroupName());
if (this.parentGroup != null) {
@@ -4083,14 +4083,14 @@
// create order contact mech for shipping address
if (this.internalContactMechId != null) {
- GenericValue orderCm = delegator.makeValue("OrderContactMech", null);
+ GenericValue orderCm = delegator.makeValue("OrderContactMech");
orderCm.set("contactMechPurposeTypeId", "SHIPPING_LOCATION");
orderCm.set("contactMechId", this.internalContactMechId);
values.add(orderCm);
}
// create the ship group
- GenericValue shipGroup = delegator.makeValue("OrderItemShipGroup", null);
+ GenericValue shipGroup = delegator.makeValue("OrderItemShipGroup");
shipGroup.set("shipmentMethodTypeId", shipmentMethodTypeId);
shipGroup.set("carrierRoleTypeId", carrierRoleTypeId);
shipGroup.set("carrierPartyId", carrierPartyId);
@@ -4118,7 +4118,7 @@
// create the shipping estimate adjustments
if (shipEstimate != 0) {
- GenericValue shipAdj = delegator.makeValue("OrderAdjustment", null);
+ GenericValue shipAdj = delegator.makeValue("OrderAdjustment");
shipAdj.set("orderAdjustmentTypeId", "SHIPPING_CHARGES");
shipAdj.set("amount", new Double(shipEstimate));
shipAdj.set("shipGroupSeqId", shipGroupSeqId);
@@ -4139,7 +4139,7 @@
ShoppingCartItem item = (ShoppingCartItem) i.next();
CartShipItemInfo itemInfo = (CartShipItemInfo) shipItemInfo.get(item);
- GenericValue assoc = delegator.makeValue("OrderItemShipGroupAssoc", null);
+ GenericValue assoc = delegator.makeValue("OrderItemShipGroupAssoc");
assoc.set("orderItemSeqId", item.getOrderItemSeqId());
assoc.set("shipGroupSeqId", shipGroupSeqId);
assoc.set("quantity", new Double(itemInfo.quantity));
@@ -4384,7 +4384,7 @@
}
if (UtilValidate.isNotEmpty(billingAddressId)) {
- GenericValue orderCm = delegator.makeValue("OrderContactMech", null);
+ GenericValue orderCm = delegator.makeValue("OrderContactMech");
orderCm.set("contactMechPurposeTypeId", "BILLING_LOCATION");
orderCm.set("contactMechId", billingAddressId);
values.add(orderCm);
@@ -4395,7 +4395,7 @@
amountBd = amountBd.setScale(scale, rounding);
// create the OrderPaymentPreference record
- GenericValue opp = delegator.makeValue("OrderPaymentPreference", new HashMap());
+ GenericValue opp = delegator.makeValue("OrderPaymentPreference");
opp.set("paymentMethodTypeId", valueObj.getString("paymentMethodTypeId"));
opp.set("presentFlag", isPresent ? "Y" : "N");
opp.set("overflowFlag", overflow ? "Y" : "N");
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Wed Oct 17 19:46:57 2007
@@ -1902,7 +1902,7 @@
String featureType = additionalProductFeatureAndAppl.getString("productFeatureTypeId");
this.additionalProductFeatureAndAppls.put(featureType, additionalProductFeatureAndAppl);
- GenericValue orderAdjustment = this.getDelegator().makeValue("OrderAdjustment", null);
+ GenericValue orderAdjustment = this.getDelegator().makeValue("OrderAdjustment");
orderAdjustment.set("orderAdjustmentTypeId", "ADDITIONAL_FEATURE");
orderAdjustment.set("description", additionalProductFeatureAndAppl.get("description"));
orderAdjustment.set("productFeatureId", additionalProductFeatureAndAppl.get("productFeatureId"));
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Wed Oct 17 19:46:57 2007
@@ -511,7 +511,7 @@
orderAdjsMap.put(quoteAdj.get("quoteItemSeqId"), orderAdjs);
}
// convert quote adjustments to order adjustments
- GenericValue orderAdj = delegator.makeValue("OrderAdjustment", null);
+ GenericValue orderAdj = delegator.makeValue("OrderAdjustment");
orderAdj.put("orderAdjustmentId", quoteAdj.get("quoteAdjustmentId"));
orderAdj.put("orderAdjustmentTypeId", quoteAdj.get("quoteAdjustmentTypeId"));
orderAdj.put("orderItemSeqId", quoteAdj.get("quoteItemSeqId"));
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java Wed Oct 17 19:46:57 2007
@@ -510,7 +510,7 @@
int count = 0;
while (i.hasNext()) {
String responseId = (String) i.next();
- GenericValue listResp = delegator.makeValue("ShoppingListItemSurvey", null);
+ GenericValue listResp = delegator.makeValue("ShoppingListItemSurvey");
listResp.set("shoppingListId", item.getString("shoppingListId"));
listResp.set("shoppingListItemSeqId", item.getString("shoppingListItemSeqId"));
listResp.set("surveyResponseId", responseId);
Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java Wed Oct 17 19:46:57 2007
@@ -112,7 +112,7 @@
} catch (DataFileException e) {
Debug.logError(e, module);
}
- GenericValue newValue = delegator.makeValue("ZipSalesTaxLookup", null);
+ GenericValue newValue = delegator.makeValue("ZipSalesTaxLookup");
// PK fields
newValue.set("zipCode", entry.getString("zipCode").trim());
newValue.set("stateCode", entry.get("stateCode") != null ? entry.getString("stateCode").trim() : "_NA_");
@@ -182,7 +182,7 @@
Debug.logError(e, module);
}
if (entry.get("stateCode") != null && entry.getString("stateCode").length() > 0) {
- GenericValue newValue = delegator.makeValue("ZipSalesRuleLookup", null);
+ GenericValue newValue = delegator.makeValue("ZipSalesRuleLookup");
// PK fields
newValue.set("stateCode", entry.get("stateCode") != null ? entry.getString("stateCode").trim() : "_NA_");
newValue.set("city", entry.get("city") != null ? entry.getString("city").trim() : "_NA_");
Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Wed Oct 17 19:46:57 2007
@@ -356,7 +356,7 @@
context.get("allowSolicitation"), "extension", context.get("extension"))));
}
- GenericValue newAddr = delegator.makeValue("PostalAddress", null);
+ GenericValue newAddr = delegator.makeValue("PostalAddress");
newAddr.set("contactMechId", newCmId);
newAddr.set("toName", context.get("toName"));
@@ -1066,7 +1066,7 @@
return ServiceUtil.returnError(e.getMessage());
}
if(UtilValidate.isEmpty(emailAddVerifications)) {
- GenericValue emailAddressVerification = delegator.makeValue("EmailAddressVerification", null);
+ GenericValue emailAddressVerification = delegator.makeValue("EmailAddressVerification");
emailAddressVerification.set("emailAddress", emailAddress);
emailAddressVerification.set("verifyHash", verifyHash);
emailAddressVerification.set("expireDate", expireDate);
Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Wed Oct 17 19:46:57 2007
@@ -899,7 +899,7 @@
GenericValue roleType = null;
try {
- roleType = delegator.makeValue("RoleType", null);
+ roleType = delegator.makeValue("RoleType");
roleType.setPKFields(context);
roleType.setNonPKFields(context);
roleType = delegator.create(roleType);
@@ -1523,7 +1523,7 @@
if (map.length != 2 && map.length != 3) {
return ServiceUtil.returnError("Invalid format for CSV (key,value,sequence)");
} else {
- GenericValue addrMap = delegator.makeValue("AddressMatchMap", null);
+ GenericValue addrMap = delegator.makeValue("AddressMatchMap");
addrMap.put("mapKey", map[0].trim().toUpperCase());
addrMap.put("mapValue", map[1].trim().toUpperCase());
int seq = i + 1;
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -1018,7 +1018,7 @@
priceInfoDescription.append(productPriceAction.getString("productPriceActionTypeId"));
priceInfoDescription.append("]");
- GenericValue orderItemPriceInfo = delegator.makeValue("OrderItemPriceInfo", null);
+ GenericValue orderItemPriceInfo = delegator.makeValue("OrderItemPriceInfo");
orderItemPriceInfo.set("productPriceRuleId", productPriceAction.get("productPriceRuleId"));
orderItemPriceInfo.set("productPriceActionSeqId", productPriceAction.get("productPriceActionSeqId"));
@@ -1319,7 +1319,7 @@
priceInfoDescription.append("" + productSupplier.getDouble("minimumOrderQuantity").doubleValue());
priceInfoDescription.append(", lastPrice: " + productSupplier.getDouble("lastPrice").doubleValue());
priceInfoDescription.append("]");
- GenericValue orderItemPriceInfo = delegator.makeValue("OrderItemPriceInfo", null);
+ GenericValue orderItemPriceInfo = delegator.makeValue("OrderItemPriceInfo");
//orderItemPriceInfo.set("productPriceRuleId", productPriceAction.get("productPriceRuleId"));
//orderItemPriceInfo.set("productPriceActionSeqId", productPriceAction.get("productPriceActionSeqId"));
//orderItemPriceInfo.set("modifyAmount", new Double(modifyAmount));
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -572,7 +572,7 @@
// if there is a productFeatureCategory with the same id as the productFeatureType, use that category.
// otherwise, use a default category from the configuration
if (delegator.findByPrimaryKey("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureTypeId)) == null) {
- GenericValue productFeatureCategory = delegator.makeValue("ProductFeatureCategory", null);
+ GenericValue productFeatureCategory = delegator.makeValue("ProductFeatureCategory");
productFeatureCategory.set("productFeatureCategoryId", productFeatureTypeId);
productFeatureCategory.set("description", productFeatureType.get("description"));
productFeatureCategory.create();
@@ -737,7 +737,7 @@
// if there is a productFeatureCategory with the same id as the productFeatureType, use that category.
// otherwise, create a category for the feature type
if (delegator.findByPrimaryKey("ProductFeatureCategory", UtilMisc.toMap("productFeatureCategoryId", productFeatureTypeId)) == null) {
- GenericValue productFeatureCategory = delegator.makeValue("ProductFeatureCategory", null);
+ GenericValue productFeatureCategory = delegator.makeValue("ProductFeatureCategory");
productFeatureCategory.set("productFeatureCategoryId", productFeatureTypeId);
productFeatureCategory.set("description", productFeatureType.get("description"));
productFeatureCategory.create();
@@ -780,7 +780,7 @@
Iterator productFeatureAndApplIter = productFeatureAndAppls.iterator();
while (productFeatureAndApplIter.hasNext()) {
GenericValue productFeatureAndAppl = (GenericValue) productFeatureAndApplIter.next();
- GenericPK productFeatureApplPK = delegator.makePK("ProductFeatureAppl", null);
+ GenericPK productFeatureApplPK = delegator.makePK("ProductFeatureAppl");
productFeatureApplPK.setPKFields(productFeatureAndAppl);
delegator.removeByPrimaryKey(productFeatureApplPK);
}
@@ -789,7 +789,7 @@
Iterator productFeatureAndApplIter = productFeatureAndAppls.iterator();
while (productFeatureAndApplIter.hasNext()) {
GenericValue productFeatureAndAppl = (GenericValue) productFeatureAndApplIter.next();
- GenericPK productFeatureApplPK = delegator.makePK("ProductFeatureAppl", null);
+ GenericPK productFeatureApplPK = delegator.makePK("ProductFeatureAppl");
productFeatureApplPK.setPKFields(productFeatureAndAppl);
delegator.removeByPrimaryKey(productFeatureApplPK);
}
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -801,7 +801,7 @@
try {
- GenericValue productSearchResult = delegator.makeValue("ProductSearchResult", null);
+ GenericValue productSearchResult = delegator.makeValue("ProductSearchResult");
String productSearchResultId = delegator.getNextSeqId("ProductSearchResult");
productSearchResult.set("productSearchResultId", productSearchResultId);
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -222,7 +222,7 @@
while ((searchResultView = (GenericValue) eli.next()) != null) {
String productId = searchResultView.getString("mainProductId");
- GenericValue pcm=delegator.makeValue("ProductCategoryMember", null);
+ GenericValue pcm=delegator.makeValue("ProductCategoryMember");
pcm.set("productCategoryId", productCategoryId);
pcm.set("productId", productId);
pcm.set("fromDate", fromDate);
@@ -310,7 +310,7 @@
int numAdded = 0;
while ((searchResultView = (GenericValue) eli.next()) != null) {
String productId = searchResultView.getString("mainProductId");
- GenericValue pfa=delegator.makeValue("ProductFeatureAppl", null);
+ GenericValue pfa=delegator.makeValue("ProductFeatureAppl");
pfa.set("productId", productId);
pfa.set("productFeatureId", productFeatureId);
pfa.set("fromDate", fromDate);
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -771,7 +771,7 @@
if (UtilValidate.isEmpty(productId)) {
productId = "VP" + delegator.getNextSeqId("VirtualProduct");
// Create new virtual product...
- GenericValue product = delegator.makeValue("Product", null);
+ GenericValue product = delegator.makeValue("Product");
product.set("productId", productId);
// set: isVirtual=Y, isVariant=N, productTypeId=FINISHED_GOOD, introductionDate=now
product.set("isVirtual", "Y");
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -320,7 +320,7 @@
Iterator variantDistinguishingFeatureIter = UtilMisc.toIterator(EntityUtil.filterByDate(variantDistinguishingFeatures));
while (variantDistinguishingFeatureIter != null && variantDistinguishingFeatureIter.hasNext()) {
GenericValue variantDistinguishingFeature = (GenericValue) variantDistinguishingFeatureIter.next();
- GenericValue dummyFeature = delegator.makeValue("ProductFeature", null);
+ GenericValue dummyFeature = delegator.makeValue("ProductFeature");
dummyFeature.setAllFields(variantDistinguishingFeature, true, null, null);
distFeatures.add(dummyFeature);
}
@@ -342,7 +342,7 @@
while (variantStandardFeatureIter != null && variantStandardFeatureIter.hasNext()) {
GenericValue variantStandardFeature = (GenericValue) variantStandardFeatureIter.next();
if (virtualSelectableFeatureIds.contains(variantStandardFeature.get("productFeatureId"))) {
- GenericValue dummyFeature = delegator.makeValue("ProductFeature", null);
+ GenericValue dummyFeature = delegator.makeValue("ProductFeature");
dummyFeature.setAllFields(variantStandardFeature, true, null, null);
distFeatures.add(dummyFeature);
}
Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductsExportToGoogle.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductsExportToGoogle.java?rev=585803&r1=585802&r2=585803&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductsExportToGoogle.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductsExportToGoogle.java Wed Oct 17 19:46:57 2007
@@ -481,7 +481,7 @@
if (UtilValidate.isNotEmpty(id) && newProductsInGoogle.get(index) != null) {
String productId = (String)newProductsInGoogle.get(index);
try {
- GenericValue googleProductId = delegator.makeValue("GoodIdentification", null);
+ GenericValue googleProductId = delegator.makeValue("GoodIdentification");
googleProductId.set("goodIdentificationTypeId", "GOOGLE_ID");
googleProductId.set("productId", productId);
googleProductId.set("idValue", id);
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -96,7 +96,7 @@
EntityListIterator eli = delegator.findListIteratorByCondition("ProductStorePromoAndAppl", cond, null, null);
GenericValue productStorePromoAndAppl = null;
while ((productStorePromoAndAppl = (GenericValue) eli.next()) != null) {
- GenericValue productStorePromo = delegator.makeValue("ProductStorePromoAppl", null);
+ GenericValue productStorePromo = delegator.makeValue("ProductStorePromoAppl");
productStorePromo.setAllFields(productStorePromoAndAppl, true, null, null);
productStorePromo.remove();
}
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -79,7 +79,7 @@
GenericValue newSubscription = null;
if (lastSubscription == null || alwaysCreateNewRecord) {
- newSubscription = delegator.makeValue("Subscription", null);
+ newSubscription = delegator.makeValue("Subscription");
newSubscription.set("subscriptionResourceId", subscriptionResourceId);
newSubscription.set("partyId", partyId);
newSubscription.set("roleTypeId", roleTypeId);
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=585803&r1=585802&r2=585803&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 Wed Oct 17 19:46:57 2007
@@ -67,7 +67,7 @@
// Create the basic entity.
- GenericValue estimate = delegator.makeValue("ShipmentCostEstimate", null);
+ GenericValue estimate = delegator.makeValue("ShipmentCostEstimate");
estimate.set("shipmentCostEstimateId", delegator.getNextSeqId("ShipmentCostEstimate"));
estimate.set("shipmentMethodTypeId", productStoreShipMeth.getString("shipmentMethodTypeId"));
@@ -154,7 +154,7 @@
if (min.doubleValue() <= max.doubleValue() || max.doubleValue() == 0) {
try {
String newSeqId = delegator.getNextSeqId("QuantityBreak");
- GenericValue weightBreak = delegator.makeValue("QuantityBreak", null);
+ GenericValue weightBreak = delegator.makeValue("QuantityBreak");
weightBreak.set("quantityBreakId", newSeqId);
weightBreak.set("quantityBreakTypeId", "SHIP_" + breakType.toUpperCase());
weightBreak.set("fromQuantity", min);
@@ -259,7 +259,7 @@
return ServiceUtil.returnError("Cannot get shipping address entity");
}
} else if ( shippingPostalCode != null) {
- shipAddress = delegator.makeValue("PostalAddress", null);
+ shipAddress = delegator.makeValue("PostalAddress");
shipAddress.set("countryGeoId", shippingCountryCode);
shipAddress.set("postalCodeGeoId", shippingPostalCode);
}
@@ -610,7 +610,7 @@
String orderInfoKey = orderId + "/" + shipGroupSeqId;
// make the staging records
- GenericValue stageShip = delegator.makeValue("OdbcShipmentOut", null);
+ GenericValue stageShip = delegator.makeValue("OdbcShipmentOut");
stageShip.set("shipmentId", shipment.get("shipmentId"));
stageShip.set("partyId", shipment.get("partyIdTo"));
stageShip.set("carrierPartyId", routeSeg.get("carrierPartyId"));
@@ -633,7 +633,7 @@
Iterator p = packages.iterator();
while (p.hasNext()) {
GenericValue shipmentPkg = (GenericValue) p.next();
- GenericValue stagePkg = delegator.makeValue("OdbcPackageOut", null);
+ GenericValue stagePkg = delegator.makeValue("OdbcPackageOut");
stagePkg.set("shipmentId", shipmentPkg.get("shipmentId"));
stagePkg.set("shipmentPackageSeqId", shipmentPkg.get("shipmentPackageSeqId"));
stagePkg.set("orderId", shipment.get("primaryOrderId"));