svn commit: r1817700 - in /ofbiz/ofbiz-framework/trunk: applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java

[jleroux]

Author: jleroux
Date: Sun Dec 10 11:41:59 2017
New Revision: 1817700

URL: http://svn.apache.org/viewvc?rev=1817700&view=rev
Log:
No functional changes, simply formatting 

Modified:
    
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java
    
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java

Modified: 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java?rev=1817700&r1=1817699&r2=1817700&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java
 Sun Dec 10 11:41:59 2017
@@ -216,8 +216,7 @@ public class ExpressCheckoutEvents {
                         return CheckoutType.PAYFLOW;
                     } else if 
("PAY_GATWY_PAYPAL".equals(paymentGatewayConfigTypeId)) {
                         GenericValue payPalConfig = 
paymentGatewayConfig.getRelatedOne("PaymentGatewayPayPal", false);
-                        // TODO: Probably better off with an indicator field 
to indicate Express
-                        // Checkout use
+                        // TODO: Probably better off with an indicator field 
to indicate Express Checkout use
                         if 
(UtilValidate.isNotEmpty(payPalConfig.get("apiUserName"))) {
                             return CheckoutType.STANDARD;
                         }

Modified: 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java?rev=1817700&r1=1817699&r2=1817700&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/GenericDAO.java
 Sun Dec 10 11:41:59 2017
@@ -1104,8 +1104,7 @@ public class GenericDAO {
             throw new 
org.apache.ofbiz.entity.GenericNotImplementedException("Operation delete not 
supported yet for view entities");
         }
 
-        StringBuilder sql = new StringBuilder().append("DELETE FROM 
").append(modelEntity.getTableName(datasource))
-                .append(" WHERE ");
+        StringBuilder sql = new StringBuilder().append("DELETE FROM 
").append(modelEntity.getTableName(datasource)).append(" WHERE ");
         SqlJdbcUtil.makeWhereStringFromFields(sql, 
modelEntity.getPkFieldsUnmodifiable(), entity, "AND");
 
         int retVal;