You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/10/03 11:12:48 UTC
svn commit: r1763154 - in /ofbiz/trunk:
applications/product/src/main/java/org/apache/ofbiz/product/product/
applications/product/src/main/java/org/apache/ofbiz/shipment/packing/
framework/base/src/main/java/org/apache/ofbiz/base/util/
Author: jleroux
Date: Mon Oct 3 11:12:48 2016
New Revision: 1763154
URL: http://svn.apache.org/viewvc?rev=1763154&view=rev
Log:
Improves: After r1761181 some useful comments were removed. This readds them
Also some comments were not removed but should have been, this removes them
No functional changes
Modified:
ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java?rev=1763154&r1=1763153&r2=1763154&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java (original)
+++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java Mon Oct 3 11:12:48 2016
@@ -22,8 +22,6 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
-import java.lang.NullPointerException;
-import java.lang.SecurityException;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.sql.Timestamp;
@@ -38,7 +36,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import org.jdom.JDOMException;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilDateTime;
import org.apache.ofbiz.base.util.UtilGenerics;
@@ -63,6 +60,7 @@ import org.apache.ofbiz.service.GenericS
import org.apache.ofbiz.service.LocalDispatcher;
import org.apache.ofbiz.service.ModelService;
import org.apache.ofbiz.service.ServiceUtil;
+import org.jdom.JDOMException;
/**
* Product Services
@@ -138,6 +136,8 @@ public class ProductServices {
* Finds product variants based on a product ID and a distinct feature.
*/
public static Map<String, Object> prodFindDistinctVariants(DispatchContext dctx, Map<String, ? extends Object> context) {
+ // * String productId -- Parent (virtual) product ID
+ // * String feature -- Distinct feature name
//TODO This service has not yet been implemented.
return ServiceUtil.returnFailure();
}
@@ -340,6 +340,8 @@ public class ProductServices {
* Gets the product features of a product.
*/
public static Map<String, Object> prodGetFeatures(DispatchContext dctx, Map<String, ? extends Object> context) {
+ // String type -- Type of feature (STANDARD_FEATURE, SELECTABLE_FEATURE)
+ // String distinct -- Distinct feature (SIZE, COLOR)
Delegator delegator = dctx.getDelegator();
Map<String, Object> result = new HashMap<String, Object>();
String productId = (String) context.get("productId");
@@ -415,6 +417,7 @@ public class ProductServices {
* Finds associated products by product ID and association ID.
*/
public static Map<String, Object> prodFindAssociatedByType(DispatchContext dctx, Map<String, ? extends Object> context) {
+ // String type -- Type of association (ie PRODUCT_UPGRADE, PRODUCT_COMPLEMENT, PRODUCT_VARIANT)
Delegator delegator = dctx.getDelegator();
Map<String, Object> result = new HashMap<String, Object>();
String productId = (String) context.get("productId");
@@ -873,7 +876,7 @@ public class ProductServices {
}
public static Map<String, Object> updateProductIfAvailableFromShipment(DispatchContext dctx, Map<String, ? extends Object> context) {
- Delegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
if ("Y".equals(EntityUtilProperties.getPropertyValue("catalog", "reactivate.product.from.receipt", "N", delegator))) {
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Modified: ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java?rev=1763154&r1=1763153&r2=1763154&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java (original)
+++ ofbiz/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java Mon Oct 3 11:12:48 2016
@@ -621,7 +621,6 @@ public class PackingSession implements j
}
public String complete(boolean force) throws GeneralException {
- // clear out empty lines
// check to see if there is anything to process
if (this.getLines().size() == 0) {
return "EMPTY";
Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java?rev=1763154&r1=1763153&r2=1763154&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java (original)
+++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java Mon Oct 3 11:12:48 2016
@@ -421,7 +421,6 @@ public final class UtilXml {
long startTime = System.currentTimeMillis();
- // DON'T do this: seems to be causing problems with Catalina/Tomcat, maybe it is expecting a different parser?
Document document = null;
/* Standard JAXP (mostly), but doesn't seem to be doing XML Schema validation, so making sure that is on... */