405 modified source files and 17,367 lines of diffs later we now enforce

more discipline when handling names in our code base. Any user entered
name should find its way into a Name object as soon as it comes out of a
text field or whatnot, and stay that way until it makes its way into a
text field or into a database record (for which String objects are vastly
simpler because of JORA magic).

Dear God, let me never again make a change this large for the rest of my
mortal life.

Unfortunately, this means we have to keep an eye out for funny business
pretty much everywhere. However, since we will absolutely want to test
market stalls and so forth on Azure, we'll have an opportunity to iron out
any funny business that might fall under the radar during our internal
testing.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2980 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/util/MessageBundle.java

@@ -1,5 +1,5 @@
 //
-// $Id: MessageBundle.java,v 1.24 2004/02/05 17:39:03 mdb Exp $
+// $Id: MessageBundle.java,v 1.25 2004/03/06 11:29:19 mdb Exp $
 
 package com.threerings.util;
 
@@ -266,7 +266,7 @@ public class MessageBundle
      * attempt to translate this string when doing recursive translations
      * (see {@link #xlate}).
      */
-    public static String taint (String text)
+    public static String taint (Object text)
     {
         return MessageUtil.taint(text);
     }
@@ -275,77 +275,77 @@ public class MessageBundle
      * Composes a message key with an array of arguments. The message can
      * subsequently be translated in a single call using {@link #xlate}.
      */
-    public static String compose (String key, String[] args)
+    public static String compose (String key, Object[] args)
     {
         return MessageUtil.compose(key, args);
     }
 
     /**
-     * A convenience method for calling {@link #compose(String,String[])}
+     * A convenience method for calling {@link #compose(String,Object[])}
      * with a single argument.
      */
-    public static String compose (String key, String arg)
+    public static String compose (String key, Object arg)
     {
-        return compose(key, new String[] { arg });
+        return compose(key, new Object[] { arg });
     }
 
     /**
-     * A convenience method for calling {@link #compose(String,String[])}
+     * A convenience method for calling {@link #compose(String,Object[])}
      * with two arguments.
      */
-    public static String compose (String key, String arg1, String arg2)
+    public static String compose (String key, Object arg1, Object arg2)
     {
-        return compose(key, new String[] { arg1, arg2 });
+        return compose(key, new Object[] { arg1, arg2 });
     }
 
     /**
-     * A convenience method for calling {@link #compose(String,String[])}
+     * A convenience method for calling {@link #compose(String,Object[])}
      * with three arguments.
      */
     public static String compose (
-        String key, String arg1, String arg2, String arg3)
+        String key, Object arg1, Object arg2, Object arg3)
     {
-        return compose(key, new String[] { arg1, arg2, arg3 });
+        return compose(key, new Object[] { arg1, arg2, arg3 });
     }
 
     /**
-     * A convenience method for calling {@link #compose(String,String[])}
+     * A convenience method for calling {@link #compose(String,Object[])}
      * with a single argument that will be automatically tainted (see
      * {@link #taint}).
      */
-    public static String tcompose (String key, String arg)
+    public static String tcompose (String key, Object arg)
     {
-        return compose(key, new String[] { taint(arg) });
+        return compose(key, new Object[] { taint(arg) });
     }
 
     /**
-     * A convenience method for calling {@link #compose(String,String[])}
+     * A convenience method for calling {@link #compose(String,Object[])}
      * with two arguments that will be automatically tainted (see {@link
      * #taint}).
      */
-    public static String tcompose (String key, String arg1, String arg2)
+    public static String tcompose (String key, Object arg1, Object arg2)
     {
-        return compose(key, new String[] { taint(arg1), taint(arg2) });
+        return compose(key, new Object[] { taint(arg1), taint(arg2) });
     }
 
     /**
-     * A convenience method for calling {@link #compose(String,String[])}
+     * A convenience method for calling {@link #compose(String,Object[])}
      * with three arguments that will be automatically tainted (see {@link
      * #taint}).
      */
     public static String tcompose (
-        String key, String arg1, String arg2, String arg3)
+        String key, Object arg1, Object arg2, Object arg3)
     {
-        return compose(key, new String[] {
+        return compose(key, new Object[] {
             taint(arg1), taint(arg2), taint(arg3) });
     }
 
     /**
-     * A convenience method for calling {@link #compose(String,String[])}
+     * A convenience method for calling {@link #compose(String,Object[])}
      * with an array of arguments that will be automatically tainted (see
      * {@link #taint}).
      */
-    public static String tcompose (String key, String[] args)
+    public static String tcompose (String key, Object[] args)
     {
         return MessageUtil.tcompose(key, args);
     }