X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Futil%2Fxml%2FSimpleXML.java;h=83515816d5c7f5906133b9bd6f5362a0a89c09b0;hb=e47e15fdbb7515f5a3757c3f5df8c1d0950aee8e;hp=d42f13f6ee6465cc22d4b5c5dabef3b3e2e303c4;hpb=c2f52b9ee948150d1849f8ba3f088da41ce3b4c4;p=jSite.git

diff --git a/src/de/todesbaum/util/xml/SimpleXML.java b/src/de/todesbaum/util/xml/SimpleXML.java
index d42f13f..8351581 100644
--- a/src/de/todesbaum/util/xml/SimpleXML.java
+++ b/src/de/todesbaum/util/xml/SimpleXML.java
@@ -1,4 +1,6 @@
 /*
+ * jSite - SimpleXML.java - Copyright © 2006–2012 David Roden
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -30,8 +32,9 @@ import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
 /**
- * SimpleXML is a helper class to construct XML trees in a fast and simple way. Construct a new XML tree by calling {@link #SimpleXML(String)} and
- * append new nodes by calling {@link #append(String)}.
+ * SimpleXML is a helper class to construct XML trees in a fast and simple way.
+ * Construct a new XML tree by calling {@link #SimpleXML(String)} and append new
+ * nodes by calling {@link #append(String)}.
  *
  * @author David Roden <droden@gmail.com>
  * @version $Id:SimpleXML.java 221 2006-03-06 14:46:49Z bombe $
@@ -71,12 +74,14 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Returns the child node of this node with the specified name. If there are several child nodes with the specified name only the first node is
+	 * Returns the child node of this node with the specified name. If there are
+	 * several child nodes with the specified name only the first node is
 	 * returned.
 	 *
 	 * @param nodeName
 	 *            The name of the child node
-	 * @return The child node, or <code>null</code> if there is no child node with the specified name
+	 * @return The child node, or <code>null</code> if there is no child node
+	 *         with the specified name
 	 */
 	public SimpleXML getNode(String nodeName) {
 		for (int index = 0, count = children.size(); index < count; index++) {
@@ -88,20 +93,24 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Returns the child node that is specified by the names. The first element of <code>nodeNames</code> is the name of the child node of this
-	 * node, the second element of <code>nodeNames</code> is the name of a child node's child node, and so on. By using this method you can descend
-	 * into an XML tree pretty fast.
+	 * Returns the child node that is specified by the names. The first element
+	 * of <code>nodeNames</code> is the name of the child node of this node, the
+	 * second element of <code>nodeNames</code> is the name of a child node's
+	 * child node, and so on. By using this method you can descend into an XML
+	 * tree pretty fast.
 	 *
 	 * <pre>
+	 *
 	 * SimpleXML deepNode = topNode.getNodes(new String[] { &quot;person&quot;, &quot;address&quot;, &quot;number&quot; });
 	 * </pre>
 	 *
 	 * @param nodeNames
-	 * @return A node that is a deep child of this node, or <code>null</code> if the specified node does not eixst
+	 * @return A node that is a deep child of this node, or <code>null</code> if
+	 *         the specified node does not eixst
 	 */
 	public SimpleXML getNode(String[] nodeNames) {
 		SimpleXML node = this;
-		for (String nodeName: nodeNames) {
+		for (String nodeName : nodeNames) {
 			node = node.getNode(nodeName);
 		}
 		return node;
@@ -117,15 +126,17 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Returns all child nodes of this node with the specified name. If there are no child nodes with the specified name an empty array is returned.
+	 * Returns all child nodes of this node with the specified name. If there
+	 * are no child nodes with the specified name an empty array is returned.
 	 *
 	 * @param nodeName
-	 *            The name of the nodes to retrieve, or <code>null</code> to retrieve all nodes
+	 *            The name of the nodes to retrieve, or <code>null</code> to
+	 *            retrieve all nodes
 	 * @return All child nodes with the specified name
 	 */
 	public SimpleXML[] getNodes(String nodeName) {
 		List<SimpleXML> resultList = new ArrayList<SimpleXML>();
-		for (SimpleXML child: children) {
+		for (SimpleXML child : children) {
 			if ((nodeName == null) || child.name.equals(nodeName)) {
 				resultList.add(child);
 			}
@@ -134,9 +145,11 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Appends a new XML node with the specified name and returns the new node. With this method you can create deep structures very fast.
+	 * Appends a new XML node with the specified name and returns the new node.
+	 * With this method you can create deep structures very fast.
 	 *
 	 * <pre>
+	 *
 	 * SimpleXML mouseNode = topNode.append(&quot;computer&quot;).append(&quot;bus&quot;).append(&quot;usb&quot;).append(&quot;mouse&quot;);
 	 * </pre>
 	 *
@@ -149,7 +162,8 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Appends a new XML node with the specified name and value and returns the new node.
+	 * Appends a new XML node with the specified name and value and returns the
+	 * new node.
 	 *
 	 * @param nodeName
 	 *            The name of the node to append
@@ -162,7 +176,8 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Appends the node with all its child nodes to this node and returns the child node.
+	 * Appends the node with all its child nodes to this node and returns the
+	 * child node.
 	 *
 	 * @param newChild
 	 *            The node to append as a child
@@ -260,14 +275,15 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Appends all children of this node to the specified {@link Element}. If a node has a value that is not <code>null</code> the value is
-	 * appended as a text node.
+	 * Appends all children of this node to the specified {@link Element}. If a
+	 * node has a value that is not <code>null</code> the value is appended as a
+	 * text node.
 	 *
 	 * @param rootElement
 	 *            The element to attach this node's children to
 	 */
 	private void addChildren(Element rootElement) {
-		for (SimpleXML child: children) {
+		for (SimpleXML child : children) {
 			Element childElement = rootElement.getOwnerDocument().createElement(child.name);
 			rootElement.appendChild(childElement);
 			if (child.value != null) {
@@ -280,7 +296,8 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Creates a SimpleXML node from the specified {@link Document}. The SimpleXML node of the document's top-level node is returned.
+	 * Creates a SimpleXML node from the specified {@link Document}. The
+	 * SimpleXML node of the document's top-level node is returned.
 	 *
 	 * @param document
 	 *            The {@link Document} to create a SimpleXML node from
@@ -293,7 +310,8 @@ public class SimpleXML {
 	}
 
 	/**
-	 * Appends the child nodes of the specified {@link Document} to this node. Text nodes are converted into a node's value.
+	 * Appends the child nodes of the specified {@link Document} to this node.
+	 * Text nodes are converted into a node's value.
 	 *
 	 * @param xmlDocument
 	 *            The SimpleXML node to append the child nodes to
@@ -305,7 +323,7 @@ public class SimpleXML {
 		NodeList childNodes = document.getChildNodes();
 		for (int childIndex = 0, childCount = childNodes.getLength(); childIndex < childCount; childIndex++) {
 			Node childNode = childNodes.item(childIndex);
-			if ((childNode.getChildNodes().getLength() == 1) && (childNode.getFirstChild().getNodeName().equals("#text")) /*&& (childNode.getFirstChild().getNodeValue().trim().length() != 0)*/) {
+			if ((childNode.getChildNodes().getLength() == 1) && (childNode.getFirstChild().getNodeName().equals("#text"))) {
 				xmlDocument.append(childNode.getNodeName(), childNode.getFirstChild().getNodeValue());
 			} else {
 				if (!childNode.getNodeName().equals("#text") || (childNode.getChildNodes().getLength() != 0)) {