Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig

# Conflicts:
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java

1 files changed, 11 insertions, 10 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java
index aaffaa7..30779a3 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateXMLSignatureRequestImpl.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.impl;
 
 import java.util.ArrayList;
@@ -32,44 +31,46 @@ import at.gv.egovernment.moa.spss.api.xmlsign.CreateXMLSignatureRequest;
 
 /**
  * Default implementation of <code>CreateXMLSignatureRequest</code>.
- * 
+ *
  * @author Fatemeh Philippi
  * @version $Id$
  */
 public class CreateXMLSignatureRequestImpl
-  implements CreateXMLSignatureRequest {
+    implements CreateXMLSignatureRequest {
 
-  /** The identifier for selecting the private keys for creating the signature.*/
+  /** The identifier for selecting the private keys for creating the signature. */
   private String keyIdentifier;
   /** Information for creating a single signature. */
   private List singleSignatureInfos = new ArrayList();
 
   /**
-   * Sets the identifier for selecting the private keys for creating the 
+   * Sets the identifier for selecting the private keys for creating the
    * signature.
-   * 
+   *
    * @param keyIdentifier The identifier for selecting the private keys.
    */
   public void setKeyIdentifier(String keyIdentifier) {
     this.keyIdentifier = keyIdentifier;
   }
 
+  @Override
   public String getKeyIdentifier() {
     return keyIdentifier;
   }
 
   /**
    * Sets the information for creating single signatures.
-   * 
+   *
    * @param singleSignaureInfos The information for creating single signatures.
    */
   public void setSingleSignatureInfos(List singleSignaureInfos) {
     this.singleSignatureInfos =
-      singleSignaureInfos != null
-        ? Collections.unmodifiableList(new ArrayList(singleSignaureInfos))
-        : null;
+        singleSignaureInfos != null
+            ? Collections.unmodifiableList(new ArrayList(singleSignaureInfos))
+            : null;
   }
 
+  @Override
   public List getSingleSignatureInfos() {
     return singleSignatureInfos;
   }