[ofbiz-framework] branch trunk updated: Improved: Corrected some spacing issues in code, where there are extra white spaces, this will fix some checkstyle issues in framework component. (OFBIZ-12022)

[surajk]

This is an automated email from the ASF dual-hosted git repository.

surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new acdddaf  Improved: Corrected some spacing issues in code, where there are extra white spaces, this will fix some checkstyle issues in framework component. (OFBIZ-12022)
     new 62c72c6  Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk
acdddaf is described below

commit acdddaf85ccffdb3764dc274e7b9ef46ea6e469a
Author: Suraj Khurana <[hidden email]>
AuthorDate: Sat Sep 26 14:01:43 2020 +0530

    Improved: Corrected some spacing issues in code, where there are extra white spaces, this will fix some checkstyle issues in framework component.
    (OFBIZ-12022)
---
 .../main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java | 4 ++--
 .../java/org/apache/ofbiz/base/conversion/CollectionConverters.java   | 4 ++--
 .../main/java/org/apache/ofbiz/base/conversion/MiscConverters.java    | 2 +-
 framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java  | 2 +-
 .../src/main/java/org/apache/ofbiz/common/status/StatusWorker.java    | 2 +-
 .../main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java   | 2 +-
 .../java/org/apache/ofbiz/service/config/model/StartupService.java    | 2 +-
 .../org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java     | 2 +-
 .../src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java    | 2 +-
 .../main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java  | 4 ++--
 .../src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java  | 2 +-
 .../java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java  | 2 +-
 .../src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java  | 2 +-
 .../src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java     | 2 +-
 .../org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java     | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java
index fd76257..163d7b7 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/BooleanConverters.java
@@ -29,7 +29,7 @@ public class BooleanConverters implements ConverterLoader {
 
         @Override
         public Integer convert(Boolean obj) throws ConversionException {
-             return obj ? 1 : 0;
+            return obj ? 1 : 0;
         }
     }
 
@@ -63,7 +63,7 @@ public class BooleanConverters implements ConverterLoader {
 
         @Override
         public Boolean convert(Integer obj) throws ConversionException {
-             return obj == 0 ? false : true;
+            return obj == 0 ? false : true;
         }
     }
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java
index 5ad4de2..75a93bd 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/CollectionConverters.java
@@ -41,10 +41,10 @@ public class CollectionConverters implements ConverterLoader {
         @Override
         public <S, T> Converter<S, T> createConverter(Class<S> sourceClass, Class<T> targetClass) {
             if (!sourceClass.isArray()) {
-               return null;
+                return null;
             }
             if (targetClass != List.class) {
-               return null;
+                return null;
             }
             if (sourceClass.getComponentType() == null) {
                 return null;
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java
index f023ce7..ea164fb 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java
@@ -208,7 +208,7 @@ public class MiscConverters implements ConverterLoader {
 
         @Override
         public String convert(Locale obj) throws ConversionException {
-             return obj.toString();
+            return obj.toString();
         }
     }
 
diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
index 581c862..8e942c5 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
@@ -494,7 +494,7 @@ public final class UtilXml {
                 try {
                     Node node = (Node) getProperty("http://apache.org/xml/properties/dom/current-element-node");
                     if (node != null) {
-                       setLineColumn(node.getLastChild());
+                        setLineColumn(node.getLastChild());
                     }
                 } catch (SAXException ex) {
                     Debug.logWarning(ex, MODULE);
diff --git a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
index 8ca947e..3318e84 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusWorker.java
@@ -60,7 +60,7 @@ public final class StatusWorker {
         List<GenericValue> statusItems = new LinkedList<>();
 
         try {
-             List<GenericValue> calItems = EntityQuery.use(delegator)
+            List<GenericValue> calItems = EntityQuery.use(delegator)
                                                       .from("StatusItem")
                                                       .where("statusTypeId", statusTypeIdOne)
                                                       .orderBy("sequenceId")
diff --git a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
index e732426..f13ea22 100644
--- a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
+++ b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/MapToMap.java
@@ -60,7 +60,7 @@ public final class MapToMap extends MethodOperation {
                     toMap = new HashMap<>();
                     toMapFma.put(methodContext.getEnvMap(), toMap);
                 }
-               toMap.putAll(fromMap);
+                toMap.putAll(fromMap);
             } else {
                 methodContext.putAllEnv(fromMap);
             }
diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/StartupService.java b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/StartupService.java
index 9d9980c..db3352a 100644
--- a/framework/service/src/main/java/org/apache/ofbiz/service/config/model/StartupService.java
+++ b/framework/service/src/main/java/org/apache/ofbiz/service/config/model/StartupService.java
@@ -67,6 +67,6 @@ public final class StartupService {
     }
 
     public int getRuntimeDelay() {
-            return runtimeDelay;
+        return runtimeDelay;
     }
 }
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
index accf448..9b93ce7 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
@@ -164,7 +164,7 @@ public class ExternalLoginKeysManager {
      * @return indicator
      */
     private static boolean isAjax(HttpServletRequest request) {
-       return "XMLHttpRequest".equals(request.getHeader("X-Requested-With"));
+        return "XMLHttpRequest".equals(request.getHeader("X-Requested-With"));
     }
 
     /**
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
index 6a052fd..d254502 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
@@ -441,7 +441,7 @@ public final class LoginWorker {
         boolean requirePasswordChange = "Y".equals(request.getParameter("requirePasswordChange"));
         if (!unpwErrMsgList.isEmpty()) {
             request.setAttribute("_ERROR_MESSAGE_LIST_", unpwErrMsgList);
-            return  requirePasswordChange ? "requirePasswordChange" : "error";
+            return requirePasswordChange ? "requirePasswordChange" : "error";
         }
 
         boolean setupNewDelegatorEtc = false;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java
index d0d3319..86da27a 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizContentTransform.java
@@ -58,7 +58,7 @@ public class OfbizContentTransform implements TemplateTransformModel {
                     Debug.logError(e, "Template Exception", MODULE);
                 }
             } else {
-              result = obj.toString();
+                result = obj.toString();
             }
         }
         return result;
@@ -100,7 +100,7 @@ public class OfbizContentTransform implements TemplateTransformModel {
                     StringBuilder newURL = new StringBuilder();
                     ContentUrlTag.appendContentPrefix(request, newURL);
                     if ((newURL.length() > 0 && newURL.charAt(newURL.length() - 1) != '/')
-                    && (!requestUrl.isEmpty() && requestUrl.charAt(0) != '/')) {
+                            && (!requestUrl.isEmpty() && requestUrl.charAt(0) != '/')) {
                         newURL.append('/');
                     }
 
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
index 92340ff..763b4f0 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
@@ -74,7 +74,7 @@ public class OfbizUrlTransform implements TemplateTransformModel {
         String result = "";
         if (o != null) {
             if (Debug.verboseOn()) {
-                 Debug.logVerbose("Arg Object : " + o.getClass().getName(), MODULE);
+                Debug.logVerbose("Arg Object : " + o.getClass().getName(), MODULE);
             }
             if (o instanceof TemplateScalarModel) {
                 TemplateScalarModel s = (TemplateScalarModel) o;
diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java
index 29b4907..a4ffcbc 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/RenderWrappedTextTransform.java
@@ -34,7 +34,7 @@ import freemarker.template.TemplateTransformModel;
 /**
  * RenderWrappedTextTransform - Freemarker Transform for URLs (links)
  */
-public class RenderWrappedTextTransform implements  TemplateTransformModel {
+public class RenderWrappedTextTransform implements TemplateTransformModel {
 
     private static final String MODULE = RenderWrappedTextTransform.class.getName();
 
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
index 1a056ef..e6b3522 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
@@ -758,7 +758,7 @@ public class FormRenderer {
                 }
 
                 if (Debug.verboseOn()) {
-                     Debug.logVerbose("In form got another row, context is: " + localContext, MODULE);
+                    Debug.logVerbose("In form got another row, context is: " + localContext, MODULE);
                 }
 
                 List<ModelFormField> tempFieldList = modelForm.getFieldList().stream()
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java
index 152249d..41df8e1 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java
@@ -184,7 +184,7 @@ public final class Paginator {
         Object obj = context.get(lookupName);
         if (obj == null) {
             if (Debug.verboseOn()) {
-                 Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not running pagination.", MODULE);
+                Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not running pagination.", MODULE);
             }
             return;
         }
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
index fd4359c..27db602 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
@@ -325,7 +325,7 @@ public class MacroTreeRenderer implements TreeStringRenderer {
             } else {
                 urlString = src;
             }
-        } else  if (urlMode != null && "content".equalsIgnoreCase(urlMode)) {
+        } else if (urlMode != null && "content".equalsIgnoreCase(urlMode)) {
             if (request != null && response != null) {
                 StringBuilder newURL = new StringBuilder();
                 ContentUrlTag.appendContentPrefix(request, newURL);