CVS Update: xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/classic
Aleksander Andrzej Slominski <[email protected]> Sat, 3 May 2003 17:23:13 -0500 (EST)
| Newsgroups | gmane.text.xml.xmlpull.devel |
|---|---|
| Message-ID | <[email protected]> |
aslom 03/05/03 17:23:13
Modified: addons/java/wrapper/src/org/xmlpull/v1/wrapper
XmlPullParserWrapper.java
XmlPullWrapperFactory.java
XmlSerializerWrapper.java
addons/java/wrapper/src/org/xmlpull/v1/wrapper/classic
StaticXmlPullParserWrapper.java
StaticXmlSerializerWrapper.java
Log:
added methods that were missing and improved usablit
of XmlPullWrapperFactory by better mimicking XmlPullParserFactory API
(thanks to Naresh)
Revision Changes Path
1.2 +9 -0 xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlPullParserWrapper.java
Index: XmlPullParserWrapper.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlPullParserWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- XmlPullParserWrapper.java 3 May 2003 05:56:45 -0000 1.1
+++ XmlPullParserWrapper.java 3 May 2003 22:23:12 -0000 1.2
@@ -14,6 +14,7 @@
* Extensions to XmlPullParser interface
*
* @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
+ * @author Naresh Bhatia
*/
public interface XmlPullParserWrapper extends XmlPullParser {
@@ -35,6 +36,14 @@
*/
public String getPIData() throws IllegalStateException;
+ public String getRequiredElementText(String namespace, String name)
+ throws IOException, XmlPullParserException;
+
+ /**
+ * Is the current tag nil? Checks for xsi:nil="true".
+ */
+ public boolean isNil() throws IOException, XmlPullParserException;
+
/**
* Tests if the current event is of the given type and if the namespace and name match.
* null will match any namespace and any name. If the test passes a true is returned
1.3 +20 -12 xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlPullWrapperFactory.java
Index: XmlPullWrapperFactory.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlPullWrapperFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -t -w -r1.2 -r1.3
--- XmlPullWrapperFactory.java 3 May 2003 06:19:22 -0000 1.2
+++ XmlPullWrapperFactory.java 3 May 2003 22:23:12 -0000 1.3
@@ -20,8 +20,8 @@
public class XmlPullWrapperFactory {
private final static boolean DEBUG = false;
protected ClassLoader classLoader;
- protected XmlPullParserFactory factory;
- protected boolean useDynamic;
+ protected XmlPullParserFactory f;
+ //protected boolean useDynamic;
public static XmlPullWrapperFactory newInstance() throws XmlPullParserException
{
@@ -35,13 +35,21 @@
return new XmlPullWrapperFactory(factory);
}
+ public static XmlPullWrapperFactory newInstance (String classNames, Class context)
+ throws XmlPullParserException
+ {
+ XmlPullParserFactory factory = XmlPullParserFactory.newInstance(classNames, context);
+ return new XmlPullWrapperFactory(factory);
+ }
+
+
// ------------ IMPLEMENTATION
protected XmlPullWrapperFactory(XmlPullParserFactory factory) throws XmlPullParserException {
if(factory != null) {
- this.factory = factory;
+ this.f = factory;
} else {
- this.factory = XmlPullParserFactory.newInstance();
+ this.f = XmlPullParserFactory.newInstance();
}
}
@@ -49,34 +57,34 @@
public void setFeature(String name,
boolean state) throws XmlPullParserException
{
- factory.setFeature(name, state);
+ f.setFeature(name, state);
}
public boolean getFeature (String name) {
- return factory.getFeature(name);
+ return f.getFeature(name);
}
public void setNamespaceAware(boolean awareness) {
- factory.setNamespaceAware(awareness);
+ f.setNamespaceAware(awareness);
}
public boolean isNamespaceAware() {
- return factory.isNamespaceAware();
+ return f.isNamespaceAware();
}
public void setValidating(boolean validating) {
- factory.setValidating(validating);
+ f.setValidating(validating);
}
public boolean isValidating() {
- return factory.isValidating();
+ return f.isValidating();
}
//public void setUseDynamic(boolean enable) { useDynamic = enable; };
//public boolean getUseDynamic() { return useDynamic; };
public XmlPullParserWrapper newPullWrapper() throws XmlPullParserException {
- XmlPullParser pp = factory.newPullParser();
+ XmlPullParser pp = f.newPullParser();
// if(useDynamic) {
// return (XmlPullParserWrapper) DynamicXmlPullParserWrapper.newProxy(pp, classLoader);
// } else {
@@ -88,7 +96,7 @@
}
public XmlSerializerWrapper newSerializerWrapper() throws XmlPullParserException {
- XmlSerializer xs = factory.newSerializer();
+ XmlSerializer xs = f.newSerializer();
return new StaticXmlSerializerWrapper(xs);
}
1.2 +12 -0 xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlSerializerWrapper.java
Index: XmlSerializerWrapper.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/XmlSerializerWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- XmlSerializerWrapper.java 3 May 2003 05:56:45 -0000 1.1
+++ XmlSerializerWrapper.java 3 May 2003 22:23:12 -0000 1.2
@@ -4,12 +4,14 @@
package org.xmlpull.v1.wrapper;
import java.io.IOException;
+import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
/**
* Extensions to XmlSerialzier interface
*
* @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
+ * @author Naresh Bhatia
*/
public interface XmlSerializerWrapper extends XmlSerializer {
public static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
@@ -22,5 +24,15 @@
public XmlSerializer endTag (String name)
throws IOException, IllegalArgumentException, IllegalStateException;
+
+
+ /**
+ * Writes a simple element such as <username>johndoe</username>. The namespace
+ * and elementText are allowed to be null. If elementText is null, an xsi:nil="true"
+ * will be added as an attribute.
+ */
+ public void element(String namespace, String elementName, String elementText)
+ throws IOException, XmlPullParserException;
+
}
1.2 +5 -5 xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/classic/StaticXmlPullParserWrapper.java
Index: StaticXmlPullParserWrapper.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/classic/StaticXmlPullParserWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- StaticXmlPullParserWrapper.java 3 May 2003 05:56:46 -0000 1.1
+++ StaticXmlPullParserWrapper.java 3 May 2003 22:23:13 -0000 1.2
@@ -14,6 +14,7 @@
* (provided by XmlPullUtil) and delegating exisiting methods to parser implementation.
*
* @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
+ * @author Naresh Bhatia
*/
public class StaticXmlPullParserWrapper extends XmlPullParserDelegate
implements XmlPullParserWrapper
@@ -37,7 +38,8 @@
*/
public String getRequiredElementText(String namespace, String name)
- throws IOException, XmlPullParserException {
+ throws IOException, XmlPullParserException
+ {
if (name == null) {
throw new XmlPullParserException("name for element can not be null");
}
@@ -54,11 +56,9 @@
return text;
}
- /**
- * Is the current tag nil? Checks for xsi:nil="true".
- */
public boolean isNil()
- throws IOException, XmlPullParserException {
+ throws IOException, XmlPullParserException
+ {
boolean result = false;
String value = pp.getAttributeValue(XSI_NS, "nil");
1.2 +1 -7 xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/classic/StaticXmlSerializerWrapper.java
Index: StaticXmlSerializerWrapper.java
===================================================================
RCS file: /l/extreme/cvspub/xmlpull-api-v1/addons/java/wrapper/src/org/xmlpull/v1/wrapper/classic/StaticXmlSerializerWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -t -w -r1.1 -r1.2
--- StaticXmlSerializerWrapper.java 3 May 2003 05:56:46 -0000 1.1
+++ StaticXmlSerializerWrapper.java 3 May 2003 22:23:13 -0000 1.2
@@ -14,6 +14,7 @@
* (provided by XmlPullUtil) and delegating exisiting methods to parser implementation.
*
* @author <a href="http://www.extreme.indiana.edu/~aslom/">Aleksander Slominski</a>
+ * @author Naresh Bhatia
*/
public class StaticXmlSerializerWrapper extends XmlSerializerDelegate
implements XmlSerializerWrapper
@@ -40,13 +41,6 @@
return xs.endTag(defaultNs, name);
}
-
-
- /**
- * Writes a simple element such as <username>johndoe</username>. The namespace
- * and elementText are allowed to be null. If elementText is null, an xsi:nil="true"
- * will be added as an attribute.
- */
public void element(String namespace, String elementName, String elementText)
throws IOException, XmlPullParserException
{
------------------------ Yahoo! Groups Sponsor ---------------------~-->
Rent DVDs Online - Over 14,500 titles.
No Late Fees & Free Shipping.
Try Netflix for FREE!
http://us.click.yahoo.com/YoVfrB/XP.FAA/uetFAA/2U_rlB/TM
---------------------------------------------------------------------~->
To unsubscribe from this group, send an email to:
[email protected]
Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/