From f7caf53511961bfc3ca86023302838c13630ff54 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Tue, 16 Jan 2007 05:33:58 +0000
Subject: [PATCH] Type safety and varargs don't play nicely together. Funny
 that it only freaks out when you try to compile code that calls a varargs
 method with more than one class. At that point it tries to create an array
 with a generic element type which is disallowed.

---
 .../jdbc/depot/clause/FromOverride.java       | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java b/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java
index dd67d96..9033446 100644
--- a/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java
+++ b/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java
@@ -26,17 +26,30 @@ import java.util.Collection;
 import com.samskivert.io.PersistenceException;
 import com.samskivert.jdbc.depot.ConstructedQuery;
 import com.samskivert.jdbc.depot.PersistentRecord;
-import com.samskivert.util.CollectionUtil;
 
 /**
  *  Completely overrides the FROM clause, if it exists.
  */
 public class FromOverride extends QueryClause
 {
-    public FromOverride (Class<? extends PersistentRecord>... fromClasses)
+    public FromOverride (Class<? extends PersistentRecord> fromClass)
         throws PersistenceException
     {
-        CollectionUtil.addAll(_fromClasses, fromClasses);
+        _fromClasses.add(fromClass);
+    }
+
+    public FromOverride (Class<? extends PersistentRecord> fromClass1,
+                         Class<? extends PersistentRecord> fromClass2)
+        throws PersistenceException
+    {
+        _fromClasses.add(fromClass1);
+        _fromClasses.add(fromClass2);
+    }
+
+    public FromOverride (Collection<Class<? extends PersistentRecord>> fromClasses)
+        throws PersistenceException
+    {
+        _fromClasses.addAll(fromClasses);
     }
 
     // from QueryClause