From fda1a8333b9bd11d0457125c3156a39f03d74bd6 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Fri, 2 Aug 2019 12:02:35 +0200
Subject: Refactoring to eIDASNode 2.2, eaaf-components 1.0.8

---
 .../gui/StaticGuiBuilderConfiguration.java         | 32 ++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java')

diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
index aa5e1238..088c48a7 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
@@ -32,8 +32,6 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.slf4j.Logger;
@@ -41,17 +39,17 @@ import org.slf4j.LoggerFactory;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGUIBuilderConfiguration;
 import at.gv.egiz.eaaf.core.api.gui.ModifyableGuiBuilderConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.impl.gui.AbstractGUIFormBuilderConfiguration;
 import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
 
-public class StaticGuiBuilderConfiguration extends AbstractGUIFormBuilderConfiguration implements ModifyableGuiBuilderConfiguration {
+public class StaticGuiBuilderConfiguration extends AbstractGUIFormBuilderConfiguration implements IVelocityGUIBuilderConfiguration, ModifyableGuiBuilderConfiguration {
 	private static final Logger log = LoggerFactory.getLogger(StaticGuiBuilderConfiguration.class);
 	
 	private IRequest pendingReq = null;
 	private IConfiguration basicConfig = null;
-	Map<String, Object> params =  new HashMap<String, Object>();
 	
 	public StaticGuiBuilderConfiguration(IConfiguration basicConfig, String authURL, String viewName, String formSubmitEndpoint) {
 		super(authURL, viewName, formSubmitEndpoint);
@@ -103,24 +101,30 @@ public class StaticGuiBuilderConfiguration extends AbstractGUIFormBuilderConfigu
 	}
 
 	@Override
-	protected Map<String, Object> getSpecificViewParameters() {		
-		if (pendingReq != null) {							
-			params.put(PARAM_PENDINGREQUESTID, StringEscapeUtils.escapeHtml(pendingReq.getPendingRequestId()));
-			
-		}	
+	public void putCustomParameterWithOutEscaption(String group, String key, Object value) {
+		log.info("Add GUI-Template parameters WITHOUT escaption ARE NOT supported!!!!!");
 		
-		return params;
 	}
 
 	@Override
-	public void putCustomParameter(String key, String value) {
-		params.put(key, StringEscapeUtils.escapeHtml(value));
+	public void putCustomParameter(String group, String key, String value) {
+		setViewParameter(getFromGroup(), key, StringEscapeUtils.escapeHtml(value));
 		
 	}
 
 	@Override
-	public void putCustomParameterWithOutEscaption(String arg0, Object arg1) {
-		log.info("Add GUI-Template parameters WITHOUT escaption ARE NOT supported!!!!!");
+	protected void putSpecificViewParameters() {
+		if (pendingReq != null) {							
+			setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID, StringEscapeUtils.escapeHtml(pendingReq.getPendingRequestId()));
+			setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID_DEPRECATED, StringEscapeUtils.escapeHtml(pendingReq.getPendingRequestId()));
+			
+		}
+		
+	}
+
+	@Override
+	protected String getFromGroup() {
+		return null;
 		
 	}
 
-- 
cgit v1.2.3