fixed generics warnings; added join method

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@901267 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 24 insertions, 2 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
index 04bf174ff0..a6a8b8beb4 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/util/Strings.java
@@ -22,6 +22,7 @@ package org.apache.qpid.util;
 
 import java.io.UnsupportedEncodingException;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Stack;
@@ -39,7 +40,7 @@ public final class Strings
 
     private static final byte[] EMPTY = new byte[0];
 
-    private static final ThreadLocal<char[]> charbuf = new ThreadLocal()
+    private static final ThreadLocal<char[]> charbuf = new ThreadLocal<char[]>()
     {
         public char[] initialValue()
         {
@@ -178,7 +179,7 @@ public final class Strings
 
     public static final String expand(String input, Resolver resolver)
     {
-        return expand(input, resolver, new Stack());
+        return expand(input, resolver, new Stack<String>());
     }
 
     private static final String expand(String input, Resolver resolver, Stack<String> stack)
@@ -235,4 +236,25 @@ public final class Strings
         }
     }
 
+    public static final String join(String sep, Iterable items)
+    {
+        StringBuilder result = new StringBuilder();
+
+        for (Object o : items)
+        {
+            if (result.length() > 0)
+            {
+                result.append(sep);
+            }
+            result.append(o.toString());
+        }
+
+        return result.toString();
+    }
+
+    public static final String join(String sep, Object[] items)
+    {
+        return join(sep, Arrays.asList(items));
+    }
+
 }