diff --git a/src/java/com/samskivert/jdbc/MySQLLiaison.java b/src/java/com/samskivert/jdbc/MySQLLiaison.java index 3b5377e5..15e0c0d2 100644 --- a/src/java/com/samskivert/jdbc/MySQLLiaison.java +++ b/src/java/com/samskivert/jdbc/MySQLLiaison.java @@ -57,7 +57,6 @@ public class MySQLLiaison extends BaseLiaison // AUTO_INCREMENT does not create any database entities that we need to delete } - // from DatabaseLiaison public int lastInsertedId (Connection conn, String table, String column) throws SQLException { diff --git a/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java b/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java index 839d8f0b..fd9fe0aa 100644 --- a/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java +++ b/src/java/com/samskivert/jdbc/RepositoryListenerUnit.java @@ -20,7 +20,6 @@ package com.samskivert.jdbc; -import com.samskivert.io.PersistenceException; import com.samskivert.util.ResultListener; /** diff --git a/src/java/com/samskivert/jdbc/depot/BuildVisitor.java b/src/java/com/samskivert/jdbc/depot/BuildVisitor.java index 18e29d1d..83444999 100644 --- a/src/java/com/samskivert/jdbc/depot/BuildVisitor.java +++ b/src/java/com/samskivert/jdbc/depot/BuildVisitor.java @@ -21,7 +21,6 @@ package com.samskivert.jdbc.depot; import java.sql.SQLException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/java/com/samskivert/jdbc/depot/FindOneQuery.java b/src/java/com/samskivert/jdbc/depot/FindOneQuery.java index 12d3b86e..7bf34fc6 100644 --- a/src/java/com/samskivert/jdbc/depot/FindOneQuery.java +++ b/src/java/com/samskivert/jdbc/depot/FindOneQuery.java @@ -32,8 +32,6 @@ import com.samskivert.jdbc.JDBCUtil; import com.samskivert.jdbc.depot.clause.QueryClause; import com.samskivert.jdbc.depot.clause.SelectClause; -import static com.samskivert.jdbc.depot.Log.log; - /** * The implementation of {@link DepotRepository#find) functionality. */ diff --git a/src/java/com/samskivert/jdbc/depot/ValueGenerator.java b/src/java/com/samskivert/jdbc/depot/ValueGenerator.java index 0c9c2408..ce184968 100644 --- a/src/java/com/samskivert/jdbc/depot/ValueGenerator.java +++ b/src/java/com/samskivert/jdbc/depot/ValueGenerator.java @@ -21,7 +21,6 @@ package com.samskivert.jdbc.depot; import java.sql.Connection; -import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; diff --git a/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java b/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java index 0358e8e9..b658cec6 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java +++ b/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java @@ -25,7 +25,6 @@ import com.samskivert.jdbc.depot.operator.SQLOperator.BinaryOperator; /** * A convenient container for implementations of arithmetic operators. Classes that value brevity - * over disambiguation will import Arithmetic.* and construct queries with Add() and Sub(); classes * that feel otherwise will use Arithmetic.Add() and Arithmetic.Sub(). */ public abstract class Arithmetic diff --git a/src/java/com/samskivert/jdbc/depot/operator/Conditionals.java b/src/java/com/samskivert/jdbc/depot/operator/Conditionals.java index 0af7be9a..12796583 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/Conditionals.java +++ b/src/java/com/samskivert/jdbc/depot/operator/Conditionals.java @@ -30,7 +30,6 @@ import com.samskivert.jdbc.depot.expression.SQLExpression; /** * A convenient container for implementations of conditional operators. Classes that value brevity - * over disambiguation will import Conditionals.* and construct queries with Equals() and In(); * classes that feel otherwise will use Conditionals.Equals() and Conditionals.In(). */ public abstract class Conditionals diff --git a/src/java/com/samskivert/jdbc/depot/operator/Logic.java b/src/java/com/samskivert/jdbc/depot/operator/Logic.java index c7f4ee02..817a4df5 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/Logic.java +++ b/src/java/com/samskivert/jdbc/depot/operator/Logic.java @@ -28,7 +28,6 @@ import com.samskivert.jdbc.depot.expression.SQLExpression; /** * A convenient container for implementations of logical operators. Classes that value brevity - * over disambiguation will import Logic.* and construct queries with And() and Not(); classes that * feel otherwise will use Logic.And() and Logic.Not(). */ public abstract class Logic diff --git a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java index 966f2569..744c2bf3 100644 --- a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java +++ b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java @@ -31,7 +31,6 @@ import java.io.StringWriter; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/java/com/samskivert/jdbc/jora/FieldMask.java b/src/java/com/samskivert/jdbc/jora/FieldMask.java index e4122fdd..68828550 100644 --- a/src/java/com/samskivert/jdbc/jora/FieldMask.java +++ b/src/java/com/samskivert/jdbc/jora/FieldMask.java @@ -22,7 +22,6 @@ package com.samskivert.jdbc.jora; import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Set; diff --git a/src/java/com/samskivert/jdbc/jora/Table.java b/src/java/com/samskivert/jdbc/jora/Table.java index e67deb31..92ee50b9 100644 --- a/src/java/com/samskivert/jdbc/jora/Table.java +++ b/src/java/com/samskivert/jdbc/jora/Table.java @@ -25,7 +25,6 @@ import java.util.*; import java.sql.*; import java.lang.reflect.*; -import com.samskivert.jdbc.JDBCUtil; import com.samskivert.util.StringUtil; /** diff --git a/src/java/com/samskivert/net/MACUtil.java b/src/java/com/samskivert/net/MACUtil.java index 53808347..e434c83d 100644 --- a/src/java/com/samskivert/net/MACUtil.java +++ b/src/java/com/samskivert/net/MACUtil.java @@ -28,7 +28,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.samskivert.util.RunAnywhere; -import com.samskivert.util.StringUtil; /** * Attempts to find all the MAC addresses on the machine. diff --git a/src/java/com/samskivert/servlet/user/UserRepository.java b/src/java/com/samskivert/servlet/user/UserRepository.java index b03a6d48..e3caf400 100644 --- a/src/java/com/samskivert/servlet/user/UserRepository.java +++ b/src/java/com/samskivert/servlet/user/UserRepository.java @@ -28,16 +28,12 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.Calendar; -import java.util.Iterator; -import java.util.Properties; import com.samskivert.io.PersistenceException; import com.samskivert.jdbc.ConnectionProvider; import com.samskivert.jdbc.DatabaseLiaison; import com.samskivert.jdbc.JDBCUtil; import com.samskivert.jdbc.JORARepository; -import com.samskivert.jdbc.StaticConnectionProvider; -import com.samskivert.jdbc.jora.Cursor; import com.samskivert.jdbc.jora.FieldMask; import com.samskivert.jdbc.jora.Table; import com.samskivert.util.HashIntMap; diff --git a/src/java/com/samskivert/swing/LazyComponent.java b/src/java/com/samskivert/swing/LazyComponent.java index 47aa41cd..6ffea003 100644 --- a/src/java/com/samskivert/swing/LazyComponent.java +++ b/src/java/com/samskivert/swing/LazyComponent.java @@ -21,7 +21,6 @@ package com.samskivert.swing; import java.awt.BorderLayout; -import java.awt.Container; import javax.swing.JComponent; diff --git a/src/java/com/samskivert/swing/ObjectEditorTable.java b/src/java/com/samskivert/swing/ObjectEditorTable.java index e41b6644..7b105837 100644 --- a/src/java/com/samskivert/swing/ObjectEditorTable.java +++ b/src/java/com/samskivert/swing/ObjectEditorTable.java @@ -106,7 +106,6 @@ public class ObjectEditorTable extends JTable } } - /** * Construct a table to display the specified class. * diff --git a/src/java/com/samskivert/swing/SafeLayeredPane.java b/src/java/com/samskivert/swing/SafeLayeredPane.java index 93dd64e8..12effe79 100644 --- a/src/java/com/samskivert/swing/SafeLayeredPane.java +++ b/src/java/com/samskivert/swing/SafeLayeredPane.java @@ -22,7 +22,6 @@ package com.samskivert.swing; import java.awt.Component; import javax.swing.JLayeredPane; -import javax.swing.Popup; /** * A JLayeredPane that removes all popups when a non-popup component is removed. diff --git a/src/java/com/samskivert/swing/ScaledIcon.java b/src/java/com/samskivert/swing/ScaledIcon.java index a31e1516..262fd4ee 100644 --- a/src/java/com/samskivert/swing/ScaledIcon.java +++ b/src/java/com/samskivert/swing/ScaledIcon.java @@ -21,7 +21,6 @@ package com.samskivert.swing; import java.awt.Component; -import java.awt.Composite; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.RenderingHints; diff --git a/src/java/com/samskivert/util/BaseArrayList.java b/src/java/com/samskivert/util/BaseArrayList.java index e2094cd7..0b5d3a0f 100644 --- a/src/java/com/samskivert/util/BaseArrayList.java +++ b/src/java/com/samskivert/util/BaseArrayList.java @@ -24,8 +24,6 @@ import java.io.Serializable; import java.util.AbstractList; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; import java.util.List; import java.util.RandomAccess; diff --git a/src/java/com/samskivert/util/CollectionUtil.java b/src/java/com/samskivert/util/CollectionUtil.java index 156c603b..248b09d2 100644 --- a/src/java/com/samskivert/util/CollectionUtil.java +++ b/src/java/com/samskivert/util/CollectionUtil.java @@ -122,7 +122,6 @@ public class CollectionUtil return subset; } - /** * If a collection contains only Integer objects, it can be * passed to this function and converted into an int array. diff --git a/src/java/com/samskivert/util/HashIntMap.java b/src/java/com/samskivert/util/HashIntMap.java index 150c90fb..2ca44849 100644 --- a/src/java/com/samskivert/util/HashIntMap.java +++ b/src/java/com/samskivert/util/HashIntMap.java @@ -27,9 +27,7 @@ import java.io.Serializable; import java.util.AbstractMap; import java.util.AbstractSet; -import java.util.ArrayList; import java.util.Iterator; -import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; diff --git a/src/java/com/samskivert/util/IntIntMap.java b/src/java/com/samskivert/util/IntIntMap.java index 7f10b56d..edbcfb26 100644 --- a/src/java/com/samskivert/util/IntIntMap.java +++ b/src/java/com/samskivert/util/IntIntMap.java @@ -57,7 +57,6 @@ public class IntIntMap */ public final static float DEFAULT_LOAD_FACTOR = 1.75f; - public IntIntMap (int buckets, float loadFactor) { _buckets = new Record[buckets]; diff --git a/src/java/com/samskivert/util/Invoker.java b/src/java/com/samskivert/util/Invoker.java index 648781f5..7122c0c4 100644 --- a/src/java/com/samskivert/util/Invoker.java +++ b/src/java/com/samskivert/util/Invoker.java @@ -21,7 +21,6 @@ package com.samskivert.util; import java.util.HashMap; -import java.util.Iterator; import static com.samskivert.Log.log; diff --git a/src/java/com/samskivert/util/PrefsConfig.java b/src/java/com/samskivert/util/PrefsConfig.java index df9d6fd9..48adce6d 100644 --- a/src/java/com/samskivert/util/PrefsConfig.java +++ b/src/java/com/samskivert/util/PrefsConfig.java @@ -23,11 +23,8 @@ package com.samskivert.util; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.security.AccessControlException; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.HashSet; -import java.util.Iterator; import java.util.Properties; import java.util.prefs.AbstractPreferences; diff --git a/src/java/com/samskivert/util/ProcessLogger.java b/src/java/com/samskivert/util/ProcessLogger.java index b7184635..1ef8c73f 100644 --- a/src/java/com/samskivert/util/ProcessLogger.java +++ b/src/java/com/samskivert/util/ProcessLogger.java @@ -21,7 +21,6 @@ package com.samskivert.util; import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/java/com/samskivert/util/StringUtil.java b/src/java/com/samskivert/util/StringUtil.java index 88b1fee4..e274fdd4 100644 --- a/src/java/com/samskivert/util/StringUtil.java +++ b/src/java/com/samskivert/util/StringUtil.java @@ -38,11 +38,9 @@ import java.text.NumberFormat; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Enumeration; -import java.util.HashMap; import java.util.Iterator; import java.util.Locale; import java.util.StringTokenizer; diff --git a/src/java/com/samskivert/velocity/ServletContextResourceManager.java b/src/java/com/samskivert/velocity/ServletContextResourceManager.java index 46924e29..86c67767 100644 --- a/src/java/com/samskivert/velocity/ServletContextResourceManager.java +++ b/src/java/com/samskivert/velocity/ServletContextResourceManager.java @@ -20,15 +20,12 @@ package com.samskivert.velocity; -import javax.servlet.ServletContext; - import org.apache.velocity.exception.ParseErrorException; import org.apache.velocity.exception.ResourceNotFoundException; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.resource.Resource; import org.apache.velocity.runtime.resource.ResourceFactory; import org.apache.velocity.runtime.resource.ResourceManagerImpl; -import org.apache.velocity.runtime.resource.loader.ResourceLoader; /** * A resource manager implementation for Velocity that loads resources from the servlet context. diff --git a/src/java/com/samskivert/velocity/VelocityTestCase.java b/src/java/com/samskivert/velocity/VelocityTestCase.java index 4fa3ac90..c5160eef 100644 --- a/src/java/com/samskivert/velocity/VelocityTestCase.java +++ b/src/java/com/samskivert/velocity/VelocityTestCase.java @@ -20,7 +20,6 @@ package com.samskivert.velocity; -import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; diff --git a/src/java/com/samskivert/velocity/VelocityUtil.java b/src/java/com/samskivert/velocity/VelocityUtil.java index 136d2539..49cf862a 100644 --- a/src/java/com/samskivert/velocity/VelocityUtil.java +++ b/src/java/com/samskivert/velocity/VelocityUtil.java @@ -20,7 +20,6 @@ package com.samskivert.velocity; -import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.log.LogChute;