You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2015/03/06 22:16:50 UTC
android commit: XmlPullParserFactory -> XmlPullParser in
ConfigXmlParser
Repository: cordova-android
Updated Branches:
refs/heads/master 191839f76 -> 917d0dfc4
XmlPullParserFactory -> XmlPullParser in ConfigXmlParser
This allows clients to parse non-resourse XML
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/917d0dfc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/917d0dfc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/917d0dfc
Branch: refs/heads/master
Commit: 917d0dfc492d4fd2f4437440694a32f5afd7d8ae
Parents: 191839f
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Mar 6 16:16:06 2015 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Mar 6 16:16:06 2015 -0500
----------------------------------------------------------------------
framework/src/org/apache/cordova/ConfigXmlParser.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/917d0dfc/framework/src/org/apache/cordova/ConfigXmlParser.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/ConfigXmlParser.java b/framework/src/org/apache/cordova/ConfigXmlParser.java
index 89713ed..01a97f2 100644
--- a/framework/src/org/apache/cordova/ConfigXmlParser.java
+++ b/framework/src/org/apache/cordova/ConfigXmlParser.java
@@ -25,10 +25,10 @@ import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.content.Context;
-import android.content.res.XmlResourceParser;
public class ConfigXmlParser {
private static String TAG = "ConfigXmlParser";
@@ -67,14 +67,14 @@ public class ConfigXmlParser {
String service = "", pluginClass = "", paramType = "";
boolean onload = false;
- public void parse(XmlResourceParser xml) {
+ public void parse(XmlPullParser xml) {
int eventType = -1;
- while (eventType != XmlResourceParser.END_DOCUMENT) {
- if (eventType == XmlResourceParser.START_TAG) {
+ while (eventType != XmlPullParser.END_DOCUMENT) {
+ if (eventType == XmlPullParser.START_TAG) {
handleStartTag(xml);
}
- else if (eventType == XmlResourceParser.END_TAG)
+ else if (eventType == XmlPullParser.END_TAG)
{
handleEndTag(xml);
}
@@ -88,7 +88,7 @@ public class ConfigXmlParser {
}
}
- public void handleStartTag(XmlResourceParser xml) {
+ public void handleStartTag(XmlPullParser xml) {
String strNode = xml.getName();
if (strNode.equals("feature")) {
//Check for supported feature sets aka. plugins (Accelerometer, Geolocation, etc)
@@ -118,7 +118,7 @@ public class ConfigXmlParser {
}
}
- public void handleEndTag(XmlResourceParser xml) {
+ public void handleEndTag(XmlPullParser xml) {
String strNode = xml.getName();
if (strNode.equals("feature")) {
pluginEntries.add(new PluginEntry(service, pluginClass, onload));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org