From d9a402c18755d47ad17283c5c52fc2311df56e85 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Mon, 2 May 2022 12:24:13 +0200
Subject: fix(gui): fix possible errors on language selection by GUI operation

---
 .../processes/tasks/GenerateCountrySelectionFrameTask.java          | 6 +++---
 .../auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java       | 6 +++---
 .../auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java        | 6 +++---
 3 files changed, 9 insertions(+), 9 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 e87979fb..5cc15814 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
@@ -38,7 +38,7 @@ import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 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.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import at.gv.egiz.eaaf.core.impl.idp.controller.tasks.AbstractLocaleAuthServletTask;
 
 /**
  * Create country-selection page.
@@ -47,7 +47,7 @@ import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
  *
  */
 @Component("GenerateCountrySelectionFrameTask")
-public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
+public class GenerateCountrySelectionFrameTask extends AbstractLocaleAuthServletTask {
 
   @Autowired
   ISpringMvcGuiFormBuilder guiBuilder;
@@ -56,7 +56,7 @@ public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
 
 
   @Override
-  public void execute(ExecutionContext executionContext, HttpServletRequest request,
+  public void executeWithLocale(ExecutionContext executionContext, HttpServletRequest request,
       HttpServletResponse response)
       throws TaskExecutionException {
     try {
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java
index 060f9624..190e28eb 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAustrianResidenceGuiTask.java
@@ -35,7 +35,7 @@ import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import at.gv.egiz.eaaf.core.impl.idp.controller.tasks.AbstractLocaleAuthServletTask;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -45,7 +45,7 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Slf4j
 @Component("GenerateAustrianResidenceGuiTask")
-public class GenerateAustrianResidenceGuiTask extends AbstractAuthServletTask {
+public class GenerateAustrianResidenceGuiTask extends AbstractLocaleAuthServletTask {
 
   public static final String PARAM_FORMWIZARDPOINT = "wizardEndpoint";
   
@@ -55,7 +55,7 @@ public class GenerateAustrianResidenceGuiTask extends AbstractAuthServletTask {
   private IConfiguration basicConfig;
 
   @Override
-  public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
+  public void executeWithLocale(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
       throws TaskExecutionException {
     try {
       final StaticGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java
index f6ca0309..11da4281 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateOtherLoginMethodGuiTask.java
@@ -39,7 +39,7 @@ import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.gui.AbstractGuiFormBuilderConfiguration;
-import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import at.gv.egiz.eaaf.core.impl.idp.controller.tasks.AbstractLocaleAuthServletTask;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -53,7 +53,7 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Slf4j
 @Component("GenerateOtherLoginMethodGuiTask")
-public class GenerateOtherLoginMethodGuiTask extends AbstractAuthServletTask {
+public class GenerateOtherLoginMethodGuiTask extends AbstractLocaleAuthServletTask {
 
   @Autowired
   private ISpringMvcGuiFormBuilder guiBuilder;
@@ -62,7 +62,7 @@ public class GenerateOtherLoginMethodGuiTask extends AbstractAuthServletTask {
   private IConfiguration basicConfig;
 
   @Override
-  public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
+  public void executeWithLocale(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
       throws TaskExecutionException {
     try {
       final StaticGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
-- 
cgit v1.2.3