1 files changed, 45 insertions, 37 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
index 5f3fb20a..bf7453de 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,7 +19,8 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
+*/
+
 package at.asitplus.eidas.specific.connector.processes.tasks;
 
 import javax.servlet.http.HttpServletRequest;
@@ -30,8 +31,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import at.asitplus.eidas.specific.connector.MSConnectorEventCodes;
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.MsConnectorEventCodes;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
 import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
 import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
@@ -43,42 +44,49 @@ import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 
 /**
+ * Create country-selection page.
+ * 
  * @author tlenz
  *
  */
 @Component("GenerateCountrySelectionFrameTask")
 public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
-	private static final Logger log = LoggerFactory.getLogger(GenerateCountrySelectionFrameTask.class);
-	
-	@Autowired ISpringMvcGuiFormBuilder guiBuilder;
-	@Autowired IConfiguration basicConfig;
-	
-	@Override
-	public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
-			throws TaskExecutionException {
-		try {			
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.STARTING_COUNTRY_SELECTION);
-																					
-			IGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
-					basicConfig, 
-					pendingReq, 
-					MSeIDASNodeConstants.TEMPLATE_HTML_COUNTRYSELECTION, 
-					MSeIDASNodeConstants.ENDPOINT_COUNTRYSELECTION); 
-					 		 	 
-			guiBuilder.build(request, response, config, "BKU-Selection form");
-			
-		} catch (GuiBuildException e) {	
-			log.warn("Can not build GUI:'BKU-Selection'. Msg:" + e.getMessage());
-			throw new TaskExecutionException(pendingReq, 
-					"Can not build GUI. Msg:" + e.getMessage(), 
-					new EaafException("gui.00", new Object[]{e.getMessage()}, e));
-			
-		} catch (Exception e) {
-			log.warn("FinalizeAuthenticationTask has an internal error", e);
-			throw new TaskExecutionException(pendingReq, e.getMessage(), e);
-			
-		}
-	
-	}
+  private static final Logger log = LoggerFactory.getLogger(GenerateCountrySelectionFrameTask.class);
+
+  @Autowired
+  ISpringMvcGuiFormBuilder guiBuilder;
+  @Autowired
+  IConfiguration basicConfig;
+
+
+  @Override
+  public void execute(ExecutionContext executionContext, HttpServletRequest request,
+      HttpServletResponse response)
+      throws TaskExecutionException {
+    try {
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.STARTING_COUNTRY_SELECTION);
+
+      final IGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
+          basicConfig,
+          pendingReq,
+          MsEidasNodeConstants.TEMPLATE_HTML_COUNTRYSELECTION,
+          MsEidasNodeConstants.ENDPOINT_COUNTRYSELECTION,
+          resourceLoader);
+
+      guiBuilder.build(request, response, config, "BKU-Selection form");
+
+    } catch (final GuiBuildException e) {
+      log.warn("Can not build GUI:'BKU-Selection'. Msg:" + e.getMessage());
+      throw new TaskExecutionException(pendingReq,
+          "Can not build GUI. Msg:" + e.getMessage(),
+          new EaafException("gui.00", new Object[] { e.getMessage() }, e));
+
+    } catch (final Exception e) {
+      log.warn("FinalizeAuthenticationTask has an internal error", e);
+      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
+
+    }
+
+  }
 
 }