some code code-style modifications

active code-quality checks!

1 files changed, 60 insertions, 49 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
index a1faa0a4..ee1037a1 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/IdentityLink.java
@@ -1,22 +1,5 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria MOA-ID has been developed in a cooperation between
- * BRZ, the Federal Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by the European
- * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
- * compliance with the Licence. You may obtain a copy of the Licence at: http://www.osor.eu/eupl/
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the Licence
- * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the Licence for the specific language governing permissions and limitations under
- * the Licence.
- *
- * This product combines work with different licenses. See the "NOTICE" text 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.
- ******************************************************************************/
 /*
- * Copyright 2003 Federal Chancellery Austria MOA-ID has been developed in a cooperation between
+ * Copyright 2014 Federal Chancellery Austria MOA-ID has been developed in a cooperation between
  * BRZ, the Federal Chancellery Austria - ICT staff unit, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by the European
@@ -31,7 +14,7 @@
  * This product combines work with different licenses. See the "NOTICE" text 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.gv.egiz.eaaf.core.impl.idp.auth.data;
@@ -40,16 +23,20 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.Serializable;
 import java.security.PublicKey;
+
 import javax.xml.transform.TransformerException;
+
+import org.w3c.dom.Element;
+
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
 import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
-import org.w3c.dom.Element;
-
 
 /**
- * Data contained in an identity link issued by BMI, relevant to the MOA ID component. <br>
- * <code>"IdentityLink"</code> is the translation of <code>"Personenbindung"</code>.
+ * Data contained in an identity link issued by BMI, relevant to the MOA ID
+ * component. <br>
+ * <code>"IdentityLink"</code> is the translation of
+ * <code>"Personenbindung"</code>.
  *
  * @author Paul Ivancsics
  * @version $Id$
@@ -59,41 +46,44 @@ public class IdentityLink implements Serializable, IIdentityLink {
   private static final long serialVersionUID = 1L;
 
   /**
-   * <code>"identificationValue"</code> is the translation of <code>"Stammzahl"</code>.
+   * <code>"identificationValue"</code> is the translation of
+   * <code>"Stammzahl"</code>.
    */
   private String identificationValue;
   /**
-   * <code>"identificationType"</code> type of the identificationValue in the IdentityLink.
+   * <code>"identificationType"</code> type of the identificationValue in the
+   * IdentityLink.
    */
   private String identificationType;
   /**
-   * first name
+   * first name.
    */
   private String givenName;
   /**
-   * family name
+   * family name.
    */
   private String familyName;
 
   /**
-   * date of birth
+   * date of birth.
    */
   private String dateOfBirth;
   /**
-   * the original saml:Assertion-Element
+   * the original saml:Assertion-Element.
    */
   private transient Element samlAssertion;
   /**
-   * the serializes saml:Assertion
+   * the serializes saml:Assertion.
    */
   private String serializedSamlAssertion;
   /**
    * Element
-   * /saml:Assertion/saml:AttributeStatement/saml:Subject/saml:SubjectConfirmation/saml:SubjectConfirmationData/pr:Person
+   * /saml:Assertion/saml:AttributeStatement/saml:Subject
+   * /saml:SubjectConfirmation/saml:SubjectConfirmationData/pr:Person.
    */
   private transient Element prPerson = null;
   /**
-   * we need for each dsig:Reference Element all transformation elements
+   * we need for each dsig:Reference Element all transformation elements.
    */
   private transient Element[] dsigReferenceTransforms = null;
 
@@ -103,14 +93,15 @@ public class IdentityLink implements Serializable, IIdentityLink {
   private String issueInstant;
 
   /**
-   * we need all public keys stored in the identity link
+   * we need all public keys stored in the identity link.
    */
   private PublicKey[] publicKey;
 
   /**
-   * Constructor for IdentityLink
+   * Constructor for IdentityLink.
    */
-  public IdentityLink() {}
+  public IdentityLink() {
+  }
 
   /*
    * (non-Javadoc)
@@ -157,7 +148,8 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getIdentificationValue()
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#getIdentificationValue()
    */
   @Override
   public String getIdentificationValue() {
@@ -177,7 +169,9 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setDateOfBirth(java.lang.String)
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setDateOfBirth(java.lang.
+   * String)
    */
   @Override
   public void setDateOfBirth(final String dateOfBirth) {
@@ -187,7 +181,9 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setFamilyName(java.lang.String)
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setFamilyName(java.lang.
+   * String)
    */
   @Override
   public void setFamilyName(final String familyName) {
@@ -197,7 +193,8 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setGivenName(java.lang.String)
+   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setGivenName(java.lang.
+   * String)
    */
   @Override
   public void setGivenName(final String givenName) {
@@ -207,7 +204,9 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIdentificationValue(java.lang.String)
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIdentificationValue(java.
+   * lang.String)
    */
   @Override
   public void setIdentificationValue(final String identificationValue) {
@@ -217,7 +216,9 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIdentificationType(java.lang.String)
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIdentificationType(java.
+   * lang.String)
    */
   @Override
   public void setIdentificationType(final String identificationType) {
@@ -248,7 +249,8 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getSerializedSamlAssertion()
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#getSerializedSamlAssertion()
    */
   @Override
   public String getSerializedSamlAssertion() {
@@ -258,7 +260,9 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setSamlAssertion(org.w3c.dom.Element)
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setSamlAssertion(org.w3c.dom
+   * .Element)
    */
   @Override
   public void setSamlAssertion(final Element samlAssertion)
@@ -270,7 +274,8 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#getDsigReferenceTransforms()
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#getDsigReferenceTransforms()
    */
   @Override
   public Element[] getDsigReferenceTransforms() {
@@ -287,8 +292,8 @@ public class IdentityLink implements Serializable, IIdentityLink {
    * (non-Javadoc)
    *
    * @see
-   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setDsigReferenceTransforms(org.w3c.dom.Element
-   * [])
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setDsigReferenceTransforms(
+   * org.w3c.dom.Element [])
    */
   @Override
   public void setDsigReferenceTransforms(final Element[] dsigReferenceTransforms) {
@@ -317,7 +322,9 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setPublicKey(java.security.PublicKey[])
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setPublicKey(java.security.
+   * PublicKey[])
    */
   @Override
   public void setPublicKey(final PublicKey[] publicKey) {
@@ -346,7 +353,9 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setPrPerson(org.w3c.dom.Element)
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setPrPerson(org.w3c.dom.
+   * Element)
    */
   @Override
   public void setPrPerson(final Element prPerson) {
@@ -366,7 +375,9 @@ public class IdentityLink implements Serializable, IIdentityLink {
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIssueInstant(java.lang.String)
+   * @see
+   * at.gv.egovernment.moa.id.auth.data.IIdentityLink#setIssueInstant(java.lang.
+   * String)
    */
   @Override
   public void setIssueInstant(final String issueInstant) {