1 files changed, 76 insertions, 68 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/AbstractLocaleAuthServletTask.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/AbstractLocaleAuthServletTask.java
index 6b5f1a4c..3c8fd604 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/AbstractLocaleAuthServletTask.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/AbstractLocaleAuthServletTask.java
@@ -13,77 +13,85 @@ import org.slf4j.LoggerFactory;
 import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egiz.eaaf.core.api.data.EAAFEventCodes;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 
 public abstract class AbstractLocaleAuthServletTask extends AbstractAuthServletTask {
-	private static final Logger log = LoggerFactory.getLogger(AbstractLocaleAuthServletTask.class);
-	
-	public static final String PROP_REQ_PARAM_LOCALE = "lang";
-	
-	@Override
-	public final void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
-			throws TaskExecutionException {
-
-		final Serializable changeLangFlag = executionContext.get(EAAFConstants.PROCESSCONTEXT_SWITCH_LANGUAGE);
-		final String localeParam =  StringEscapeUtils.escapeHtml4(request.getParameter(PROP_REQ_PARAM_LOCALE));
-		if (StringUtils.isNotEmpty(localeParam) && 
-				(changeLangFlag == null || !((Boolean)changeLangFlag)) ) {
-			log.debug("Find {} parameter. Reload last task with new locale: {}", PROP_REQ_PARAM_LOCALE, localeParam);
-			executionContext.put(EAAFConstants.PROCESSCONTEXT_SWITCH_LANGUAGE, true);
-			
-			
-			
-		} else {			
-			log.trace("Find {} parameter. Processing this task ... ",PROP_REQ_PARAM_LOCALE);
-			executionContext.put(EAAFConstants.PROCESSCONTEXT_SWITCH_LANGUAGE, false);
-			
-			if (parseFlagFromHttpRequest(request, EAAFConstants.PARAM_HTTP_STOP_PROCESS, false)) {
-				log.info("Authentication process WAS stopped by entity. Stopping auth. process ... ");				
-				stopProcessFromUserDecision(executionContext, request, response);
-				
-			} else			
-				executeWithLocale(executionContext, request, response);
-			
-		}
-		
-	}
-
-	protected void stopProcessFromUserDecision(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) throws TaskExecutionException {
-		try {
-			revisionsLogger.logEvent(pendingReq, EAAFEventCodes.PROCESS_STOPPED_BY_USER);
-			pendingReq.setAbortedByUser(true);
-			pendingReq.setAuthenticated(false);												
-			performRedirectToProtocolFinialization(executionContext, pendingReq, request, response);
-			
-			log.trace("Set process-cancelation flag");
-			executionContext.setCanceleProcessFlag();
-			
-		} catch (final EAAFException e) {
-			throw new TaskExecutionException(pendingReq, e.getMessage(), e);
-			
-		} catch (final Exception e) {
-			log.warn("Stopping auth.process FAILED", e);
-			throw new TaskExecutionException(pendingReq, e.getMessage(), e);
-			
-		}
-		
-	}
-	
-	protected boolean parseFlagFromHttpRequest(HttpServletRequest httpReq, String httpParamName, boolean defaultValue) {
-		final String flag = httpReq.getParameter(httpParamName);
-		log.trace("Get httpParam: {} with value: {}", httpParamName, flag);
-		if (StringUtils.isNotEmpty(httpParamName)) {
-			return Boolean.parseBoolean(flag);
-			
-		} else {
-			return defaultValue;
-		}
-			
-	}
-	
-	protected abstract void executeWithLocale(ExecutionContext executionContext, HttpServletRequest request,
-			HttpServletResponse response) throws TaskExecutionException;
+  private static final Logger log = LoggerFactory.getLogger(AbstractLocaleAuthServletTask.class);
+
+  public static final String PROP_REQ_PARAM_LOCALE = "lang";
+
+  @Override
+  public final void execute(final ExecutionContext executionContext,
+      final HttpServletRequest request, final HttpServletResponse response)
+      throws TaskExecutionException {
+
+    final Serializable changeLangFlag =
+        executionContext.get(EAAFConstants.PROCESSCONTEXT_SWITCH_LANGUAGE);
+    final String localeParam =
+        StringEscapeUtils.escapeHtml4(request.getParameter(PROP_REQ_PARAM_LOCALE));
+    if (StringUtils.isNotEmpty(localeParam)
+        && (changeLangFlag == null || !((Boolean) changeLangFlag))) {
+      log.debug("Find {} parameter. Reload last task with new locale: {}", PROP_REQ_PARAM_LOCALE,
+          localeParam);
+      executionContext.put(EAAFConstants.PROCESSCONTEXT_SWITCH_LANGUAGE, true);
+
+
+
+    } else {
+      log.trace("Find {} parameter. Processing this task ... ", PROP_REQ_PARAM_LOCALE);
+      executionContext.put(EAAFConstants.PROCESSCONTEXT_SWITCH_LANGUAGE, false);
+
+      if (parseFlagFromHttpRequest(request, EAAFConstants.PARAM_HTTP_STOP_PROCESS, false)) {
+        log.info("Authentication process WAS stopped by entity. Stopping auth. process ... ");
+        stopProcessFromUserDecision(executionContext, request, response);
+
+      } else {
+        executeWithLocale(executionContext, request, response);
+      }
+
+    }
+
+  }
+
+  protected void stopProcessFromUserDecision(final ExecutionContext executionContext,
+      final HttpServletRequest request, final HttpServletResponse response)
+      throws TaskExecutionException {
+    try {
+      revisionsLogger.logEvent(pendingReq, EAAFEventCodes.PROCESS_STOPPED_BY_USER);
+      pendingReq.setAbortedByUser(true);
+      pendingReq.setAuthenticated(false);
+      performRedirectToProtocolFinialization(executionContext, pendingReq, request, response);
+
+      log.trace("Set process-cancelation flag");
+      executionContext.setCanceleProcessFlag();
+
+    } catch (final EaafException e) {
+      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
+
+    } catch (final Exception e) {
+      log.warn("Stopping auth.process FAILED", e);
+      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
+
+    }
+
+  }
+
+  protected boolean parseFlagFromHttpRequest(final HttpServletRequest httpReq,
+      final String httpParamName, final boolean defaultValue) {
+    final String flag = httpReq.getParameter(httpParamName);
+    log.trace("Get httpParam: {} with value: {}", httpParamName, flag);
+    if (StringUtils.isNotEmpty(httpParamName)) {
+      return Boolean.parseBoolean(flag);
+
+    } else {
+      return defaultValue;
+    }
+
+  }
+
+  protected abstract void executeWithLocale(ExecutionContext executionContext,
+      HttpServletRequest request, HttpServletResponse response) throws TaskExecutionException;
 
 }