Changeset 26104 for main/trunk

Timestamp:

2012-08-14T15:13:55+12:00 (12 years ago)

Author:

kjdon

Message:

stripWhitespace and tidyWhitespace are now part of the formatting commands

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/XSLTUtil.java

@@ -168 +168 @@
     }
 
-    public static String tidyWhitespace(String original)
-    {
-
-        if (original == null || original.equals(""))
-        {
-            return original;
-        }
-        String new_s = original.replaceAll("\\s+", " ");
-        return new_s;
-    }
 
     public static String getInterfaceText(String interface_name, String lang, String key)
@@ -313 +303 @@
     }
 
+        public static String tidyWhitespace(String original, String lang)
+    {
+
+        if (original == null || original.equals(""))
+        {
+            return original;
+        }
+        String new_s = original.replaceAll("\\s+", " ");
+        return new_s;
+    }
+
+        public static String stripWhitespace(String original, String lang)
+    {
+
+        if (original == null || original.equals(""))
+        {
+            return original;
+        }
+        String new_s = original.replaceAll("\\s+", "");
+        return new_s;
+    }
+
     public static byte[] toUTF8(String orig, String lang)
     {