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/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java
index cbf3e4e..9a60bd2 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/XPathException.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moaspss.util;
 
 import java.io.PrintStream;
@@ -29,33 +28,33 @@ import java.io.PrintWriter;
 
 /**
  * An exception occurred evaluating an XPath.
- * 
+ *
  * @author Patrick Peck
  * @version $Id$
  */
 public class XPathException extends RuntimeException {
   /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1736311265333034392L;
-/** The wrapped exception. */
-  private Throwable wrapped;
-  
+   * 
+   */
+  private static final long serialVersionUID = 1736311265333034392L;
+  /** The wrapped exception. */
+  private final Throwable wrapped;
+
   /**
    * Create a <code>XPathException</code>.
-   * 
+   *
    * @param message The exception message.
    * @param wrapped The exception being the likely cause of this exception.
    */
   public XPathException(String message, Throwable wrapped) {
     // TODO: remove wrapped from super cstr. again
-	  super(message, wrapped);
-    this.wrapped = wrapped; 
+    super(message, wrapped);
+    this.wrapped = wrapped;
   }
-  
+
   /**
    * Return the wrapped exception.
-   * 
+   *
    * @return The wrapped exception being the likely cause of this exception.
    */
   public Throwable getWrapped() {
@@ -65,6 +64,7 @@ public class XPathException extends RuntimeException {
   /**
    * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
    */
+  @Override
   public void printStackTrace(PrintStream s) {
     super.printStackTrace(s);
     if (getWrapped() != null) {
@@ -76,6 +76,7 @@ public class XPathException extends RuntimeException {
   /**
    * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
    */
+  @Override
   public void printStackTrace(PrintWriter s) {
     super.printStackTrace(s);
     if (getWrapped() != null) {
@@ -83,5 +84,5 @@ public class XPathException extends RuntimeException {
       getWrapped().printStackTrace(s);
     }
   }
- 
+
 }