From 0b560d885bc73db91749edcad41b95f53466aecb Mon Sep 17 00:00:00 2001
From: samskivert <samskivert@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Wed, 10 Dec 2008 01:12:28 +0000
Subject: [PATCH] Nixed Google Collections usage, fixed bug in uColSet
 checking.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2503 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 src/java/com/samskivert/jdbc/HsqldbLiaison.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/java/com/samskivert/jdbc/HsqldbLiaison.java b/src/java/com/samskivert/jdbc/HsqldbLiaison.java
index c8e6e99a..3448475a 100644
--- a/src/java/com/samskivert/jdbc/HsqldbLiaison.java
+++ b/src/java/com/samskivert/jdbc/HsqldbLiaison.java
@@ -21,12 +21,11 @@
 package com.samskivert.jdbc;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
@@ -124,11 +123,12 @@ public class HsqldbLiaison extends BaseLiaison
         String[][] uniqueConstraintColumns, String[] primaryKeyColumns)
         throws SQLException
     {
-        Preconditions.checkArgument(columns.length == definitions.length,
-                                    "Column name and definition number mismatch");
+        if (columns.length != definitions.length) {
+            throw new IllegalArgumentException("Column name and definition number mismatch");
+        }
 
         // make a set of unique constraints already provided
-        Set<List<String>> uColSet = Sets.newHashSet();
+        Set<List<String>> uColSet = new HashSet<List<String>>();
         if (uniqueConstraintColumns != null) {
             for (String[] uCols : uniqueConstraintColumns) {
                 uColSet.add(Arrays.asList(uCols));
@@ -146,7 +146,7 @@ public class HsqldbLiaison extends BaseLiaison
                     def.type, def.nullable, false, def.defaultValue);
                 // if a uniqueness constraint for this column was not in the
                 // uniqueConstraintColumns parameter, add such an entry
-                if (!uColSet.contains(Sets.newHashSet(columns[ii]))) {
+                if (!uColSet.contains(Collections.singletonList(columns[ii]))) {
                     String[] newConstraint = new String[] { columns[ii] };
                     uniqueConstraintColumns = (uniqueConstraintColumns == null) ?
                         new String[][] { newConstraint } :