From 83bfe030d8ac72b49f790cc8735f1f918feb8ba8 Mon Sep 17 00:00:00 2001 From: "karma@deadmoose.com" Date: Tue, 13 Jul 2010 00:38:02 +0000 Subject: [PATCH] It's deprecated, so don't use it. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2795 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/jdbc/JDBCUtil.java | 6 ++-- .../samskivert/servlet/user/UserManager.java | 2 +- .../samskivert/servlet/util/ExceptionMap.java | 4 +-- .../com/samskivert/servlet/util/HTMLUtil.java | 36 +++++++++---------- src/java/com/samskivert/util/GenUtil.java | 2 +- .../com/samskivert/velocity/Application.java | 2 +- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/java/com/samskivert/jdbc/JDBCUtil.java b/src/java/com/samskivert/jdbc/JDBCUtil.java index d05861f9..43ddd161 100644 --- a/src/java/com/samskivert/jdbc/JDBCUtil.java +++ b/src/java/com/samskivert/jdbc/JDBCUtil.java @@ -221,8 +221,8 @@ public class JDBCUtil */ public static String escape (String text) { - text = StringUtil.replace(text, "\\", "\\\\"); - return "'" + StringUtil.replace(text, "'", "\\'") + "'"; + text = text.replace("\\", "\\\\"); + return "'" + text.replace("'", "\\'") + "'"; } /** @@ -284,7 +284,7 @@ public class JDBCUtil */ public static String safeJigger (String text) { - return StringUtil.replace(jigger(text), "'", "\\'"); + return jigger(text).replace("'", "\\'"); } /** diff --git a/src/java/com/samskivert/servlet/user/UserManager.java b/src/java/com/samskivert/servlet/user/UserManager.java index 6409b7f6..4f019589 100644 --- a/src/java/com/samskivert/servlet/user/UserManager.java +++ b/src/java/com/samskivert/servlet/user/UserManager.java @@ -214,7 +214,7 @@ public class UserManager if (user == null) { // first construct the redirect URL String eurl = RequestUtils.getLocationEncoded(req); - String target = StringUtil.replace(_loginURL, "%R", eurl); + String target = _loginURL.replace("%R", eurl); if (USERMGR_DEBUG) { log.info("No user found in require, redirecting", "to", target); } diff --git a/src/java/com/samskivert/servlet/util/ExceptionMap.java b/src/java/com/samskivert/servlet/util/ExceptionMap.java index b771b1c5..a784e449 100644 --- a/src/java/com/samskivert/servlet/util/ExceptionMap.java +++ b/src/java/com/samskivert/servlet/util/ExceptionMap.java @@ -24,8 +24,6 @@ import java.io.*; import java.util.*; import com.samskivert.util.ConfigUtil; -import com.samskivert.util.StringUtil; - import static com.samskivert.Log.log; /** @@ -150,7 +148,7 @@ public class ExceptionMap break; } } - return StringUtil.replace(msg, MESSAGE_MARKER, ex.getMessage()); + return msg.replace(MESSAGE_MARKER, ex.getMessage()); } protected static List> _keys; diff --git a/src/java/com/samskivert/servlet/util/HTMLUtil.java b/src/java/com/samskivert/servlet/util/HTMLUtil.java index 75dc4c4c..a1a1ed0f 100644 --- a/src/java/com/samskivert/servlet/util/HTMLUtil.java +++ b/src/java/com/samskivert/servlet/util/HTMLUtil.java @@ -46,14 +46,14 @@ public class HTMLUtil // (first we turn the entified versions normal so that if text is // repeatedly run through this it doesn't keep changing successive // &'s into "&". - text = StringUtil.replace(text, """, "\""); - text = StringUtil.replace(text, ">", ">"); - text = StringUtil.replace(text, "<", "<"); - text = StringUtil.replace(text, "&", "&"); - text = StringUtil.replace(text, "&", "&"); - text = StringUtil.replace(text, "<", "<"); - text = StringUtil.replace(text, ">", ">"); - text = StringUtil.replace(text, "\"", """); + text = text.replace(""", "\""); + text = text.replace(">", ">"); + text = text.replace("<", "<"); + text = text.replace("&", "&"); + text = text.replace("&", "&"); + text = text.replace("<", "<"); + text = text.replace(">", ">"); + text = text.replace("\"", """); return text; } @@ -66,8 +66,8 @@ public class HTMLUtil return text; } // handle both line ending formats - text = StringUtil.replace(text, "\n\n", "\n

\n"); - text = StringUtil.replace(text, "\r\n\r\n", "\r\n

\r\n"); + text = text.replace("\n\n", "\n

\n"); + text = text.replace("\r\n\r\n", "\r\n

\r\n"); return text; } @@ -80,7 +80,7 @@ public class HTMLUtil return text; } // handle both line ending formats - text = StringUtil.replace(text, "\n", "
\n"); + text = text.replace("\n", "
\n"); return text; } @@ -113,9 +113,9 @@ public class HTMLUtil StringBuilder lbuf = new StringBuilder(); boolean inpara = false, inlist = false; - for (int ii = 0; ii < lines.length; ii++) { - String line = lines[ii]; - if (StringUtil.isBlank(lines[ii])) { + for (String line2 : lines) { + String line = line2; + if (StringUtil.isBlank(line2)) { if (inlist) { lbuf.append(""); inlist = false; @@ -212,8 +212,8 @@ public class HTMLUtil ArrayList list = new ArrayList(); list.add(src); - for (int ii=0, nn = regexes.length; ii < nn; ii++) { - Pattern p = Pattern.compile(regexes[ii], Pattern.CASE_INSENSITIVE); + for (String regexe : regexes) { + Pattern p = Pattern.compile(regexe, Pattern.CASE_INSENSITIVE); for (int jj=0; jj < list.size(); jj += 2) { String piece = list.get(jj); Matcher m = p.matcher(piece); @@ -231,8 +231,8 @@ public class HTMLUtil for (int jj=0, nn = list.size(); jj < nn; jj++) { String s = list.get(jj); if (jj % 2 == 0) { - s = StringUtil.replace(s, "<", "<"); - s = StringUtil.replace(s, ">", ">"); + s = s.replace("<", "<"); + s = s.replace(">", ">"); } buf.append(s); } diff --git a/src/java/com/samskivert/util/GenUtil.java b/src/java/com/samskivert/util/GenUtil.java index 62846d82..2fe5e90e 100644 --- a/src/java/com/samskivert/util/GenUtil.java +++ b/src/java/com/samskivert/util/GenUtil.java @@ -55,7 +55,7 @@ public class GenUtil } else { Package pkg = clazz.getPackage(); int offset = (pkg == null) ? 0 : pkg.getName().length()+1; - return StringUtil.replace(clazz.getName().substring(offset), "$", "."); + return clazz.getName().substring(offset).replace("$", "."); } } else if (type instanceof ParameterizedType) { diff --git a/src/java/com/samskivert/velocity/Application.java b/src/java/com/samskivert/velocity/Application.java index a7992831..30984c4d 100644 --- a/src/java/com/samskivert/velocity/Application.java +++ b/src/java/com/samskivert/velocity/Application.java @@ -301,7 +301,7 @@ public class Application path = path.substring(0, ldidx); } // convert slashes to dots - path = StringUtil.replace(path, "/", "."); + path.replace("/", "."); // prepend the base logic package and we're all set return _logicPkg + path; }