From ab98f85023babbe3ad68be3e6d2e0706e1131df3 Mon Sep 17 00:00:00 2001 From: "Ray J. Greenwell" Date: Mon, 2 Feb 2015 13:42:06 -0800 Subject: [PATCH] Array type is irrelevant. ...as far as I can tell. Rip out the code that tried to set up the right array type. --- .../java/com/samskivert/depot/KeySet.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/samskivert/depot/KeySet.java b/src/main/java/com/samskivert/depot/KeySet.java index 2f7964f..8923777 100644 --- a/src/main/java/com/samskivert/depot/KeySet.java +++ b/src/main/java/com/samskivert/depot/KeySet.java @@ -48,15 +48,7 @@ public abstract class KeySet extends WhereClause ColumnExp[] keyFields = DepotUtil.getKeyFields(pClass); if (keyFields.length == 1) { - Comparable first = keys.iterator().next().getValues()[0]; - Comparable[] keyArray; - if (first instanceof Integer) { - keyArray = new Integer[keys.size()]; - } else if (first instanceof String) { - keyArray = new String[keys.size()]; - } else { - keyArray = new Comparable[keys.size()]; - } + Comparable[] keyArray = new Comparable[keys.size()]; int ii = 0; for (Key key : keys) { keyArray[ii++] = key.getValues()[0]; @@ -92,15 +84,7 @@ public abstract class KeySet extends WhereClause if (keys.size() == 0) { return new EmptyKeySet(pClass); } else { - Comparable first = keys.iterator().next(); - Comparable[] keyArray; - if (first instanceof Integer) { - keyArray = new Integer[keys.size()]; - } else if (first instanceof String) { - keyArray = new String[keys.size()]; - } else { - keyArray = new Comparable[keys.size()]; - } + Comparable[] keyArray = new Comparable[keys.size()]; return new SingleKeySet(pClass, keys.toArray(keyArray)); } }