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

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathFilter.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathFilter.java
index 06a49a2..f3a12dc 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathFilter.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/common/XPathFilter.java
@@ -21,42 +21,43 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.api.common;
 
 import java.util.Map;
 
 /**
  * An XPath expression set operation.
- * 
+ *
  * @author Patrick Peck
  * @version $Id$
  */
 public interface XPathFilter {
   /** Subtract this filter's node set from the resulting node set. */
-  public static final String SUBTRACT_TYPE = "subtract";
+  String SUBTRACT_TYPE = "subtract";
   /** Intersect this filter's node set with the resulting node set. */
-  public static final String INTERSECT_TYPE = "intersect";
+  String INTERSECT_TYPE = "intersect";
   /** Compute the union of this filter's node set and the resulting node set. */
-  public static final String UNION_TYPE = "union";
-  
+  String UNION_TYPE = "union";
+
   /**
    * Gets the type of this <code>XPathFilter</code>.
-   * 
+   *
    * @return The type of this <code>XPathFilter</code>.
    */
-  public String getFilterType();
+  String getFilterType();
+
   /**
    * Gets the XPath expression for selecting the nodes.
-   * 
+   *
    * @return The XPath expression for selecting the nodes.
    */
-  public String getXPathExpression();
+  String getXPathExpression();
+
   /**
-   * Gets The namespace prefix to URI mapping used during evaluation of the
-   * XPath expression.
-   * 
+   * Gets The namespace prefix to URI mapping used during evaluation of the XPath
+   * expression.
+   *
    * @return The namespace prefix to URI mapping.
    */
-  public Map getNamespaceDeclarations();
+  Map getNamespaceDeclarations();
 }