fixes to svg for the new xml library

benfry · benfry · commit d155033fab17 · 2011-06-27T04:12:53.000Z
diff --git a/android/core/src/processing/core/PNode.java b/android/core/src/processing/core/PNode.java
@@ -101,6 +101,7 @@ public PNode(Reader reader) {
 //      Document document = builder.parse(dataPath("1_alt.html"));
       Document document = builder.parse(new InputSource(reader));
       node = document.getDocumentElement();
+      name = node.getNodeName();
 //      NodeList nodeList = document.getDocumentElement().getChildNodes();
 //      for (int i = 0; i < nodeList.getLength(); i++) {
 //      }
diff --git a/android/core/src/processing/core/PShapeSVG.java b/android/core/src/processing/core/PShapeSVG.java
@@ -309,7 +309,10 @@ protected PShape parseChild(PNode elem) {
     String name = elem.getName();
     PShapeSVG shape = null;
 
-    if (name.equals("g")) {
+    if (name == null) {
+      // just some whitespace that can be ignored (hopefully)
+
+    } else if (name.equals("g")) {
       //return new BaseObject(this, elem);
       shape = new PShapeSVG(this, elem, true);
 
@@ -1690,7 +1693,9 @@ public Font(PShapeSVG parent, PNode properties) {
       for (int i = 0; i < elements.length; i++) {
         String name = elements[i].getName();
         PNode elem = elements[i];
-        if (name.equals("glyph")) {
+        if (name == null) {
+          // skip it 
+        } else if (name.equals("glyph")) {
           FontGlyph fg = new FontGlyph(this, elem, this);
           if (fg.isLegit()) {
             if (fg.name != null) {
diff --git a/core/src/processing/core/PNode.java b/core/src/processing/core/PNode.java
@@ -105,6 +105,7 @@ public PNode(Reader reader) {
 //      Document document = builder.parse(dataPath("1_alt.html"));
       Document document = builder.parse(new InputSource(reader));
       node = document.getDocumentElement();
+      name = node.getNodeName();
 //      NodeList nodeList = document.getDocumentElement().getChildNodes();
 //      for (int i = 0; i < nodeList.getLength(); i++) {
 //      }
diff --git a/core/src/processing/core/PShapeSVG.java b/core/src/processing/core/PShapeSVG.java
@@ -317,7 +317,10 @@ protected PShape parseChild(PNode elem) {
     String name = elem.getName();
     PShapeSVG shape = null;
 
-    if (name.equals("g")) {
+    if (name == null) {
+      // just some whitespace that can be ignored (hopefully)
+
+    } else if (name.equals("g")) {
       //return new BaseObject(this, elem);
       shape = new PShapeSVG(this, elem, true);
 
@@ -1658,7 +1661,9 @@ public Font(PShapeSVG parent, PNode properties) {
       for (int i = 0; i < elements.length; i++) {
         String name = elements[i].getName();
         PNode elem = elements[i];
-        if (name.equals("glyph")) {
+        if (name == null) {
+          // skip it 
+        } else if (name.equals("glyph")) {
           FontGlyph fg = new FontGlyph(this, elem, this);
           if (fg.isLegit()) {
             if (fg.name != null) {
diff --git a/core/todo.txt b/core/todo.txt
@@ -1,6 +1,10 @@
 0199 core
 X pnode: look more closely at json and xml compatibility
 X argh, dumb mistake that broke SVG loading with loadNode()
+X fix major XML loading problem with names not getting set
+X image saving also broken, saving duplicate images (adding .tif to em all)
+X make note about XML dealing with whitespace differently
+X   leaves it intact, 'name' will be set to null
 
 
 andres 
diff --git a/todo.txt b/todo.txt
@@ -1,11 +1,25 @@
 0199 pde
-
+X remove error messages for UpdateCheck w/o internet connection
 
 _ update to java 6u26
 
 _ update the build instructions page
 _   http://code.google.com/p/processing/wiki/BuildInstructions
 
+http://support.microsoft.com/kb/184082
+http://msdn.microsoft.com/en-us/library/cc144175%28v=VS.85%29.aspx
+http://msdn.microsoft.com/en-us/library/cc144104%28v=VS.85%29.aspx
+http://msdn.microsoft.com/en-us/library/cc144067%28v=VS.85%29.aspx
+In regedit: Navigate to Computer\HKEY_CLASSES_ROOT\Applications and find your .exe name. Navigate under its name to shell>open>command. In the Default change its location to the actual location of the executable, hit okay and then try and reassociate the file type as you normally would.
+_ problem with associating .pde files 
+_   http://code.google.com/p/processing/issues/detail?id=247
+_   http://dev.processing.org/bugs/show_bug.cgi?id=1513
+_ do some testing for windows 7 on 64-bit
+_   http://dev.processing.org/bugs/show_bug.cgi?id=1424
+_ problem with startup on vista 64
+_   try this with windows 7 64-bit (install on laptop?)
+_   http://dev.processing.org/bugs/show_bug.cgi?id=1246
+
 _ switch to a non-modified version of the launcher exe
 _   move the launcher to jsmooth or something like that?
 
@@ -21,6 +35,7 @@ _ lots of other things in the google code issues list
 _ does editor.bgcolor live in the theme.txt file for the mode? 
 _   or should it be a user preference thing
 _   for that matter, need to decide on how much modes can customize themselves
+_ could move to java6 and better internal javac support (drop ecj)
 
 _ how to catch these?
 Exception in thread "Animation Thread" java.lang.NoClassDefFoundError: Could not initialize class javax.media.opengl.GLProfile
@@ -292,15 +307,6 @@ _   http://dev.processing.org/bugs/show_bug.cgi?id=1570
 
 _ create default tools folder (just like libraries)
 
-_ problem with associating .pde files 
-_   http://code.google.com/p/processing/issues/detail?id=247
-_   http://dev.processing.org/bugs/show_bug.cgi?id=1513
-_ do some testing for windows 7 on 64-bit
-_   http://dev.processing.org/bugs/show_bug.cgi?id=1424
-_ problem with startup on vista 64
-_   try this with windows 7 64-bit (install on laptop?)
-_   http://dev.processing.org/bugs/show_bug.cgi?id=1246
-
 _ add explanation to the reference about using beginRecord() with fonts
 _   pdf.textMode(SHAPE)
 _   also set the font *after* the record has started
