diff options
Diffstat (limited to 'src/main/java/com')
5 files changed, 11 insertions, 17 deletions
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/IndexData.java b/src/main/java/com/healthmarketscience/jackcess/impl/IndexData.java index c08e70b..7eb094a 100644 --- a/src/main/java/com/healthmarketscience/jackcess/impl/IndexData.java +++ b/src/main/java/com/healthmarketscience/jackcess/impl/IndexData.java @@ -532,6 +532,7 @@ public class IndexData { * @param creator description of the indexes to write * @param buffer Buffer to write to */ + @SuppressWarnings("resource") protected static void writeDefinition( TableMutator creator, ByteBuffer buffer, TableMutator.IndexDataState idxDataState, ByteBuffer rootPageBuffer) @@ -2659,36 +2660,32 @@ public class IndexData { _between = between; } - public DataPage getDataPage() { + DataPage getDataPage() { return _dataPage; } - public int getIndex() { + int getIndex() { return _idx; } - public int getNextIndex() { + int getNextIndex() { // note, _idx does not need to be advanced if it was pointing at a // between position return(_between ? _idx : (_idx + 1)); } - public int getPrevIndex() { + int getPrevIndex() { // note, we ignore the between flag here because the index will be // pointing at the correct next index in either the between or // non-between case return(_idx - 1); } - public Entry getEntry() { + Entry getEntry() { return _entry; } - public boolean isBetween() { - return _between; - } - - public boolean equalsEntry(Entry entry) { + boolean equalsEntry(Entry entry) { return _entry.equals(entry); } diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/IndexPageCache.java b/src/main/java/com/healthmarketscience/jackcess/impl/IndexPageCache.java index b64b93d..0d6c997 100644 --- a/src/main/java/com/healthmarketscience/jackcess/impl/IndexPageCache.java +++ b/src/main/java/com/healthmarketscience/jackcess/impl/IndexPageCache.java @@ -23,7 +23,6 @@ import java.util.AbstractList; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -31,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.Queue; import java.util.RandomAccess; -import java.util.Set; import static com.healthmarketscience.jackcess.impl.IndexData.*; import com.healthmarketscience.jackcess.impl.IndexData.DataPage; diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/TableImpl.java b/src/main/java/com/healthmarketscience/jackcess/impl/TableImpl.java index c01c1a5..2be9f45 100644 --- a/src/main/java/com/healthmarketscience/jackcess/impl/TableImpl.java +++ b/src/main/java/com/healthmarketscience/jackcess/impl/TableImpl.java @@ -53,7 +53,6 @@ import com.healthmarketscience.jackcess.Table; import com.healthmarketscience.jackcess.expr.Identifier; import com.healthmarketscience.jackcess.util.ErrorHandler; import com.healthmarketscience.jackcess.util.ExportUtil; -import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/expr/Expressionator.java b/src/main/java/com/healthmarketscience/jackcess/impl/expr/Expressionator.java index 1c6d5f3..e15e7be 100644 --- a/src/main/java/com/healthmarketscience/jackcess/impl/expr/Expressionator.java +++ b/src/main/java/com/healthmarketscience/jackcess/impl/expr/Expressionator.java @@ -73,7 +73,6 @@ public class Expressionator } private static final String FUNC_START_DELIM = "("; - private static final String FUNC_END_DELIM = ")"; private static final String OPEN_PAREN = "("; private static final String CLOSE_PAREN = ")"; private static final String FUNC_PARAM_SEP = ","; diff --git a/src/main/java/com/healthmarketscience/jackcess/util/MemFileChannel.java b/src/main/java/com/healthmarketscience/jackcess/util/MemFileChannel.java index ba9a037..156f882 100644 --- a/src/main/java/com/healthmarketscience/jackcess/util/MemFileChannel.java +++ b/src/main/java/com/healthmarketscience/jackcess/util/MemFileChannel.java @@ -116,13 +116,14 @@ public class MemFileChannel extends FileChannel public static MemFileChannel newChannel(File file, String mode) throws IOException { + RandomAccessFile raf = null; FileChannel in = null; try { - return newChannel(in = new RandomAccessFile( - file, RO_CHANNEL_MODE).getChannel(), - mode); + raf = new RandomAccessFile(file, RO_CHANNEL_MODE); + return newChannel(in = raf.getChannel(), mode); } finally { ByteUtil.closeQuietly(in); + ByteUtil.closeQuietly(raf); } } |