svn commit: r349176 - in /jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan: reflect/ClassFinder.java util/JOrphanUtils.java

[se...@apache.org]

Author: sebb
Date: Sat Nov 26 19:24:42 2005
New Revision: 349176

URL: http://svn.apache.org/viewcvs?rev=349176&view=rev
Log:
Copy code from StringUtilities to JOrphanUtils so jorphan classes can use it

Modified:
    jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
    jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java

Modified: jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=349176&r1=349175&r2=349176&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Sat Nov 26 19:24:42 2005
@@ -31,8 +31,8 @@
 import java.util.TreeSet;
 import java.util.zip.ZipFile;
 
-import org.apache.jmeter.util.StringUtilities;
 import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JOrphanUtils;
 import org.apache.log.Logger;
 
 /**
@@ -237,7 +237,7 @@
             return System.getProperty("user.dir"); // $NON-NLS-1$
         }
         path = path.trim().replace('\\', '/'); // $NON-NLS-1$ // $NON-NLS-2$
-        path = StringUtilities.substitute(path, "//", "/"); // $NON-NLS-1$// $NON-NLS-2$
+        path = JOrphanUtils.replaceAllString(path, "//", "/"); // $NON-NLS-1$// $NON-NLS-2$
 
         while (path.endsWith("/")) { // $NON-NLS-1$
             path = path.substring(0, path.length() - 1);

Modified: jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=349176&r1=349175&r2=349176&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Sat Nov 26 19:24:42 2005
@@ -326,8 +326,7 @@
 
     /**
      * Version of String.replaceAll() for JDK1.3
-     * @see org.apache.jmeter.util.StringUtilities.replace() 
-     * for another version which replaces strings rather than chars
+     * See below for another version which replaces strings rather than chars
      * 
      * @param source
      *            input string
@@ -349,6 +348,30 @@
             }
         }
         return sb.toString();
+    }
+
+    /**
+     * Replace all patterns in a String
+     * 
+     * @see String.replaceAll(regex,replacement) - JDK1.4 only
+     * 
+     * @param input - string to be transformed
+     * @param pattern - pattern to replace
+     * @param sub - replacement
+     * @return the updated string
+     */
+    public static String replaceAllString(final String input, final String pattern, final String sub) {
+        StringBuffer ret = new StringBuffer(input.length());
+        int start = 0;
+        int index = -1;
+        final int length = pattern.length();
+        while ((index = input.indexOf(pattern, start)) >= start) {
+            ret.append(input.substring(start, index));
+            ret.append(sub);
+            start = index + length;
+        }
+        ret.append(input.substring(start));
+        return ret.toString();
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org