moving package, adding Table to Android, other data fixes

android/core/src/processing/core/PApplet.java

@@ -46,7 +46,6 @@ import android.text.format.Time;
 import android.util.*;
 import android.view.*;
 import android.widget.*;
-import android.widget.RelativeLayout;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
@@ -3838,22 +3837,20 @@ public class PApplet extends Activity implements PConstants, Runnable {
   }
 
 
+  
   //////////////////////////////////////////////////////////////
 
-  // NODE I/O (XML, JSON, etc.)
+  // DATA I/O
 
-  public XML loadNode(String filename) {
+
+  public XML loadXML(String filename) {
     return new XML(this, filename);
   }
 
 
-//  public PData loadData(String filename) {
-//    if (filename.toLowerCase().endsWith(".json")) {
-//      return new PData(this, filename);
-//    } else {
-//      throw new RuntimeException("filename used for loadNode() must end with XML");
-//    }
-//  }
+  public Table loadTable(String filename) {
+    return new Table(this, filename);
+  }
 
 
 

android/todo.txt

@@ -6,14 +6,16 @@ X   consider switch to android 2.2 as the minimum
 andres
 A GL2 specific code in Processing 2.0a5 break P3D on GLES2 hardware
 A   http://code.google.com/p/processing/issues/detail?id=1029
-_ Android OPENGL renderer + JAVA2D PGraphics results in PTexture exception
-_   http://code.google.com/p/processing/issues/detail?id=1019
 X OpenGL/ES requires precision specifier on float types
 X   http://code.google.com/p/processing/issues/detail?id=1035
+_ Android OPENGL renderer + JAVA2D PGraphics results in PTexture exception
+_   http://code.google.com/p/processing/issues/detail?id=1019
 
 earlier
 X remove unnecessary processing.xml.* code from android-core
 X   http://code.google.com/p/processing/issues/detail?id=214
+X remove unnecessary processing.xml.* code from android-core
+X   http://code.google.com/p/processing/issues/detail?id=214
 
 
 _ Android mode is broken on Windows in Processing 2.0a5
@@ -374,8 +376,6 @@ DL _   http://code.google.com/p/processing/issues/detail?id=244
 
 EH _ separate "PApplet" into separate View and Activity classes
 EH _   http://code.google.com/p/processing/issues/detail?id=212
-EM _ remove unnecessary processing.xml.* code from android-core
-EM _   http://code.google.com/p/processing/issues/detail?id=214
 EM _ implement size() and createGraphics() for arbitrary renderers
 EM _   http://code.google.com/p/processing/issues/detail?id=241
 

core/src/processing/core/PApplet.java

@@ -5352,21 +5352,20 @@ public class PApplet extends Applet
   */
 
 
+
   //////////////////////////////////////////////////////////////
 
-  // NODE I/O (XML, JSON, etc.)
+  // DATA I/O
+
+
   public XML loadXML(String filename) {
     return new XML(this, filename);
   }
 
 
-//  public PData loadData(String filename) {
-//    if (filename.toLowerCase().endsWith(".json")) {
-//      return new PData(this, filename);
-//    } else {
-//      throw new RuntimeException("filename used for loadNode() must end with XML");
-//    }
-//  }
+  public Table loadTable(String filename) {
+    return new Table(this, filename);
+  }
 
 
 

core/todo.txt

@@ -4,6 +4,10 @@ X   http://code.google.com/p/processing/issues/detail?id=969
 X   also add support for printing arrays of longs (doubles were already there)
 X createGraphics for JAVA2D generates the wrong error msg w/ w/h <= 0
 X   http://code.google.com/p/processing/issues/detail?id=983
+X move to processing.data.* package
+X   update the internal code for Android and desktop to add the import
+X   add loadTable().. 
+X   loadXML and loadTable are now in desktop
 
 fixed in 2.0a5
 A OpenGL noSmooth() does not work
@@ -47,8 +51,6 @@ o vectors shouldn't be exposed, need to expose attr lists as arrays
 o   or also add a method for getting the vectors?
 X   no longer an issue post-NanoXML
 X several other items under the LIBRARIES / XML section below
-X move to processing.data.* package
-X   update the internal code for Android and desktop to add the import
 
 _ change screenWidth/Height to displayWidth/Height
 _   also fix the Android etc docs
@@ -156,8 +158,6 @@ _   http://code.google.com/p/processing/issues/detail?id=509
 
 _ add reference/docs for urlEncode() and urlDecode()
 
-_ add loadTable().. 
-
 _ add() to add things to lists, sum() for the math (sum is used less after all)
 
 _ add inputPath() and outputPath() -> sketch folder or sd card