Changeset 25612 for main/trunk/gli/src

Timestamp:

2012-05-16T16:41:26+12:00 (12 years ago)

Author:

sjm84

Message:

Fixes a few minor XML formatting issues

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/util/XMLTools.java

@@ -955 +955 @@
             {
                 String text = e.getNodeValue();
-                text = text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("^[\\n\\r\\t\\s]*", "");
+                text = text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("^[\\n\\r\\t\\s]*", "").replaceAll("[\\n\\r\\t\\s]*$", "");
                 sb.append(text);
             }
@@ -1005 +1005 @@
             if (children.item(i).getNodeType() == Node.TEXT_NODE && indent)
             {
-                if (children.item(i).getNodeValue().matches("[^\\s]*"))
+                if (children.item(i).getNodeValue().trim().length() > 0)
                 {
                     indentSwapped = true;