From c9afeb5bc53ac5c153af6d3b8f81338bfa46fac4 Mon Sep 17 00:00:00 2001 From: alignedleft Date: Wed, 19 Dec 2012 23:09:43 +0000 Subject: [PATCH] Replaced old XML.parse() reference with PApplet.parseXML() reference --- core/src/processing/core/PApplet.java | 10 ++++++++-- core/src/processing/data/XML.java | 3 --- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 59b7984e2..47bc1d3b8 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -5816,7 +5816,7 @@ public class PApplet extends Applet /** * @webref input:files * @param filename name of a file in the data folder or a URL. - * @see XML#parse(String) + * @see PApplet#parseXML(String) * @see PApplet#loadBytes(String) * @see PApplet#loadStrings(String) * @see PApplet#loadTable(String) @@ -5836,7 +5836,13 @@ public class PApplet extends Applet } } - + /** + * @webref input:files + * @brief Converts String content to an XML object + * @param data the content to be parsed as XML + * @return an XML object, or null + * @see PApplet#loadXML(String) + */ public XML parseXML(String xmlString) { return parseXML(xmlString, null); } diff --git a/core/src/processing/data/XML.java b/core/src/processing/data/XML.java index 40ca83a7c..617e63a75 100644 --- a/core/src/processing/data/XML.java +++ b/core/src/processing/data/XML.java @@ -157,8 +157,6 @@ public class XML implements Serializable { /** - * xxxxxxx - * * @webref xml:method * @brief Converts String content to an XML object * @param data the content to be parsed as XML @@ -166,7 +164,6 @@ public class XML implements Serializable { * @throws SAXException * @throws ParserConfigurationException * @throws IOException - * @see PApplet#loadXML(String) */ static public XML parse(String data) throws IOException, ParserConfigurationException, SAXException { return XML.parse(data, null);