More options for pad() and prepad() to support toColorString().

Name change? Different default prefix? RFC.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2643 6335cc39-0255-0410-8fd6-9bcaacd3b74c

src/java/com/samskivert/util/StringUtil.java

@@ -255,31 +255,49 @@ public class StringUtil
      */
     public static String pad (String value, int width)
     {
-        // sanity check
+        return pad(value, width, ' ');
-        if (width <= 0) {
-            throw new IllegalArgumentException("Pad width must be greater than zero.");
-        } else if (value.length() >= width) {
-            return value;
-        } else {
-            return value + spaces(width-value.length());
-        }
     }
 
     /**
-     * Pads the supplied string to the requested string width by prepending spaces to the end of
+     * Pads the supplied string to the requested string width by appending the specified character
-     * the returned string. If the original string is wider than the requested width, it is
+     * to the end of the returned string.
-     * returned unmodified.
+     * If the original string is wider than the requested width, it is returned unmodified.
      */
-    public static String prepad (String value, int width)
+    public static String pad (String value, int width, char c)
     {
         // sanity check
         if (width <= 0) {
             throw new IllegalArgumentException("Pad width must be greater than zero.");
-        } else if (value.length() >= width) {
-            return value;
-        } else {
-            return spaces(width-value.length()) + value;
         }
+        int l = value.length();
+        return (l >= width) ? value
+                            : value + fill(c, width - l);
+    }
+
+    /**
+     * Pads the supplied string to the requested string width by prepending spaces to the beginning
+     * of the string. If the original string is wider than the requested width, it is
+     * returned unmodified.
+     */
+    public static String prepad (String value, int width)
+    {
+        return prepad(value, width, ' ');
+    }
+
+    /**
+     * Pads the supplied string to the requested string width by prepending the specified character
+     * to the beginning of the string.
+     * If the original string is wider than the requested width, it is returned unmodified.
+     */
+    public static String prepad (String value, int width, char c)
+    {
+        // sanity check
+        if (width <= 0) {
+            throw new IllegalArgumentException("Pad width must be greater than zero.");
+        }
+        int l = value.length();
+        return (l >= width) ? value
+                            : fill(c, width - l) + value;
     }
 
     /**
@@ -315,6 +333,25 @@ public class StringUtil
         return false;
     }
 
+    /**
+     * Format the specified int as a String color value, like "0x000000".
+     */
+    public static String toColorString (int c)
+    {
+        return toColorString(c, "0x");
+    }
+
+    /**
+     * Format the specified int as a String color value.
+     *
+     * @param c the int value to format.
+     * @param prefix something like "0x" or "#", or just "".
+     */
+    public static String toColorString (int c, String prefix)
+    {
+        return prefix + prepad(Integer.toHexString(c), 6, '0');
+    }
+
     /**
      * Formats a floating point value with useful default rules; ie. always display a digit to the
      * left of the decimal and display only two digits to the right of the decimal (rounding as