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, 7 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java
index fe2a795..7b3f830 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/XMLDataObjectAssociation.java
@@ -21,14 +21,12 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.common;
 
-
 /**
  * Object encapsulating arbitrary content and optional descriptive meta
  * information.
- * 
+ *
  * @author Patrick Peck
  * @author Stephan Grill
  * @version $Id$
@@ -36,14 +34,15 @@ package at.gv.egovernment.moa.spss.api.common;
 public interface XMLDataObjectAssociation {
   /**
    * Gets descriptive meta information.
-   * 
+   *
    * @return The descriptive meta information.
    */
-  public MetaInfo getMetaInfo();
+  MetaInfo getMetaInfo();
+
   /**
    * Gets the actual content.
-   * 
+   *
    * @return The content of this association.
    */
-  public Content getContent();
+  Content getContent();
 }