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, 18 insertions, 15 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java
index 20a9b56..e9b4fea 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CMSDataObjectImpl.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.math.BigDecimal;
@@ -32,60 +31,64 @@ import at.gv.egovernment.moa.spss.api.common.MetaInfo;
 
 /**
  * Default implementation of <code>CMLSDataObject</code>.
- * 
+ *
  * @author Fatemeh Philippi
  * @version $Id$
  */
 public class CMSDataObjectImpl implements CMSDataObject {
-  
+
   /** The <code>MetaInfo</code> associated with the CMS data object. */
   private MetaInfo metaInfo;
   /** The <code>CMSContent</code> contained in this data object. */
   private CMSContent cmsContent;
-  
+
   private BigDecimal excludeByteRangeFrom;
   private BigDecimal excludeByteRangeTo;
 
   /**
    * Sets the meta information associated with the CMS data object.
-   * 
+   *
    * @param metaInfo The meta information.
    */
   public void setMetaInfo(MetaInfo metaInfo) {
     this.metaInfo = metaInfo;
   }
 
+  @Override
   public MetaInfo getMetaInfo() {
     return metaInfo;
   }
 
   /**
    * Sets the data of this <code>CMSDataObject</code>.
-   * 
+   *
    * @param cmsContent The actual data of this <code>CMSDataObject</code>.
    */
   public void setContent(CMSContent cmsContent) {
     this.cmsContent = cmsContent;
   }
 
+  @Override
   public CMSContent getContent() {
     return cmsContent;
   }
 
   public void setExcludeByteRangeFrom(BigDecimal excludeByteRangeFrom) {
-  	this.excludeByteRangeFrom = excludeByteRangeFrom;
+    this.excludeByteRangeFrom = excludeByteRangeFrom;
   }
-  
+
+  @Override
   public BigDecimal getExcludeByteRangeFrom() {
-	  return excludeByteRangeFrom;
+    return excludeByteRangeFrom;
   }
-  
+
   public void setExcludeByteRangeTo(BigDecimal excludeByteRangeTo) {
-	  this.excludeByteRangeTo = excludeByteRangeTo;
+    this.excludeByteRangeTo = excludeByteRangeTo;
   }
-  
+
+  @Override
   public BigDecimal getExcludeByteRangeTo() {
-	  return excludeByteRangeTo;
-  }	
-  
+    return excludeByteRangeTo;
+  }
+
 }