1 files changed, 69 insertions, 66 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
index 41440f323..4cb174e1c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
@@ -175,7 +175,7 @@ public class AuthenticationSession implements Serializable {
 	 * SAML attributes from an extended infobox validation to be appended to the
 	 * SAML assertion delivered to the final online application.
 	 */
-	private List extendedSAMLAttributesOA;
+	private List<ExtendedSAMLAttribute> extendedSAMLAttributesOA;
 
 	/**
 	 * The boolean value for either a target or a wbPK is provided as SAML
@@ -187,7 +187,7 @@ public class AuthenticationSession implements Serializable {
 	 * SAML attributes from an extended infobox validation to be appended to the
 	 * SAML assertion of the AUTHBlock.
 	 */
-	private List extendedSAMLAttributesAUTH;
+	private List<ExtendedSAMLAttribute> extendedSAMLAttributesAUTH;
 
 	/**
 	 * If infobox validators are needed after signing, they can be stored in
@@ -598,7 +598,10 @@ public class AuthenticationSession implements Serializable {
 	 * @return The SAML Attributes to be appended to the AUTHBlock. Maybe
 	 *         <code>null</code>.
 	 */
-	public List getExtendedSAMLAttributesAUTH() {
+	public List<ExtendedSAMLAttribute> getExtendedSAMLAttributesAUTH() {
+		if (extendedSAMLAttributesAUTH == null)
+			extendedSAMLAttributesAUTH = new ArrayList<ExtendedSAMLAttribute>();
+		
 		return extendedSAMLAttributesAUTH;
 	}
 
@@ -608,7 +611,7 @@ public class AuthenticationSession implements Serializable {
 	 * @param extendedSAMLAttributesAUTH
 	 *            The SAML Attributes to be appended to the AUTHBlock.
 	 */
-	public void setExtendedSAMLAttributesAUTH(List extendedSAMLAttributesAUTH) {
+	public void setExtendedSAMLAttributesAUTH(List<ExtendedSAMLAttribute> extendedSAMLAttributesAUTH) {
 		this.extendedSAMLAttributesAUTH = extendedSAMLAttributesAUTH;
 	}
 
@@ -619,7 +622,7 @@ public class AuthenticationSession implements Serializable {
 	 * @return The SAML Attributes to be appended to the SAML assertion
 	 *         delivered to the online application
 	 */
-	public List getExtendedSAMLAttributesOA() {
+	public List<ExtendedSAMLAttribute> getExtendedSAMLAttributesOA() {
 		return extendedSAMLAttributesOA;
 	}
 
@@ -631,7 +634,7 @@ public class AuthenticationSession implements Serializable {
 	 *            The SAML Attributes to be appended to the SAML assertion
 	 *            delivered to the online application.
 	 */
-	public void setExtendedSAMLAttributesOA(List extendedSAMLAttributesOA) {
+	public void setExtendedSAMLAttributesOA(List<ExtendedSAMLAttribute> extendedSAMLAttributesOA) {
 		this.extendedSAMLAttributesOA = extendedSAMLAttributesOA;
 	}
 
@@ -688,27 +691,27 @@ public class AuthenticationSession implements Serializable {
 		return infoboxValidators.iterator();
 	}
 
-	/**
-	 * Adds an infobox validator class to the stored infobox validators.
-	 * 
-	 * @param infoboxIdentifier
-	 *            the identifier of the infobox the validator belongs to
-	 * @param infoboxFriendlyName
-	 *            the friendly name of the infobox
-	 * @param infoboxValidator
-	 *            the infobox validator to add
-	 */
-	public Iterator addInfoboxValidator(String infoboxIdentifier,
-			String infoboxFriendlyName, InfoboxValidator infoboxValidator) {
-		if (infoboxValidators == null)
-			infoboxValidators = new ArrayList();
-		Vector v = new Vector(3);
-		v.add(infoboxIdentifier);
-		v.add(infoboxFriendlyName);
-		v.add(infoboxValidator);
-		infoboxValidators.add(v);
-		return infoboxValidators.iterator();
-	}
+//	/**
+//	 * Adds an infobox validator class to the stored infobox validators.
+//	 * 
+//	 * @param infoboxIdentifier
+//	 *            the identifier of the infobox the validator belongs to
+//	 * @param infoboxFriendlyName
+//	 *            the friendly name of the infobox
+//	 * @param infoboxValidator
+//	 *            the infobox validator to add
+//	 */
+//	public Iterator addInfoboxValidator(String infoboxIdentifier,
+//			String infoboxFriendlyName, InfoboxValidator infoboxValidator) {
+//		if (infoboxValidators == null)
+//			infoboxValidators = new ArrayList();
+//		Vector v = new Vector(3);
+//		v.add(infoboxIdentifier);
+//		v.add(infoboxFriendlyName);
+//		v.add(infoboxValidator);
+//		infoboxValidators.add(v);
+//		return infoboxValidators.iterator();
+//	}
 
 	/**
 	 * Tests for pending input events of the infobox validators.
@@ -730,46 +733,46 @@ public class AuthenticationSession implements Serializable {
 		return result;
 	}
 
-	/**
-	 * Returns the first pending infobox validator.
-	 * 
-	 * @return the infobox validator class
-	 */
-	public InfoboxValidator getFirstPendingValidator() {
-		Iterator iter = getInfoboxValidatorIterator();
-		if (iter != null) {
-			while (iter.hasNext()) {
-				Vector infoboxValidatorVector = (Vector) iter.next();
-				InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector
-						.get(2);
-				String form = infoboxvalidator.getForm();
-				if (!ParepUtils.isEmpty(form))
-					return infoboxvalidator;
-			}
-		}
-		return null;
-	}
+//	/**
+//	 * Returns the first pending infobox validator.
+//	 * 
+//	 * @return the infobox validator class
+//	 */
+//	public InfoboxValidator getFirstPendingValidator() {
+//		Iterator iter = getInfoboxValidatorIterator();
+//		if (iter != null) {
+//			while (iter.hasNext()) {
+//				Vector infoboxValidatorVector = (Vector) iter.next();
+//				InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector
+//						.get(2);
+//				String form = infoboxvalidator.getForm();
+//				if (!ParepUtils.isEmpty(form))
+//					return infoboxvalidator;
+//			}
+//		}
+//		return null;
+//	}
 
-	/**
-	 * Returns the input form of the first pending infobox validator input
-	 * processor.
-	 * 
-	 * @return the form to show
-	 */
-	public String getFirstValidatorInputForm() {
-		Iterator iter = getInfoboxValidatorIterator();
-		if (iter != null) {
-			while (iter.hasNext()) {
-				Vector infoboxValidatorVector = (Vector) iter.next();
-				InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector
-						.get(2);
-				String form = infoboxvalidator.getForm();
-				if (!ParepUtils.isEmpty(form))
-					return form;
-			}
-		}
-		return null;
-	}
+//	/**
+//	 * Returns the input form of the first pending infobox validator input
+//	 * processor.
+//	 * 
+//	 * @return the form to show
+//	 */
+//	public String getFirstValidatorInputForm() {
+//		Iterator iter = getInfoboxValidatorIterator();
+//		if (iter != null) {
+//			while (iter.hasNext()) {
+//				Vector infoboxValidatorVector = (Vector) iter.next();
+//				InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector
+//						.get(2);
+//				String form = infoboxvalidator.getForm();
+//				if (!ParepUtils.isEmpty(form))
+//					return form;
+//			}
+//		}
+//		return null;
+//	}
 
 	/**
 	 * Returns domain identifier (the register and number in the register