From f0e5e133b3bc8de7665bf68ef8dc17499e1f1479 Mon Sep 17 00:00:00 2001 From: benfry Date: Fri, 24 Jun 2011 00:04:07 +0000 Subject: [PATCH] dumb, dumb breakage to svg loading --- android/core/src/processing/core/PApplet.java | 6 +----- core/src/processing/core/PApplet.java | 6 +----- core/todo.txt | 2 ++ todo.txt | 9 +++------ 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/android/core/src/processing/core/PApplet.java b/android/core/src/processing/core/PApplet.java index 3ecd4a570..d03c9ef99 100644 --- a/android/core/src/processing/core/PApplet.java +++ b/android/core/src/processing/core/PApplet.java @@ -3636,11 +3636,7 @@ public class PApplet extends Activity implements PConstants, Runnable { // NODE I/O (XML, JSON, etc.) public PNode loadNode(String filename) { - if (filename.toLowerCase().endsWith(".xml")) { - return new PNode(this, filename); - } else { - throw new RuntimeException("filename used for loadNode() must end with XML"); - } + return new PNode(this, filename); } diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 69e1e82aa..14c0202ce 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -4177,11 +4177,7 @@ public class PApplet extends Applet // NODE I/O (XML, JSON, etc.) public PNode loadNode(String filename) { - if (filename.toLowerCase().endsWith(".xml")) { - return new PNode(this, filename); - } else { - throw new RuntimeException("filename used for loadNode() must end with XML"); - } + return new PNode(this, filename); } diff --git a/core/todo.txt b/core/todo.txt index 76bbdfaa0..9e389e7dd 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -1,4 +1,6 @@ 0199 core +X pnode: look more closely at json and xml compatibility +X argh, dumb mistake that broke SVG loading with loadNode() andres diff --git a/todo.txt b/todo.txt index 5249910f3..2ac6465bc 100644 --- a/todo.txt +++ b/todo.txt @@ -1,6 +1,8 @@ 0199 pde +_ update to java 6u26 + _ update the build instructions page _ http://code.google.com/p/processing/wiki/BuildInstructions @@ -32,8 +34,6 @@ _ http://code.google.com/p/processing/issues/detail?id=688 _ write quicktime uncompressed (w/o qtjava) _ http://www.randelshofer.ch/blog/2010/10/writing-quicktime-movies-in-pure-java/ -pnode: look more closely at json and xml compatibility - frequent requests/projects _ nurbs or other architecture stuff _ force indentation - implement an option for beginners especially @@ -43,10 +43,6 @@ _ fix autoformat to indent like the p5 book/examples _ common error messages _ with a proper list, we can add links when throwing an error in the PDE - -casey -_ colors for 2.0 - casey working on it, presenting sunday - ben _ build is currently broken for fresh checkout due to changes to file layout _ something that gets fixed by 'make clean' @@ -86,6 +82,7 @@ _ jer: android tutorial _ probably later: examples into categories based on difficulty _ add ratings/difficult level to examples online and in the pde _ go through examples, figure out how to do many on the site w/ js instead +_ colors/design for 2.0 opengl _ new opengl2