--- a/gnv/src/main/java/de/intevation/gnv/util/XMLUtils.java	Thu Mar 04 14:27:26 2010 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/util/XMLUtils.java	Fri Mar 05 09:33:30 2010 +0000
@@ -64,7 +64,7 @@
         }
     } // class ElementCreator
 
-    public Document newDocument() {
+    public static Document newDocument() {
         try {
             return DocumentBuilderFactory.newInstance().newDocumentBuilder()
                     .newDocument();
@@ -74,11 +74,11 @@
         return null;
     }
 
-    public XPath newXPath() {
+    public static XPath newXPath() {
         return newXPath(null);
     }
 
-    public XPath newXPath(NamespaceContext namespaceContext) {
+    public static XPath newXPath(NamespaceContext namespaceContext) {
         XPathFactory factory = XPathFactory.newInstance();
         XPath xpath = factory.newXPath();
         if (namespaceContext != null) {
@@ -87,11 +87,11 @@
         return xpath;
     }
 
-    public Object xpath(Object root, String query, QName returnTyp) {
+    public static Object xpath(Object root, String query, QName returnTyp) {
         return xpath(root, query, returnTyp, null);
     }
 
-    public final String xpathString(Object root, String query,
+    public static final String xpathString(Object root, String query,
                                     NamespaceContext namespaceContext) {
         return (String) xpath(root, query, XPathConstants.STRING,
                 namespaceContext);
@@ -116,33 +116,33 @@
         return null;
     }
 
-    public Object getXPath(Object root, String query, QName returnType) {
+    public static Object getXPath(Object root, String query, QName returnType) {
         return getXPath(root,query,returnType,ArtifactNamespaceContext.INSTANCE);
     }
 
-    public Object getXPath(
+    public static Object getXPath(
         Object root, String query, QName returnType, NamespaceContext context
     ) {
         return xpath(root, query, returnType, context);
     }
 
-    public String getStringXPath(String xpath) {
+    public static String getStringXPath(String xpath) {
         return getStringXPath(xpath, null);
     }
 
-    public NodeList getNodeSetXPath(Object root, String query) {
+    public static NodeList getNodeSetXPath(Object root, String query) {
         return (NodeList) getXPath(root, query, XPathConstants.NODESET);
     }
 
-    public Node getNodeXPath(Object root, String query) {
+    public static Node getNodeXPath(Object root, String query) {
         return (Node) getXPath(root, query, XPathConstants.NODE);
     }
 
-    public String getStringXPath(Object root, String xpath) {
+    public static String getStringXPath(Object root, String xpath) {
         return getStringXPath(root, xpath, null);
     }
 
-    public String getStringXPath(Object root, String query, String def) {
+    public static String getStringXPath(Object root, String query, String def) {
         String s = (String) getXPath(root, query, XPathConstants.STRING);
         return s == null || s.length() == 0 ? def : s;
     }
@@ -165,7 +165,7 @@
         return returnValue;
     }
 
-    public String writeNode2String(Node node) {
+    public static String writeNode2String(Node node) {
         try {
             DOMSource source = new DOMSource(node);
             return writeDOMSource2String(source);
@@ -179,14 +179,14 @@
         return null;
     }
 
-    public Document reInitDocument(Document document) {
+    public static Document reInitDocument(Document document) {
 
-        StringBufferInputStream inputStream = new StringBufferInputStream(this
-                .writeDocument2String(document));
-        return this.readDocument(inputStream);
+        StringBufferInputStream inputStream = new StringBufferInputStream(
+                writeDocument2String(document));
+        return readDocument(inputStream);
     }
 
-    public String writeDocument2String(Document document) {
+    public static String writeDocument2String(Document document) {
         try {
             DOMSource source = new DOMSource(document);
             return writeDOMSource2String(source);
@@ -207,7 +207,7 @@
      * @throws TransformerConfigurationException
      * @throws TransformerException
      */
-    private String writeDOMSource2String(DOMSource source)
+    private static String writeDOMSource2String(DOMSource source)
                                                           throws TransformerFactoryConfigurationError,
                                                           TransformerConfigurationException,
                                                           TransformerException {