Applied some patches contributed by Sean

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

diff --git a/src/java/com/healthmarketscience/jackcess/Column.java b/src/java/com/healthmarketscience/jackcess/Column.java
index 6397415c207268b64e2a240b0b5664d3bc141fdc..822fb2bb31671c378df8978284b41e5769052e58 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/Column.java
+++ b/src/java/com/healthmarketscience/jackcess/Column.java
@@ -157,15 +157,7 @@ public class Column implements Comparable<Column> {
   public void setType(DataType type) {
     _type = type;
     setLength((short) size());
-    if (type == DataType.BOOLEAN || type == DataType.BYTE ||
-        type == DataType.INT || type == DataType.LONG ||
-        type == DataType.DOUBLE || type == DataType.FLOAT ||
-        type == DataType.SHORT_DATE_TIME)
-    {
-      setVariableLength(false);
-    } else if (type == DataType.BINARY || type == DataType.TEXT) {
-      setVariableLength(true);
-    }
+               setVariableLength(type.isVariableLength());
   }
   public DataType getType() {
     return _type;

diff --git a/src/java/com/healthmarketscience/jackcess/Table.java b/src/java/com/healthmarketscience/jackcess/Table.java
index d27a82604beca49bef565d1e1f354655d7d580a1..f3fbe43a52d4f2ab7b36aa482a746d98e2607cea 100644 (file)
--- a/src/java/com/healthmarketscience/jackcess/Table.java
+++ b/src/java/com/healthmarketscience/jackcess/Table.java
@@ -129,7 +129,7 @@ public class Table {
   /**
    * @return All of the columns in this table (unmodifiable List)
    */
-  public List getColumns() {
+  public List<Column> getColumns() {
     return Collections.unmodifiableList(_columns);
   }
   /**
@@ -142,7 +142,7 @@ public class Table {
   /**
    * @return All of the Indexes on this table (unmodifiable List)
    */
-  public List getIndexes() {
+  public List<Index> getIndexes() {
     return Collections.unmodifiableList(_indexes);
   }