Removed PersonData return value.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@893 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 13 insertions, 39 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java
index 24eb01e95..ad2e0134f 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/data/InfoboxValidationresultImpl.java
@@ -1,6 +1,5 @@
 package at.gv.egovernment.moa.id.auth.data;
 
-import org.w3c.dom.Element;
 
 /**
  * Default implementation of the {@link InfoboxValidationresult} interface.
@@ -24,35 +23,26 @@ public class InfoboxValidationresultImpl implements InfoboxValidationResult {
    */
   protected ExtendedSAMLAttribute[] extendedSamlAttributes_; 
   
-  /**
-   * The <code>&lt;pr:PersonData&gt;</code> element to be used in the final 
-   * <code>&lt;saml:Assertion&gt;</code>, if the validator runs in the
-   * <code>compatibility mode</code>.
-   */
-  protected Element personData_;
   
   /**
    * Constructor.
    * 
-   * @param valid
-   * @param extendedSamlAttributes
-   * @param errorMessage
-   * @param personData
+   * @param valid                   Global validation result.
+   * @param extendedSamlAttributes  SAML attributes that should be appended to the final
+   *                                <code>SAML Assertion</code> or to the <code>AUTH Block</code>
+   *                                or to both.
+   * @param errorMessage            An error message if infobox validation fails.
    */
   public InfoboxValidationresultImpl(
     boolean valid, 
     ExtendedSAMLAttribute[] extendedSamlAttributes,
-    String errorMessage,
-    Element personData)
+    String errorMessage)
   {
     valid_ = valid;
     extendedSamlAttributes_ = extendedSamlAttributes;
     errorMessage_ = errorMessage;
-    personData_ = personData;
   }
 
-    
-   
 
   /**
    * @see at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult#getErrorMessage()
@@ -69,13 +59,6 @@ public class InfoboxValidationresultImpl implements InfoboxValidationResult {
   }
 
   /**
-   * @see at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult#getPersonData()
-   */
-  public Element getPersonData() {
-    return personData_;
-  }
-
-  /**
    * @see at.gv.egovernment.moa.id.auth.data.InfoboxValidationResult#isValid()
    */
   public boolean isValid() {
@@ -83,37 +66,28 @@ public class InfoboxValidationresultImpl implements InfoboxValidationResult {
   }
 
   /**
-   * Sets the errorMessage.
+   * Sets the error message if validation fails..
    *
-   * @param errorMessage The errorMessage to set.
+   * @param errorMessage The error message to set.
    */
   public void setErrorMessage(String errorMessage) {
     errorMessage_ = errorMessage;
   }
 
   /**
-   * Sets the extendedSamlAttributes.
+   * Sets the SAML attributes returned by the infobox validatior..
    *
-   * @param extendedSamlAttributes The extendedSamlAttributes to set.
+   * @param extendedSamlAttributes The SAML attributes returned by the infobox validator.
    */
   public void setExtendedSamlAttributes(ExtendedSAMLAttribute[] extendedSamlAttributes) {
     extendedSamlAttributes_ = extendedSamlAttributes;
   }
 
   /**
-   * Sets the <code>&lt;pr:PersonData&gt;</code> element.
-   *
-   * @param personData <code>&lt;pr:PersonData&gt;</code> to set.
-   */
-  public void setPersonData(Element personData) {
-    personData_ = personData;
-  }
-
-  /**
-   * Specify whether the result is valid or not.
+   * Sets validation result..
    *
-   * @param valid <code>True</code> if the infobox could be validated successfully,
-   * otherwise <code>false</code>.
+   * @param valid   <code>True</code> if the infobox could be validated successfully,
+   *                otherwise <code>false</code>.
    */
   public void setValid(boolean valid) {
     valid_ = valid;