Move to package android.databinding.

10 files changed, 13 insertions, 16 deletions

diff --git a/tools/data-binding/xmlGrammar/build.gradle b/tools/data-binding/xmlGrammar/build.gradle
index 2ae83fc..c9d3607 100644
--- a/tools/data-binding/xmlGrammar/build.gradle
+++ b/tools/data-binding/xmlGrammar/build.gradle
@@ -25,8 +25,7 @@ buildscript {
 
 
 run {
-////    args "XMLLexer.g4", "-visitor", "-o", "src/main/java-gen/com/android/databinding", "-package", "com.android.databinding", "-lib", "."
-    args "XMLParser.g4", "-visitor", "-o", "src/main/java/com/android/databinding", "-package", "com.android.databinding", "-lib", "."
+    args "XMLParser.g4", "-visitor", "-o", "src/main/java/android/databinding/parser", "-package", "android.databinding.parser", "-lib", "."
 }
 
 dependencies {
diff --git a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLLexer.java b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLLexer.java
index 5d85641..b8c79bb 100644
--- a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLLexer.java
+++ b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLLexer.java
@@ -1,13 +1,11 @@
 // Generated from XMLLexer.g4 by ANTLR 4.4
-package com.android.databinding;
-import org.antlr.v4.runtime.Lexer;
+package android.databinding.parser;
+
 import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.*;
-import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.misc.*;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.atn.ATN;
+import org.antlr.v4.runtime.atn.ATNDeserializer;
+import org.antlr.v4.runtime.atn.LexerATNSimulator;
 
 public class XMLLexer extends Lexer {
 	public static final int
diff --git a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLLexer.tokens b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLLexer.tokens
index cd122a4..cd122a4 100644
--- a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLLexer.tokens
+++ b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLLexer.tokens
diff --git a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParser.java b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParser.java
index a324494..f18a5f0 100644
--- a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParser.java
+++ b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParser.java
@@ -1,5 +1,5 @@
 // Generated from XMLParser.g4 by ANTLR 4.4
-package com.android.databinding;
+package android.databinding.parser;
 import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
 import org.antlr.v4.runtime.*;
diff --git a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParser.tokens b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParser.tokens
index b1423a1..b1423a1 100644
--- a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParser.tokens
+++ b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParser.tokens
diff --git a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserBaseListener.java b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParserBaseListener.java
index 9c43842..4c2bae2 100644
--- a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserBaseListener.java
+++ b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParserBaseListener.java
@@ -1,5 +1,5 @@
 // Generated from XMLParser.g4 by ANTLR 4.4
-package com.android.databinding;
+package android.databinding.parser;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.Token;
diff --git a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserBaseVisitor.java b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParserBaseVisitor.java
index 91d18e7..6b04b77 100644
--- a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserBaseVisitor.java
+++ b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParserBaseVisitor.java
@@ -1,5 +1,5 @@
 // Generated from XMLParser.g4 by ANTLR 4.4
-package com.android.databinding;
+package android.databinding.parser;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
diff --git a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserListener.java b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParserListener.java
index b5499a6..6bee172 100644
--- a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserListener.java
+++ b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParserListener.java
@@ -1,5 +1,5 @@
 // Generated from XMLParser.g4 by ANTLR 4.4
-package com.android.databinding;
+package android.databinding.parser;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
diff --git a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserVisitor.java b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParserVisitor.java
index 58a65f4..6a76a00 100644
--- a/tools/data-binding/xmlGrammar/src/main/java/com/android/databinding/XMLParserVisitor.java
+++ b/tools/data-binding/xmlGrammar/src/main/java/android/databinding/parser/XMLParserVisitor.java
@@ -1,5 +1,5 @@
 // Generated from XMLParser.g4 by ANTLR 4.4
-package com.android.databinding;
+package android.databinding.parser;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.misc.NotNull;
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;
diff --git a/tools/data-binding/xmlGrammar/src/main/kotlin/xmlEditorTest.kt b/tools/data-binding/xmlGrammar/src/main/kotlin/xmlEditorTest.kt
index 98bc8eb..48356ad 100644
--- a/tools/data-binding/xmlGrammar/src/main/kotlin/xmlEditorTest.kt
+++ b/tools/data-binding/xmlGrammar/src/main/kotlin/xmlEditorTest.kt
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.databinding
+package android.databinding.parser
 
 import java.io.File
 import org.antlr.v4.runtime.ANTLRInputStream