Author: markt
Date: Wed Dec 24 07:24:08 2008
New Revision: 729321
URL: http://svn.apache.org/viewvc?rev=729321&view=rev
Log:
Generics for o.a.c.tribes.util
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java
tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java?rev=729321&r1=729320&r2=729321&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java Wed Dec 24
07:24:08 2008
@@ -132,7 +132,8 @@
public static Member[] merge(Member[] m1, Member[] m2) {
AbsoluteOrder.absoluteOrder(m1);
AbsoluteOrder.absoluteOrder(m2);
- ArrayList list = new ArrayList(java.util.Arrays.asList(m1));
+ ArrayList<Member> list =
+ new ArrayList<Member>(java.util.Arrays.asList(m1));
for (int i=0; i<m2.length; i++) if ( !list.contains(m2[i]) )
list.add(m2[i]);
Member[] result = new Member[list.size()];
list.toArray(result);
@@ -145,13 +146,13 @@
}
public static Member[] diff(Membership complete, Membership local,
MemberImpl ignore) {
- ArrayList result = new ArrayList();
+ ArrayList<Member> result = new ArrayList<Member>();
MemberImpl[] comp = complete.getMembers();
for ( int i=0; i<comp.length; i++ ) {
if ( ignore!=null && ignore.equals(comp[i]) ) continue;
if ( local.getMember(comp[i]) == null ) result.add(comp[i]);
}
- return (MemberImpl[])result.toArray(new MemberImpl[result.size()]);
+ return result.toArray(new MemberImpl[result.size()]);
}
public static Member[] remove(Member[] all, Member remove) {
@@ -159,10 +160,10 @@
}
public static Member[] extract(Member[] all, Member[] remove) {
- List alist = java.util.Arrays.asList(all);
- ArrayList list = new ArrayList(alist);
+ List<Member> alist = java.util.Arrays.asList(all);
+ ArrayList<Member> list = new ArrayList<Member>(alist);
for (int i=0; i<remove.length; i++ ) list.remove(remove[i]);
- return (Member[])list.toArray(new Member[list.size()]);
+ return list.toArray(new Member[list.size()]);
}
public static int indexOf(Member member, Member[] members) {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java?rev=729321&r1=729320&r2=729321&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java Wed
Dec 24 07:24:08 2008
@@ -147,7 +147,7 @@
Object nonNullArgs[] = args;
for (int i=0; i<args.length; i++) {
if (args[i] == null) {
- if (nonNullArgs==args) nonNullArgs=(Object[])args.clone();
+ if (nonNullArgs==args) nonNullArgs = args.clone();
nonNullArgs[i] = "null";
}
}
@@ -231,7 +231,8 @@
// STATIC SUPPORT METHODS
// --------------------------------------------------------------
- private static Hashtable managers = new Hashtable();
+ private static Hashtable<String, StringManager> managers =
+ new Hashtable<String,StringManager>();
/**
* Get the StringManager for a particular package. If a manager for
@@ -242,7 +243,7 @@
*/
public synchronized static StringManager getManager(String packageName) {
- StringManager mgr = (StringManager)managers.get(packageName);
+ StringManager mgr = managers.get(packageName);
if (mgr == null) {
mgr = new StringManager(packageName);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
