git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@832 f203690c-595d-4dc9-a70b-905162fa7fd2tags/jackcess-2.0.2
@@ -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; |
@@ -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; | |||
@@ -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"); | |||
} |
@@ -19,7 +19,6 @@ USA | |||
package com.healthmarketscience.jackcess.query; | |||
import java.util.List; | |||
/** |
@@ -19,7 +19,6 @@ USA | |||
package com.healthmarketscience.jackcess.query; | |||
import java.util.List; | |||
/** |
@@ -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; | |||
@@ -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 |