From 09b591acab9d494ecbecce5059be74640b9605fc Mon Sep 17 00:00:00 2001 From: samskivert Date: Mon, 14 Sep 2009 22:17:51 +0000 Subject: [PATCH] Some Galileo inspired raw type elimination. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2637 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/util/CollectionUtil.java | 2 +- src/java/com/samskivert/util/CountHashMap.java | 2 +- src/java/com/samskivert/util/GenUtil.java | 2 +- src/java/com/samskivert/util/HashIntMap.java | 2 +- src/java/com/samskivert/util/MapEntry.java | 2 +- src/java/com/samskivert/util/StringUtil.java | 12 ++++++------ src/java/com/samskivert/util/Triple.java | 2 +- src/java/com/samskivert/util/Tuple.java | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/java/com/samskivert/util/CollectionUtil.java b/src/java/com/samskivert/util/CollectionUtil.java index c5f495ce..fd276b84 100644 --- a/src/java/com/samskivert/util/CollectionUtil.java +++ b/src/java/com/samskivert/util/CollectionUtil.java @@ -81,7 +81,7 @@ public class CollectionUtil { int size = col.size(); if (size > limit) { - if (col instanceof List) { + if (col instanceof List) { ((List) col).subList(limit, size).clear(); } else { diff --git a/src/java/com/samskivert/util/CountHashMap.java b/src/java/com/samskivert/util/CountHashMap.java index 30809c2e..e2e394db 100644 --- a/src/java/com/samskivert/util/CountHashMap.java +++ b/src/java/com/samskivert/util/CountHashMap.java @@ -176,7 +176,7 @@ public class CountHashMap extends HashMap } @Override public boolean equals (Object o) { - if (!(o instanceof CountEntryImpl)) { + if (!(o instanceof CountEntryImpl)) { return false; } @SuppressWarnings("unchecked") CountEntryImpl other = (CountEntryImpl)o; diff --git a/src/java/com/samskivert/util/GenUtil.java b/src/java/com/samskivert/util/GenUtil.java index 9cfd8783..51f399d0 100644 --- a/src/java/com/samskivert/util/GenUtil.java +++ b/src/java/com/samskivert/util/GenUtil.java @@ -48,7 +48,7 @@ public class GenUtil { if (type instanceof GenericArrayType) { return simpleName(((GenericArrayType)type).getGenericComponentType()) + "[]"; - } else if (type instanceof Class) { + } else if (type instanceof Class) { Class clazz = (Class)type; if (clazz.isArray()) { return simpleName(clazz.getComponentType()) + "[]"; diff --git a/src/java/com/samskivert/util/HashIntMap.java b/src/java/com/samskivert/util/HashIntMap.java index 6b0e55da..687ab130 100644 --- a/src/java/com/samskivert/util/HashIntMap.java +++ b/src/java/com/samskivert/util/HashIntMap.java @@ -556,7 +556,7 @@ public class HashIntMap extends AbstractMap @Override public boolean equals (Object o) { - if (!(o instanceof IntEntry)) { + if (!(o instanceof IntEntry)) { return false; } IntEntry that = (IntEntry)o; diff --git a/src/java/com/samskivert/util/MapEntry.java b/src/java/com/samskivert/util/MapEntry.java index 66a618f1..29728f77 100644 --- a/src/java/com/samskivert/util/MapEntry.java +++ b/src/java/com/samskivert/util/MapEntry.java @@ -66,7 +66,7 @@ public class MapEntry implements Map.Entry @Override // from Object public boolean equals (Object o) { - if (!(o instanceof Map.Entry)) { + if (!(o instanceof Map.Entry)) { return false; } Map.Entry e = (Map.Entry)o; diff --git a/src/java/com/samskivert/util/StringUtil.java b/src/java/com/samskivert/util/StringUtil.java index f0d55895..56cc5bdb 100644 --- a/src/java/com/samskivert/util/StringUtil.java +++ b/src/java/com/samskivert/util/StringUtil.java @@ -501,10 +501,10 @@ public class StringUtil } buf.append(closeBox); - } else if (val instanceof Iterable) { + } else if (val instanceof Iterable) { toString(buf, ((Iterable)val).iterator(), openBox, closeBox); - } else if (val instanceof Iterator) { + } else if (val instanceof Iterator) { buf.append(openBox); Iterator iter = (Iterator)val; for (int i = 0; iter.hasNext(); i++) { @@ -515,7 +515,7 @@ public class StringUtil } buf.append(closeBox); - } else if (val instanceof Enumeration) { + } else if (val instanceof Enumeration) { buf.append(openBox); Enumeration enm = (Enumeration)val; for (int i = 0; enm.hasMoreElements(); i++) { @@ -571,7 +571,7 @@ public class StringUtil public static void listToString (StringBuilder buf, Object val, Formatter formatter) { // get an iterator if this is a collection - if (val instanceof Iterable) { + if (val instanceof Iterable) { val = ((Iterable)val).iterator(); } @@ -589,7 +589,7 @@ public class StringUtil } buf.append(closeBox); - } else if (val instanceof Iterator) { + } else if (val instanceof Iterator) { buf.append(openBox); Iterator iter = (Iterator)val; for (int i = 0; iter.hasNext(); i++) { @@ -600,7 +600,7 @@ public class StringUtil } buf.append(closeBox); - } else if (val instanceof Enumeration) { + } else if (val instanceof Enumeration) { buf.append(openBox); Enumeration enm = (Enumeration)val; for (int i = 0; enm.hasMoreElements(); i++) { diff --git a/src/java/com/samskivert/util/Triple.java b/src/java/com/samskivert/util/Triple.java index 9a75bb59..95f59637 100644 --- a/src/java/com/samskivert/util/Triple.java +++ b/src/java/com/samskivert/util/Triple.java @@ -67,7 +67,7 @@ public class Triple implements Serializable @Override // from Object public boolean equals (Object other) { - if (!(other instanceof Triple)) { + if (!(other instanceof Triple)) { return false; } Triple to = (Triple)other; diff --git a/src/java/com/samskivert/util/Tuple.java b/src/java/com/samskivert/util/Tuple.java index 354e8921..14ec975f 100644 --- a/src/java/com/samskivert/util/Tuple.java +++ b/src/java/com/samskivert/util/Tuple.java @@ -64,7 +64,7 @@ public class Tuple implements Serializable @Override // from Object public boolean equals (Object other) { - if (!(other instanceof Tuple)) { + if (!(other instanceof Tuple)) { return false; } Tuple to = (Tuple)other;