minor edits pulled in from ftsv project

benfry · benfry · commit 5221faa3dae5 · 2016-07-31T16:42:52.000-04:00
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
@@ -548,7 +548,7 @@ protected void parseAwfulCSV(BufferedReader reader,
   */
 
 
-  class CommaSeparatedLine {
+  static class CommaSeparatedLine {
     char[] c;
     String[] pieces;
     int pieceCount;
@@ -797,6 +797,23 @@ static protected String[] splitLineCSV(String line, BufferedReader reader) throw
         i++;
         ii++;
       }
+      /*
+      if (autoTyping) {
+        if (autoTypes == null) {
+          autoTypes = new int[pieces.length];
+
+        } else {
+          if (autoTypes.length < pieces.length) {
+
+          }
+          Double.parseDouble("");
+          Float.parseFloat("blah");
+//          if (autoTypes[pieceCount]) {
+//
+//          }
+        }
+      }
+      */
       String s = new String(c, start, ii - start);
       pieces[pieceCount++] = s;
     }
@@ -2000,12 +2017,7 @@ public void setColumnType(String columnName, String columnType) {
   }
 
 
-  /**
-   * Set the data type for a column so that using it is more efficient.
-   * @param column the column to change
-   * @param columnType One of int, long, float, double, string, or category.
-   */
-  public void setColumnType(int column, String columnType) {
+  static int parseColumnType(String columnType) {
     columnType = columnType.toLowerCase();
     int type = -1;
     if (columnType.equals("string")) {
@@ -2023,7 +2035,17 @@ public void setColumnType(int column, String columnType) {
     } else {
       throw new IllegalArgumentException("'" + columnType + "' is not a valid column type.");
     }
-    setColumnType(column, type);
+    return type;
+  }
+
+
+  /**
+   * Set the data type for a column so that using it is more efficient.
+   * @param column the column to change
+   * @param columnType One of int, long, float, double, string, or category.
+   */
+  public void setColumnType(int column, String columnType) {
+    setColumnType(column, parseColumnType(columnType));
   }
 
 
