svn commit: r1817701 - in /ofbiz/ofbiz-framework/trunk: applications/product/src/main/java/org/apache/ofbiz/product/product/ applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ framework/minilang/src/main/java/org/apache/ofbiz...

Author: jleroux
Date: Sun Dec 10 11:44:28 2017
New Revision: 1817701

URL: http://svn.apache.org/viewvc?rev=1817701&view=rev
Log:
No functional changes, removes useless code

Modified:
    ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
    ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java
    ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java
    ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java

Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java?rev=1817701&r1=1817700&r2=1817701&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductServices.java Sun Dec 10 11:44:28 2017
@@ -605,8 +605,6 @@ public class ProductServices {
             if (UtilValidate.isNotEmpty(itemList)) {
                 Map<String, Object> subGroup = makeGroup(delegator, featureList, itemList, order, index + 1);
                 group.put(key, subGroup);
-            } else {
-                // do nothing, ie put nothing in the Map
             }
         }
         return group;

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java?rev=1817701&r1=1817700&r2=1817701&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortPartyAssignmentServices.java Sun Dec 10 11:44:28 2017
@@ -86,7 +86,6 @@ public class WorkEffortPartyAssignmentSe
                 } catch (GenericServiceException e) {
                     Debug.logWarning(e, module);
                 }
-            } else {// do nothing...
             }
         }
     }

Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java?rev=1817701&r1=1817700&r2=1817701&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Convert.java Sun Dec 10 11:44:28 2017
@@ -86,8 +86,7 @@ public class Convert extends SimpleMapOp
             results.put(toField, convertedObject);
             // if (Debug.infoOn()) Debug.logInfo("[SimpleMapProcessor.Converted.exec] Put converted value \"" + convertedObject + "\" in field \"" + toField + "\"", module);
         } else {
-            if (results.containsKey(toField)) {// do nothing
-            } else {
+            if (!results.containsKey(toField)) {
                 results.put(toField, convertedObject);
                 // if (Debug.infoOn()) Debug.logInfo("[SimpleMapProcessor.Converted.exec] Put converted value \"" + convertedObject + "\" in field \"" + toField + "\"", module);
             }

Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java?rev=1817701&r1=1817700&r2=1817701&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/operation/Copy.java Sun Dec 10 11:44:28 2017
@@ -63,8 +63,7 @@ public class Copy extends SimpleMapOpera
             results.put(toField, fieldValue);
             // if (Debug.infoOn()) Debug.logInfo("[SimpleMapProcessor.Copy.exec] Copied \"" + fieldValue + "\" to field \"" + toField + "\"", module);
         } else {
-            if (results.containsKey(toField)) {// do nothing
-            } else {
+            if (!results.containsKey(toField)) {
                 results.put(toField, fieldValue);
                 // if (Debug.infoOn()) Debug.logInfo("[SimpleMapProcessor.Copy.exec] Copied \"" + fieldValue + "\" to field \"" + toField + "\"", module);
             }