You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/06/18 11:37:15 UTC
[1/5] git commit: WICKET-4601 IResourceStreamWriter to take
OutputStream instead of Response
Updated Branches:
refs/heads/master 1ab5628bb -> 4d78d9203
WICKET-4601 IResourceStreamWriter to take OutputStream instead of Response
IXmlPullParser does not need to throw ResourceStreamNotFoundException when parsing
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4d78d920
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4d78d920
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4d78d920
Branch: refs/heads/master
Commit: 4d78d9203efbc3e0256e6fd63e40721d85a7a1b9
Parents: 8cbbcae
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 18 12:15:19 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 18 12:15:19 2012 +0300
----------------------------------------------------------------------
.../wicket/markup/parser/IXmlPullParser.java | 9 ++-------
.../apache/wicket/markup/parser/XmlPullParser.java | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4d78d920/wicket-core/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java
index 36065ad..3df04f6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/IXmlPullParser.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
-import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
/**
@@ -111,10 +110,8 @@ public interface IXmlPullParser
* The markup to be parsed
* @throws IOException
* Error while reading the resource
- * @throws ResourceStreamNotFoundException
- * Resource not found
*/
- void parse(final CharSequence string) throws IOException, ResourceStreamNotFoundException;
+ void parse(final CharSequence string) throws IOException;
/**
* Reads and parses markup from an input stream, using UTF-8 encoding by default when not
@@ -124,10 +121,8 @@ public interface IXmlPullParser
* The input stream to read and parse
* @throws IOException
* Error while reading the resource
- * @throws ResourceStreamNotFoundException
- * Resource not found
*/
- void parse(final InputStream inputStream) throws IOException, ResourceStreamNotFoundException;
+ void parse(final InputStream inputStream) throws IOException;
/**
* Reads and parses markup from an input stream. Use nextTag() to access the tags contained, one
http://git-wip-us.apache.org/repos/asf/wicket/blob/4d78d920/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
index 93c57d0..262b795 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
@@ -30,7 +30,6 @@ import org.apache.wicket.util.io.XmlReader;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.parse.metapattern.parsers.TagNameParser;
import org.apache.wicket.util.parse.metapattern.parsers.VariableAssignmentParser;
-import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.string.Strings;
/**
@@ -541,12 +540,9 @@ public final class XmlPullParser implements IXmlPullParser
* The input string
* @throws IOException
* Error while reading the resource
- * @throws ResourceStreamNotFoundException
- * Resource not found
*/
@Override
- public void parse(final CharSequence string) throws IOException,
- ResourceStreamNotFoundException
+ public void parse(final CharSequence string) throws IOException
{
parse(new ByteArrayInputStream(string.toString().getBytes()), null);
}
@@ -558,10 +554,9 @@ public final class XmlPullParser implements IXmlPullParser
* @param in
* The input stream to read and parse
* @throws IOException
- * @throws ResourceStreamNotFoundException
*/
@Override
- public void parse(final InputStream in) throws IOException, ResourceStreamNotFoundException
+ public void parse(final InputStream in) throws IOException
{
// When XML declaration does not specify encoding, it defaults to UTF-8
parse(in, "UTF-8");