From 5c89ab4564a6104a7bec59ab9b54cba46e47e906 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 5 Mar 2009 02:18:31 +0000
Subject: [PATCH] More tainting bits.

---
 src/java/com/threerings/getdown/launcher/AbortPanel.java  | 4 ++--
 src/java/com/threerings/getdown/launcher/ProxyPanel.java  | 4 ++--
 src/java/com/threerings/getdown/launcher/StatusPanel.java | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java/com/threerings/getdown/launcher/AbortPanel.java b/src/java/com/threerings/getdown/launcher/AbortPanel.java
index 1657782..00be061 100644
--- a/src/java/com/threerings/getdown/launcher/AbortPanel.java
+++ b/src/java/com/threerings/getdown/launcher/AbortPanel.java
@@ -101,8 +101,8 @@ public class AbortPanel extends JFrame
     {
         // if this string is tainted, we don't translate it, instead we
         // simply remove the taint character and return it to the caller
-        if (key.startsWith(MessageUtil.TAINT_CHAR)) {
-            return key.substring(1);
+        if (MessageUtil.isTainted(key)) {
+            return MessageUtil.untaint(key);
         }
         try {
             return _msgs.getString(key);
diff --git a/src/java/com/threerings/getdown/launcher/ProxyPanel.java b/src/java/com/threerings/getdown/launcher/ProxyPanel.java
index 9072fb4..ba2b3b0 100644
--- a/src/java/com/threerings/getdown/launcher/ProxyPanel.java
+++ b/src/java/com/threerings/getdown/launcher/ProxyPanel.java
@@ -131,8 +131,8 @@ public class ProxyPanel extends JPanel
     {
         // if this string is tainted, we don't translate it, instead we
         // simply remove the taint character and return it to the caller
-        if (key.startsWith(MessageUtil.TAINT_CHAR)) {
-            return key.substring(1);
+        if (MessageUtil.isTainted(key)) {
+            return MessageUtil.untaint(key);
         }
         try {
             return _msgs.getString(key);
diff --git a/src/java/com/threerings/getdown/launcher/StatusPanel.java b/src/java/com/threerings/getdown/launcher/StatusPanel.java
index c1728da..30e6d0f 100644
--- a/src/java/com/threerings/getdown/launcher/StatusPanel.java
+++ b/src/java/com/threerings/getdown/launcher/StatusPanel.java
@@ -226,8 +226,8 @@ public class StatusPanel extends JComponent
             for (int i = 0; i < args.length; i++) {
                 // if the argument is tainted, do no further translation
                 // (it might contain |s or other fun stuff)
-                if (args[i].startsWith(MessageUtil.TAINT_CHAR)) {
-                    args[i] = MessageUtil.unescape(args[i].substring(1));
+                if (MessageUtil.isTainted(args[i])) {
+                    args[i] = MessageUtil.unescape(MessageUtil.untaint(args[i]));
                 } else {
                     args[i] = xlate(MessageUtil.unescape(args[i]));
                 }
@@ -258,8 +258,8 @@ public class StatusPanel extends JComponent
 
         // if this string is tainted, we don't translate it, instead we
         // simply remove the taint character and return it to the caller
-        if (key.startsWith(MessageUtil.TAINT_CHAR)) {
-            return key.substring(1);
+        if (MessageUtil.isTainted(key)) {
+            return MessageUtil.untaint(key);
         }
         try {
             return _msgs.getString(key);