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, 6 insertions, 5 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java
index 7fe1cf9..aa49375 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ContentBinaryImpl.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.io.InputStream;
@@ -30,33 +29,35 @@ import at.gv.egovernment.moa.spss.api.common.ContentBinary;
 
 /**
  * Default implementation of <code>ContentBinary</code>.
- * 
+ *
  * @author Fatemeh Philippi
  * @version $Id$
  */
 public class ContentBinaryImpl extends ContentImpl implements ContentBinary {
 
-  /** The binary content as a stream. */ 
+  /** The binary content as a stream. */
   private InputStream binaryContent;
 
   /**
    * Sets the binary content as a stream.
-   * 
+   *
    * @param binaryContent The binary content as a stream.
    */
   public void setBinaryContent(InputStream binaryContent) {
     this.binaryContent = binaryContent;
   }
 
+  @Override
   public InputStream getBinaryContent() {
     return binaryContent;
   }
 
   /**
    * Gets the type of content.
-   * 
+   *
    * @return BINARY_CONTENT
    */
+  @Override
   public int getContentType() {
     return BINARY_CONTENT;
   }