some code code-style modifications

active code-quality checks!

3 files changed, 32 insertions, 28 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/AbstractGuiFormBuilderConfiguration.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/AbstractGuiFormBuilderConfiguration.java
index efb8c713..b0718f85 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/AbstractGuiFormBuilderConfiguration.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/AbstractGuiFormBuilderConfiguration.java
@@ -23,13 +23,15 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import at.gv.egiz.eaaf.core.api.gui.GroupDefinition;
-import at.gv.egiz.eaaf.core.api.gui.GroupDefinition.Type;
-import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.eaaf.core.api.gui.GroupDefinition;
+import at.gv.egiz.eaaf.core.api.gui.GroupDefinition.Type;
+import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
+
 /**
  * Abstract Configuration implementation for GUI Builders.
  *
@@ -51,7 +53,6 @@ public abstract class AbstractGuiFormBuilderConfiguration implements IGuiBuilder
   public static final GroupDefinition PARAM_GROUP_MSG =
       GroupDefinition.getInstance("msg", Type.MAP);
 
-
   public static final String PARAM_VIEWNAME = "viewName";
   public static final String PARAM_AUTHCONTEXT = "contextPath";
   public static final String PARAM_FORMSUBMITENDPOINT = "submitEndpoint";
@@ -68,10 +69,11 @@ public abstract class AbstractGuiFormBuilderConfiguration implements IGuiBuilder
   /**
    * Abstract GUI Builder config.
    *
-   * @param authUrl IDP PublicURL-Prefix which should be used, but never null
-   * @param viewName Name of the template (with suffix) but never null
-   * @param formSubmitEndpoint EndPoint on which the form should be submitted, or null if the form
-   *        must not submitted
+   * @param authUrl            IDP PublicURL-Prefix which should be used, but
+   *                           never null
+   * @param viewName           Name of the template (with suffix) but never null
+   * @param formSubmitEndpoint EndPoint on which the form should be submitted, or
+   *                           null if the form must not submitted
    *
    */
   public AbstractGuiFormBuilderConfiguration(final String authUrl, final String viewName,
@@ -100,7 +102,8 @@ public abstract class AbstractGuiFormBuilderConfiguration implements IGuiBuilder
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.frontend.builder.IGUIBuilderConfiguration#getViewName()
+   * @see at.gv.egovernment.moa.id.auth.frontend.builder.IGUIBuilderConfiguration#
+   * getViewName()
    */
   @Override
   public final String getViewName() {
@@ -108,12 +111,11 @@ public abstract class AbstractGuiFormBuilderConfiguration implements IGuiBuilder
 
   }
 
-
   /*
    * (non-Javadoc)
    *
-   * @see
-   * at.gv.egovernment.moa.id.auth.frontend.builder.IGUIBuilderConfiguration#getViewParameters()
+   * @see at.gv.egovernment.moa.id.auth.frontend.builder.IGUIBuilderConfiguration#
+   * getViewParameters()
    */
   @Override
   public final Map<String, Object> getViewParameters() {
@@ -137,8 +139,8 @@ public abstract class AbstractGuiFormBuilderConfiguration implements IGuiBuilder
 
   /**
    * Define the parameters, which should be evaluated in the template. <br>
-   * <b>IMPORTANT:</b> external HTML escapetion is required, because it is NOT done internally
-   * during the building process
+   * <b>IMPORTANT:</b> external HTML escapetion is required, because it is NOT
+   * done internally during the building process
    *
    */
   protected abstract void putSpecificViewParameters();
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/AbstractVelocityGuiFormBuilderImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/AbstractVelocityGuiFormBuilderImpl.java
index 0ab5fa49..5e4af55e 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/AbstractVelocityGuiFormBuilderImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/AbstractVelocityGuiFormBuilderImpl.java
@@ -27,20 +27,23 @@ import java.io.StringWriter;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
-import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiFormBuilder;
-import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
-import at.gv.egiz.eaaf.core.impl.gui.velocity.VelocityProvider;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiFormBuilder;
+import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
+import at.gv.egiz.eaaf.core.impl.gui.velocity.VelocityProvider;
+
 /**
  * Abstract VeloCity based GUI builder implementation.
  *
@@ -50,7 +53,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractVelocityGuiFormBuilderImpl implements IVelocityGuiFormBuilder {
   private static final Logger log =
       LoggerFactory.getLogger(AbstractVelocityGuiFormBuilderImpl.class);
-  private static final String DEFAULT_CONTENT_TYPE = EAAFConstants.CONTENTTYPE_HTML_UTF8;
+  private static final String DEFAULT_CONTENT_TYPE = EaafConstants.CONTENTTYPE_HTML_UTF8;
 
   private VelocityEngine engine;
 
@@ -82,7 +85,6 @@ public abstract class AbstractVelocityGuiFormBuilderImpl implements IVelocityGui
           + IVelocityGuiBuilderConfiguration.class.getName());
     }
 
-
   }
 
   @Override
@@ -159,7 +161,8 @@ public abstract class AbstractVelocityGuiFormBuilderImpl implements IVelocityGui
   }
 
   /**
-   * Generate a new {@link VelocityContext} and populate it with MOA-ID GUI parameters.
+   * Generate a new {@link VelocityContext} and populate it with MOA-ID GUI
+   * parameters.
    *
    * @param config GUI builder config
    * @return Context of Velocity engine
@@ -175,8 +178,8 @@ public abstract class AbstractVelocityGuiFormBuilderImpl implements IVelocityGui
    * Load the template from different resources.
    *
    * @param config GUI builder config
-   * @return An {@link InputStream} but never null. The {@link InputStream} had to be closed be the
-   *         invoking method
+   * @return An {@link InputStream} but never null. The {@link InputStream} had to
+   *         be closed be the invoking method
    * @throws GuiBuildException In case of an error
    */
   @Override
@@ -207,7 +210,6 @@ public abstract class AbstractVelocityGuiFormBuilderImpl implements IVelocityGui
   protected abstract InputStream getInternalTemplate(IVelocityGuiBuilderConfiguration config)
       throws GuiBuildException;
 
-
   protected String getInternalClasspathTemplateDir(final IVelocityGuiBuilderConfiguration config,
       final String defaultClassPathDir) {
     String dir = config.getClasspathTemplateDir();
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/velocity/VelocityLogAdapter.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/velocity/VelocityLogAdapter.java
index 05cbaf58..bf8e75a9 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/velocity/VelocityLogAdapter.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/gui/velocity/VelocityLogAdapter.java
@@ -37,8 +37,8 @@ public class VelocityLogAdapter implements LogChute {
   public VelocityLogAdapter() {
     try {
       /*
-       * register this class as a logger with the Velocity singleton (NOTE: this would not work for
-       * the non-singleton method.)
+       * register this class as a logger with the Velocity singleton (NOTE: this would
+       * not work for the non-singleton method.)
        */
       Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, this);
       Velocity.init();