From 26d7a7d02e431f6c1a5f83b0d121084f7a41006c Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Tue, 22 Feb 2005 06:44:56 +0000
Subject: [PATCH] Added truncate() and makeLinear() to StringTool and
 delineate() to StringUtil.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1593 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../com/samskivert/servlet/util/HTMLUtil.java   | 13 +++++++++++++
 .../com/samskivert/velocity/StringTool.java     | 17 +++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/projects/samskivert/src/java/com/samskivert/servlet/util/HTMLUtil.java b/projects/samskivert/src/java/com/samskivert/servlet/util/HTMLUtil.java
index 2c233e4d..e7458c1d 100644
--- a/projects/samskivert/src/java/com/samskivert/servlet/util/HTMLUtil.java
+++ b/projects/samskivert/src/java/com/samskivert/servlet/util/HTMLUtil.java
@@ -58,4 +58,17 @@ public class HTMLUtil
         text = StringUtil.replace(text, "\r\n\r\n", "\r\n<p>\r\n");
         return text;
     }
+
+    /**
+     * Inserts a &lt;br&gt; tag before every newline.
+     */
+    public static String makeLinear (String text)
+    {
+        if (text == null) {
+            return text;
+        }
+        // handle both line ending formats
+        text = StringUtil.replace(text, "\n", "<br>\n");
+        return text;
+    }
 }
diff --git a/projects/samskivert/src/java/com/samskivert/velocity/StringTool.java b/projects/samskivert/src/java/com/samskivert/velocity/StringTool.java
index 86ae7c42..f7d09783 100644
--- a/projects/samskivert/src/java/com/samskivert/velocity/StringTool.java
+++ b/projects/samskivert/src/java/com/samskivert/velocity/StringTool.java
@@ -80,6 +80,14 @@ public class StringTool
         return HTMLUtil.makeParagraphs(text);
     }
 
+    /**
+     * Adds a &lt;br&gt; tag before every newline.
+     */
+    public static String delineate (String text)
+    {
+        return HTMLUtil.makeLinear(text);
+    }
+
     /**
      * Converts a float to a reasonably formatted string.
      */
@@ -88,6 +96,15 @@ public class StringTool
         return NumberFormat.getInstance().format(value);
     }
 
+    /**
+     * Truncates the supplied text at the specified length, appending the
+     * specified "elipsis" indicator to the text if truncated.
+     */
+    public static String truncate (String text, int length, String append)
+    {
+        return StringUtil.truncate(text, length, append);
+    }
+
     /** For formatting percentages. */
     protected NumberFormat _percFormat;
 }