From 980be1991873cf1be384828d5471798c1690a195 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Tue, 25 Nov 2008 20:14:09 +0000
Subject: [PATCH] Unused import pruning and other cleaning.

---
 src/java/com/samskivert/depot/DepotRepository.java      | 3 ---
 src/java/com/samskivert/depot/FindAllQuery.java         | 1 -
 src/java/com/samskivert/depot/FindOneQuery.java         | 1 -
 src/java/com/samskivert/depot/Key.java                  | 3 ---
 src/java/com/samskivert/depot/KeySet.java               | 2 --
 src/java/com/samskivert/depot/Query.java                | 6 ------
 src/java/com/samskivert/depot/tests/TestRepository.java | 1 -
 7 files changed, 17 deletions(-)

diff --git a/src/java/com/samskivert/depot/DepotRepository.java b/src/java/com/samskivert/depot/DepotRepository.java
index d73e3a4..d8eb3f8 100644
--- a/src/java/com/samskivert/depot/DepotRepository.java
+++ b/src/java/com/samskivert/depot/DepotRepository.java
@@ -22,7 +22,6 @@ package com.samskivert.depot;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 
@@ -37,7 +36,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import com.samskivert.util.ArrayUtil;
-import com.samskivert.util.StringUtil;
 
 import com.samskivert.jdbc.ConnectionProvider;
 import com.samskivert.jdbc.DatabaseLiaison;
@@ -48,7 +46,6 @@ import com.samskivert.depot.clause.DeleteClause;
 import com.samskivert.depot.clause.FieldOverride;
 import com.samskivert.depot.clause.InsertClause;
 import com.samskivert.depot.clause.QueryClause;
-import com.samskivert.depot.clause.SelectClause;
 import com.samskivert.depot.clause.UpdateClause;
 import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.depot.expression.ValueExp;
diff --git a/src/java/com/samskivert/depot/FindAllQuery.java b/src/java/com/samskivert/depot/FindAllQuery.java
index 9a152d9..2e12522 100644
--- a/src/java/com/samskivert/depot/FindAllQuery.java
+++ b/src/java/com/samskivert/depot/FindAllQuery.java
@@ -304,7 +304,6 @@ public abstract class FindAllQuery<T extends PersistentRecord> extends Query<Lis
                                 Map<Key<T>, T> entities, String origStmt)
         throws SQLException
     {
-        boolean hasPrimaryKey = _marsh.hasPrimaryKey();
         SelectClause<T> select = new SelectClause<T>(
             _type, _marsh.getFieldNames(), KeySet.newKeySet(_type, keys));
         SQLBuilder builder = ctx.getSQLBuilder(DepotTypes.getDepotTypes(ctx, select));
diff --git a/src/java/com/samskivert/depot/FindOneQuery.java b/src/java/com/samskivert/depot/FindOneQuery.java
index 0a770ce..e467141 100644
--- a/src/java/com/samskivert/depot/FindOneQuery.java
+++ b/src/java/com/samskivert/depot/FindOneQuery.java
@@ -27,7 +27,6 @@ import java.sql.SQLException;
 
 import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.jdbc.JDBCUtil;
-import com.samskivert.util.StringUtil;
 
 import com.samskivert.depot.clause.QueryClause;
 import com.samskivert.depot.clause.SelectClause;
diff --git a/src/java/com/samskivert/depot/Key.java b/src/java/com/samskivert/depot/Key.java
index d9523e7..7690915 100644
--- a/src/java/com/samskivert/depot/Key.java
+++ b/src/java/com/samskivert/depot/Key.java
@@ -21,13 +21,10 @@
 package com.samskivert.depot;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import com.samskivert.depot.expression.ExpressionVisitor;
diff --git a/src/java/com/samskivert/depot/KeySet.java b/src/java/com/samskivert/depot/KeySet.java
index aa2c50c..b94566e 100644
--- a/src/java/com/samskivert/depot/KeySet.java
+++ b/src/java/com/samskivert/depot/KeySet.java
@@ -38,8 +38,6 @@ import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.depot.operator.Conditionals;
 import com.samskivert.depot.operator.Logic;
 
-import static com.samskivert.depot.Log.log;
-
 /**
  * Contains a set of primary keys that match a set of persistent records. This is used internally
  * in Depot when decomposing queries into two parts: first a query for the primary keys that
diff --git a/src/java/com/samskivert/depot/Query.java b/src/java/com/samskivert/depot/Query.java
index a9f362b..6552e69 100644
--- a/src/java/com/samskivert/depot/Query.java
+++ b/src/java/com/samskivert/depot/Query.java
@@ -20,12 +20,6 @@
 
 package com.samskivert.depot;
 
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import com.samskivert.jdbc.DatabaseLiaison;
-import com.samskivert.depot.PersistenceContext.CacheListener;
-
 /**
  * The base of all read-only queries.
  */
diff --git a/src/java/com/samskivert/depot/tests/TestRepository.java b/src/java/com/samskivert/depot/tests/TestRepository.java
index a3f109e..9930ef4 100644
--- a/src/java/com/samskivert/depot/tests/TestRepository.java
+++ b/src/java/com/samskivert/depot/tests/TestRepository.java
@@ -30,7 +30,6 @@ import com.google.common.collect.Sets;
 import com.samskivert.jdbc.StaticConnectionProvider;
 import com.samskivert.util.RandomUtil;
 
-import com.samskivert.depot.CacheAdapter;
 import com.samskivert.depot.DepotRepository;
 import com.samskivert.depot.Key;
 import com.samskivert.depot.KeySet;