Author: jbq
Date: Mon Mar 5 07:45:37 2007
New Revision: 514700
URL: http://svn.apache.org/viewvc?view=rev&rev=514700
Log:
Javadoc improvement, and adding parse(InputStream) using UTF-8 encoding by
default when not specified in XML declaration.
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/IXmlPullParser.java
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/IXmlPullParser.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/IXmlPullParser.java?view=diff&rev=514700&r1=514699&r2=514700
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/IXmlPullParser.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/IXmlPullParser.java
Mon Mar 5 07:45:37 2007
@@ -99,8 +99,23 @@
void parse(final CharSequence string) throws IOException,
ResourceStreamNotFoundException;
/**
- * Reads and parses markup from a resource like file. Use nextTag() to
- * access the tags contained, one after another.
+ * Reads and parses markup from an input stream, using UTF-8 encoding by
+ * default when not specified in XML declaration. Use nextTag() to
access
+ * the tags contained, one after another.
+ *
+ * @param inputStream
+ * The input stream to read and parse
+ * @throws IOException
+ * Error while reading the resource
+ * @throws ResourceStreamNotFoundException
+ * Resource not found
+ */
+ public abstract void parse(final InputStream inputStream) throws
IOException,
+ ResourceStreamNotFoundException;
+
+ /**
+ * Reads and parses markup from an input stream. Use nextTag() to
access the
+ * tags contained, one after another.
*
* @param inputStream
* A resource like e.g. a file
@@ -125,4 +140,4 @@
* @param pos
*/
void setPositionMarker(final int pos);
-}
\ No newline at end of file
+}
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java?view=diff&rev=514700&r1=514699&r2=514700
==============================================================================
---
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java
(original)
+++
incubator/wicket/trunk/wicket/src/main/java/wicket/markup/parser/XmlPullParser.java
Mon Mar 5 07:45:37 2007
@@ -501,10 +501,26 @@
}
/**
- * Reads and parses markup from a resource such as file.
+ * Reads and parses markup from an input stream, using UTF-8 encoding by
+ * default when not specified in XML declaration.
+ *
+ * @param in
+ * The input stream to read and parse
+ * @throws IOException
+ * @throws ResourceStreamNotFoundException
+ */
+ public void parse(final InputStream in) throws IOException,
+ ResourceStreamNotFoundException
+ {
+ // When XML declaration does not specify encoding, it defaults
to UTF-8
+ parse(in, "UTF-8");
+ }
+
+ /**
+ * Reads and parses markup from an input stream
*
* @param inputStream
- * The resource to read and parse
+ * The input stream to read and parse
* @param encoding
* The default character encoding of the input
* @throws IOException
