minor cleanups/formatting

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

diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/ComplexColumnSupport.java b/src/main/java/com/healthmarketscience/jackcess/impl/ComplexColumnSupport.java
index 6a98ef08aba3c15bc984d6c107bc9cb8163ac698..533e1ef574a87308504a4c899fe0ce00eb089bb8 100644 (file)
--- 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 2cd599080b5627a0d4ca70a04ed99dfb770efe46..e2b11568bb63a42f4465b8994d0e4a549473cc75 100644 (file)
--- 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 e8952cdc648ee7f967b04919bfdd2a4c0f906416..94c8e415b933889dae7141325edc7611b108f250 100644 (file)
--- 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 474c979f94506aea0122c6fb23934844f6ecae00..c0a0543b2cded5b4f0df406d43bbe78b787f0f2a 100644 (file)
--- 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 9b6b6fe95c2ed41210a1c8b4a6d5b576dac614e7..12ee74ce00c1a22c29b0bb36b8133a9e38b3a8de 100644 (file)
--- 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 68eb439c81e598f04686210c3f23b7112feec322..95db6a9c865175bf2d75fd84bc9c5bfb539f5ec9 100644 (file)
--- 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 9a62140621b535695fd4747d36a3446e277319c7..4fe0975240b04088dfd392e134eff9a53fd7482c 100644 (file)
--- 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