minor cleanups/formatting

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@832 f203690c-595d-4dc9-a70b-905162fa7fd2

7 files changed, 1 insertions, 11 deletions

diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/ComplexColumnSupport.java b/src/main/java/com/healthmarketscience/jackcess/impl/ComplexColumnSupport.java
index 6a98ef0..533e1ef 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/ComplexColumnSupport.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/ComplexColumnSupport.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.EnumSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import com.healthmarketscience.jackcess.Column;
@@ -32,12 +31,8 @@ import com.healthmarketscience.jackcess.DataType;
 import com.healthmarketscience.jackcess.IndexCursor;
 import com.healthmarketscience.jackcess.Row;
 import com.healthmarketscience.jackcess.Table;
-import com.healthmarketscience.jackcess.complex.AttachmentColumnInfo;
 import com.healthmarketscience.jackcess.complex.ComplexColumnInfo;
 import com.healthmarketscience.jackcess.complex.ComplexValue;
-import com.healthmarketscience.jackcess.complex.MultiValueColumnInfo;
-import com.healthmarketscience.jackcess.complex.UnsupportedColumnInfo;
-import com.healthmarketscience.jackcess.complex.VersionHistoryColumnInfo;
 import com.healthmarketscience.jackcess.impl.complex.AttachmentColumnInfoImpl;
 import com.healthmarketscience.jackcess.impl.complex.MultiValueColumnInfoImpl;
 import com.healthmarketscience.jackcess.impl.complex.UnsupportedColumnInfoImpl;
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/FKEnforcer.java b/src/main/java/com/healthmarketscience/jackcess/impl/FKEnforcer.java
index 2cd5990..e2b1156 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/FKEnforcer.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/FKEnforcer.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java b/src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java
index e8952cd..94c8e41 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/query/QueryImpl.java
@@ -299,7 +299,7 @@ public abstract class QueryImpl implements Query
         comboJoins = new ArrayList<Row>();
         comboJoinMap.put(key, comboJoins);
       } else {
-        if(comboJoins.get(0).flag != join.flag) {
+        if((short)comboJoins.get(0).flag != join.flag) {
           throw new IllegalStateException(
               "Mismatched join flags for combo joins");
         }
diff --git a/src/main/java/com/healthmarketscience/jackcess/query/CrossTabQuery.java b/src/main/java/com/healthmarketscience/jackcess/query/CrossTabQuery.java
index 474c979..c0a0543 100644
--- a/src/main/java/com/healthmarketscience/jackcess/query/CrossTabQuery.java
+++ b/src/main/java/com/healthmarketscience/jackcess/query/CrossTabQuery.java
@@ -19,7 +19,6 @@ USA
 
 package com.healthmarketscience.jackcess.query;
 
-import java.util.List;
 
 
 /**
diff --git a/src/main/java/com/healthmarketscience/jackcess/query/DataDefinitionQuery.java b/src/main/java/com/healthmarketscience/jackcess/query/DataDefinitionQuery.java
index 9b6b6fe..12ee74c 100644
--- a/src/main/java/com/healthmarketscience/jackcess/query/DataDefinitionQuery.java
+++ b/src/main/java/com/healthmarketscience/jackcess/query/DataDefinitionQuery.java
@@ -19,7 +19,6 @@ USA
 
 package com.healthmarketscience.jackcess.query;
 
-import java.util.List;
 
 
 /**
diff --git a/src/main/java/com/healthmarketscience/jackcess/util/SimpleColumnMatcher.java b/src/main/java/com/healthmarketscience/jackcess/util/SimpleColumnMatcher.java
index 68eb439..95db6a9 100644
--- a/src/main/java/com/healthmarketscience/jackcess/util/SimpleColumnMatcher.java
+++ b/src/main/java/com/healthmarketscience/jackcess/util/SimpleColumnMatcher.java
@@ -20,7 +20,6 @@ USA
 
 package com.healthmarketscience.jackcess.util;
 
-import com.healthmarketscience.jackcess.util.ColumnMatcher;
 import com.healthmarketscience.jackcess.Table;
 import org.apache.commons.lang.ObjectUtils;
 
diff --git a/src/main/java/com/healthmarketscience/jackcess/util/SimpleImportFilter.java b/src/main/java/com/healthmarketscience/jackcess/util/SimpleImportFilter.java
index 9a62140..4fe0975 100644
--- a/src/main/java/com/healthmarketscience/jackcess/util/SimpleImportFilter.java
+++ b/src/main/java/com/healthmarketscience/jackcess/util/SimpleImportFilter.java
@@ -32,7 +32,6 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.List;
 import com.healthmarketscience.jackcess.ColumnBuilder;
-import com.healthmarketscience.jackcess.util.ImportFilter;
 
 /**
  * Simple concrete implementation of ImportFilter which just returns the given