diff options
| author | Neil Fuller <nfuller@google.com> | 2018-07-10 18:36:31 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2018-07-11 13:59:01 +0100 |
| commit | 458d8cb80a6f1fa5e871c79cbbbf290fa9c3932f (patch) | |
| tree | 315944c84e9a31a7dab801fd6121f0960246b4a1 /xml | |
| parent | 5664b5977f98e36d426088c8dbc1b63aeff5eae0 (diff) | |
Rename org.kxml2 code to com.android.org.kxml2
org.kxml2 code is heavily modified in Android so renaming it to a
reserved package name will not make it less maintainable. This rename
should also flush out users who are depending on the parser
package name.
Bug: 111055375
Test: build
Change-Id: Idfe871ef7b24fd60d706b932ff2dc52eb9fbf4b6
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java (renamed from xml/src/main/java/org/kxml2/io/KXmlParser.java) | 2 | ||||
| -rw-r--r-- | xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java (renamed from xml/src/main/java/org/kxml2/io/KXmlSerializer.java) | 2 | ||||
| -rw-r--r-- | xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xml/src/main/java/org/kxml2/io/KXmlParser.java b/xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java index e010f1d0a1..3814e63a44 100644 --- a/xml/src/main/java/org/kxml2/io/KXmlParser.java +++ b/xml/src/main/java/com/android/org/kxml2/io/KXmlParser.java @@ -20,7 +20,7 @@ // Contributors: Paul Hackenberger (unterminated entity handling in relaxed mode) -package org.kxml2.io; +package com.android.org.kxml2.io; import java.io.Closeable; import java.io.IOException; diff --git a/xml/src/main/java/org/kxml2/io/KXmlSerializer.java b/xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java index 25f092497a..795448d50c 100644 --- a/xml/src/main/java/org/kxml2/io/KXmlSerializer.java +++ b/xml/src/main/java/com/android/org/kxml2/io/KXmlSerializer.java @@ -19,7 +19,7 @@ * IN THE SOFTWARE. */ -package org.kxml2.io; +package com.android.org.kxml2.io; import java.io.*; import java.util.Locale; diff --git a/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java b/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java index 7215b3e654..61907778d4 100644 --- a/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java +++ b/xml/src/main/java/org/xmlpull/v1/XmlPullParserFactory.java @@ -37,8 +37,8 @@ public class XmlPullParserFactory { serializerClasses = new ArrayList<String>(); try { - parserClasses.add(Class.forName("org.kxml2.io.KXmlParser")); - serializerClasses.add(Class.forName("org.kxml2.io.KXmlSerializer")); + parserClasses.add(Class.forName("com.android.org.kxml2.io.KXmlParser")); + serializerClasses.add(Class.forName("com.android.org.kxml2.io.KXmlSerializer")); } catch (ClassNotFoundException e) { throw new AssertionError(); } |