rename package

antlr · Mar 9, 2024 · 08f4e2b · 08f4e2b
1 parent 0dab63c
commit 08f4e2b
Show file tree

Hide file tree

Showing 61 changed files with 85 additions and 83 deletions.
diff --git a/antlr5-maven-plugin/src/main/java/org/antlr/mojo/antlr5/Antlr5Mojo.java b/antlr5-maven-plugin/src/main/java/org/antlr/mojo/antlr5/Antlr5Mojo.java
@@ -8,7 +8,7 @@
 
 import org.antlr.v5.Tool;
 import org.antlr.v5.codegen.CodeGenerator;
-import org.antlr.v5.runtime._unused.misc.MultiMap;
+import org.antlr.v5.runtime.java._unused.misc.MultiMap;
 import org.antlr.v5.tool.Grammar;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;

diff --git a/runtime-testsuite/test/org/antlr/v5/test/runtime/java/JavaRunner.java b/runtime-testsuite/test/org/antlr/v5/test/runtime/java/JavaRunner.java
@@ -5,7 +5,6 @@
  */
 package org.antlr.v5.test.runtime.java;
 
-import org.antlr.v5.runtime.*;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.Lexer;
 import org.antlr.v5.runtime.core.Parser;
@@ -14,7 +13,8 @@
 import org.antlr.v5.runtime.core.atn.ProfilingATNSimulator;
 import org.antlr.v5.runtime.core.context.ParserRuleContext;
 import org.antlr.v5.runtime.core.tree.ParseTree;
-import org.antlr.v5.runtime.tree.ParseTreeWalker;
+import org.antlr.v5.runtime.java.DiagnosticErrorListener;
+import org.antlr.v5.runtime.java.tree.ParseTreeWalker;
 import org.antlr.v5.test.runtime.*;
 import org.antlr.v5.test.runtime.java.helpers.CustomStreamErrorListener;
 import org.antlr.v5.test.runtime.java.helpers.RuntimeTestLexer;

diff --git a/runtime-testsuite/test/org/antlr/v5/test/runtime/java/TestCharStreams.java b/runtime-testsuite/test/org/antlr/v5/test/runtime/java/TestCharStreams.java
@@ -7,7 +7,7 @@
 package org.antlr.v5.test.runtime.java;
 
 import org.antlr.v5.runtime.core.CharStream;
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 

diff --git a/runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestTokenStream.java b/runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestTokenStream.java
@@ -5,7 +5,7 @@
  */
 package org.antlr.v5.test.runtime.java.api;
 
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.antlr.v5.runtime.core.*;
 import org.junit.jupiter.api.Test;
 

diff --git a/runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestTokenStreamRewriter.java b/runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestTokenStreamRewriter.java
@@ -5,10 +5,11 @@
  */
 package org.antlr.v5.test.runtime.java.api;
 
-import org.antlr.v5.runtime.*;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.LexerInterpreter;
 import org.antlr.v5.runtime.core.misc.Interval;
+import org.antlr.v5.runtime.java.CharStreams;
+import org.antlr.v5.runtime.java.TokenStreamRewriter;
 import org.antlr.v5.tool.LexerGrammar;
 import org.junit.jupiter.api.Test;
 

diff --git a/runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestVisitors.java b/runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/TestVisitors.java
@@ -5,14 +5,15 @@
  */
 package org.antlr.v5.test.runtime.java.api;
 
-import org.antlr.v5.runtime.BaseErrorListener;
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.BaseErrorListener;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.Recognizer;
 import org.antlr.v5.runtime.core.error.RecognitionException;
 import org.antlr.v5.runtime.core.tree.ErrorNode;
 import org.antlr.v5.runtime.core.tree.RuleNode;
 import org.antlr.v5.runtime.core.tree.TerminalNode;
+import org.antlr.v5.runtime.java.tree.AbstractParseTreeVisitor;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -108,7 +109,7 @@ protected String aggregateResult(String aggregate, String nextResult) {
 	/**
 	 * This test verifies that {@link AbstractParseTreeVisitor#visitChildren} does not call
 	 * {@link org.antlr.v5.runtime.tree.ParseTreeVisitor#visit} after
-	 * {@link org.antlr.v5.runtime.tree.AbstractParseTreeVisitor#shouldVisitNextChild} returns
+	 * {@link AbstractParseTreeVisitor#shouldVisitNextChild} returns
 	 * {@code false}.
 	 */
 	@Test

diff --git a/runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/perf/TimeLexerSpeed.java b/runtime-testsuite/test/org/antlr/v5/test/runtime/java/api/perf/TimeLexerSpeed.java
@@ -6,7 +6,7 @@
 
 package org.antlr.v5.test.runtime.java.api.perf;
 
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.Lexer;

diff --git a/runtime-testsuite/test/org/antlr/v5/test/runtime/java/helpers/CustomStreamErrorListener.java b/runtime-testsuite/test/org/antlr/v5/test/runtime/java/helpers/CustomStreamErrorListener.java
@@ -1,6 +1,6 @@
 package org.antlr.v5.test.runtime.java.helpers;
 
-import org.antlr.v5.runtime.BaseErrorListener;
+import org.antlr.v5.runtime.java.BaseErrorListener;
 import org.antlr.v5.runtime.core.error.RecognitionException;
 import org.antlr.v5.runtime.core.Recognizer;
 

diff --git a/runtime-testsuite/test/org/antlr/v5/test/runtime/states/jvm/JavaCompiledState.java b/runtime-testsuite/test/org/antlr/v5/test/runtime/states/jvm/JavaCompiledState.java
@@ -1,7 +1,7 @@
 package org.antlr.v5.test.runtime.states.jvm;
 
 import kotlin.Pair;
-import org.antlr.v5.runtime.CharStreams;
+import org.antlr.v5.runtime.java.CharStreams;
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.TokenStream;
 import org.antlr.v5.runtime.core.CommonTokenStream;

diff --git a/...g/antlr/v5/runtime/BailErrorStrategy.java → ...lr/v5/runtime/java/BailErrorStrategy.java b/...g/antlr/v5/runtime/BailErrorStrategy.java → ...lr/v5/runtime/java/BailErrorStrategy.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.Parser;
 import org.antlr.v5.runtime.core.Token;

diff --git a/...g/antlr/v5/runtime/BaseErrorListener.java → ...lr/v5/runtime/java/BaseErrorListener.java b/...g/antlr/v5/runtime/BaseErrorListener.java → ...lr/v5/runtime/java/BaseErrorListener.java
@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.atn.ATNConfigSet;
 import org.antlr.v5.runtime.core.Parser;

diff --git a/...ava/org/antlr/v5/runtime/CharStreams.java → ...rg/antlr/v5/runtime/java/CharStreams.java b/...ava/org/antlr/v5/runtime/CharStreams.java → ...rg/antlr/v5/runtime/java/CharStreams.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.IntStream;

diff --git a/...org/antlr/v5/runtime/CodePointBuffer.java → ...ntlr/v5/runtime/java/CodePointBuffer.java b/...org/antlr/v5/runtime/CodePointBuffer.java → ...ntlr/v5/runtime/java/CodePointBuffer.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

diff --git a/...antlr/v5/runtime/CodePointCharStream.java → .../v5/runtime/java/CodePointCharStream.java b/...antlr/v5/runtime/CodePointCharStream.java → .../v5/runtime/java/CodePointCharStream.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.IntStream;
 import org.antlr.v5.runtime.core.CharStream;

diff --git a/...ntlr/v5/runtime/ConsoleErrorListener.java → ...v5/runtime/java/ConsoleErrorListener.java b/...ntlr/v5/runtime/ConsoleErrorListener.java → ...v5/runtime/java/ConsoleErrorListener.java
@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.Recognizer;
 import org.antlr.v5.runtime.core.error.RecognitionException;

diff --git a/...r/v5/runtime/DiagnosticErrorListener.java → ...runtime/java/DiagnosticErrorListener.java b/...r/v5/runtime/DiagnosticErrorListener.java → ...runtime/java/DiagnosticErrorListener.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.Parser;
 import org.antlr.v5.runtime.core.atn.ATNConfig;

diff --git a/...org/antlr/v5/runtime/ListTokenSource.java → ...ntlr/v5/runtime/java/ListTokenSource.java b/...org/antlr/v5/runtime/ListTokenSource.java → ...ntlr/v5/runtime/java/ListTokenSource.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import kotlin.Pair;
 import org.antlr.v5.runtime.core.*;

diff --git a/...antlr/v5/runtime/TokenStreamRewriter.java → .../v5/runtime/java/TokenStreamRewriter.java b/...antlr/v5/runtime/TokenStreamRewriter.java → .../v5/runtime/java/TokenStreamRewriter.java
@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.runtime;
+package org.antlr.v5.runtime.java;
 
 import org.antlr.v5.runtime.core.Token;
 import org.antlr.v5.runtime.core.TokenStream;

diff --git a/...tlr/v5/runtime/_unused/misc/MultiMap.java → ...5/runtime/java/_unused/misc/MultiMap.java b/...tlr/v5/runtime/_unused/misc/MultiMap.java → ...5/runtime/java/_unused/misc/MultiMap.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.misc;
+package org.antlr.v5.runtime.java._unused.misc;
 
 import kotlin.Pair;
 

diff --git a/...5/runtime/_unused/tree/pattern/Chunk.java → ...time/java/_unused/tree/pattern/Chunk.java b/...5/runtime/_unused/tree/pattern/Chunk.java → ...time/java/_unused/tree/pattern/Chunk.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 /**
  * A chunk is either a token tag, a rule tag, or a span of literal text within a

diff --git a/.../_unused/tree/pattern/ParseTreeMatch.java → .../_unused/tree/pattern/ParseTreeMatch.java b/.../_unused/tree/pattern/ParseTreeMatch.java → .../_unused/tree/pattern/ParseTreeMatch.java
@@ -4,9 +4,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
-import org.antlr.v5.runtime._unused.misc.MultiMap;
+import org.antlr.v5.runtime.java._unused.misc.MultiMap;
 import org.antlr.v5.runtime.core.tree.ParseTree;
 
 import java.util.Collections;

diff --git a/...unused/tree/pattern/ParseTreePattern.java → ...unused/tree/pattern/ParseTreePattern.java b/...unused/tree/pattern/ParseTreePattern.java → ...unused/tree/pattern/ParseTreePattern.java
@@ -4,9 +4,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
-import org.antlr.v5.runtime._unused.tree.xpath.XPath;
+import org.antlr.v5.runtime.java._unused.tree.xpath.XPath;
 import org.antlr.v5.runtime.core.tree.ParseTree;
 
 import java.util.ArrayList;

diff --git a/...ree/pattern/ParseTreePatternCompiler.java → ...ree/pattern/ParseTreePatternCompiler.java b/...ree/pattern/ParseTreePatternCompiler.java → ...ree/pattern/ParseTreePatternCompiler.java
@@ -1,4 +1,4 @@
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 import org.antlr.v5.runtime.core.Lexer;
 import org.antlr.v5.runtime.core.Parser;

diff --git a/...tree/pattern/ParseTreePatternMatcher.java → ...tree/pattern/ParseTreePatternMatcher.java b/...tree/pattern/ParseTreePatternMatcher.java → ...tree/pattern/ParseTreePatternMatcher.java
@@ -4,12 +4,12 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
-import org.antlr.v5.runtime.BailErrorStrategy;
-import org.antlr.v5.runtime.CharStreams;
-import org.antlr.v5.runtime.ListTokenSource;
-import org.antlr.v5.runtime._unused.misc.MultiMap;
+import org.antlr.v5.runtime.java.BailErrorStrategy;
+import org.antlr.v5.runtime.java.CharStreams;
+import org.antlr.v5.runtime.java.ListTokenSource;
+import org.antlr.v5.runtime.java._unused.misc.MultiMap;
 import org.antlr.v5.runtime.core.*;
 import org.antlr.v5.runtime.core.atn.ATN;
 import org.antlr.v5.runtime.core.context.ParserRuleContext;

diff --git a/...me/_unused/tree/pattern/RuleTagToken.java → ...va/_unused/tree/pattern/RuleTagToken.java b/...me/_unused/tree/pattern/RuleTagToken.java → ...va/_unused/tree/pattern/RuleTagToken.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.Token;

diff --git a/...untime/_unused/tree/pattern/TagChunk.java → ...e/java/_unused/tree/pattern/TagChunk.java b/...untime/_unused/tree/pattern/TagChunk.java → ...e/java/_unused/tree/pattern/TagChunk.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 /**
  * Represents a placeholder tag in a tree pattern. A tag can have any of the

diff --git a/...ntime/_unused/tree/pattern/TextChunk.java → .../java/_unused/tree/pattern/TextChunk.java b/...ntime/_unused/tree/pattern/TextChunk.java → .../java/_unused/tree/pattern/TextChunk.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 /**
  * Represents a span of raw text (concrete syntax) between tags in a tree

diff --git a/...e/_unused/tree/pattern/TokenTagToken.java → ...a/_unused/tree/pattern/TokenTagToken.java b/...e/_unused/tree/pattern/TokenTagToken.java → ...a/_unused/tree/pattern/TokenTagToken.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.pattern;
+package org.antlr.v5.runtime.java._unused.tree.pattern;
 
 import org.antlr.v5.runtime.core.Token;
 import org.antlr.v5.runtime.core.CommonToken;

diff --git a/.../v5/runtime/_unused/tree/xpath/XPath.java → ...untime/java/_unused/tree/xpath/XPath.java b/.../v5/runtime/_unused/tree/xpath/XPath.java → ...untime/java/_unused/tree/xpath/XPath.java
@@ -4,16 +4,16 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
-import org.antlr.v5.runtime.*;
 import org.antlr.v5.runtime.core.CommonTokenStream;
 import org.antlr.v5.runtime.core.Token;
 import org.antlr.v5.runtime.core.context.ParserRuleContext;
 import org.antlr.v5.runtime.core.error.*;
 import org.antlr.v5.runtime.core.CharStream;
 import org.antlr.v5.runtime.core.Parser;
 import org.antlr.v5.runtime.core.tree.ParseTree;
+import org.antlr.v5.runtime.java.CharStreams;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...time/_unused/tree/xpath/XPathElement.java → ...java/_unused/tree/xpath/XPathElement.java b/...time/_unused/tree/xpath/XPathElement.java → ...java/_unused/tree/xpath/XPathElement.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 

diff --git a/...untime/_unused/tree/xpath/XPathLexer.java → ...e/java/_unused/tree/xpath/XPathLexer.java b/...untime/_unused/tree/xpath/XPathLexer.java → ...e/java/_unused/tree/xpath/XPathLexer.java
@@ -3,7 +3,7 @@
  * Use of this file is governed by the BSD 3-clause license that
  * can be found in the LICENSE.txt file in the project root.
  */
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.*;
 import org.antlr.v5.runtime.core.atn.LexerATNSimulator;

diff --git a/...d/tree/xpath/XPathLexerErrorListener.java → ...d/tree/xpath/XPathLexerErrorListener.java b/...d/tree/xpath/XPathLexerErrorListener.java → ...d/tree/xpath/XPathLexerErrorListener.java
@@ -4,9 +4,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
-import org.antlr.v5.runtime.BaseErrorListener;
+import org.antlr.v5.runtime.java.BaseErrorListener;
 import org.antlr.v5.runtime.core.error.RecognitionException;
 import org.antlr.v5.runtime.core.Recognizer;
 

diff --git a/.../tree/xpath/XPathRuleAnywhereElement.java → .../tree/xpath/XPathRuleAnywhereElement.java b/.../tree/xpath/XPathRuleAnywhereElement.java → .../tree/xpath/XPathRuleAnywhereElement.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.Trees;

diff --git a/.../_unused/tree/xpath/XPathRuleElement.java → .../_unused/tree/xpath/XPathRuleElement.java b/.../_unused/tree/xpath/XPathRuleElement.java → .../_unused/tree/xpath/XPathRuleElement.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.context.ParserRuleContext;
 import org.antlr.v5.runtime.core.tree.ParseTree;

diff --git a/...tree/xpath/XPathTokenAnywhereElement.java → ...tree/xpath/XPathTokenAnywhereElement.java b/...tree/xpath/XPathTokenAnywhereElement.java → ...tree/xpath/XPathTokenAnywhereElement.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.Trees;

diff --git a/..._unused/tree/xpath/XPathTokenElement.java → ..._unused/tree/xpath/XPathTokenElement.java b/..._unused/tree/xpath/XPathTokenElement.java → ..._unused/tree/xpath/XPathTokenElement.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.TerminalNode;

diff --git a/...e/xpath/XPathWildcardAnywhereElement.java → ...e/xpath/XPathWildcardAnywhereElement.java b/...e/xpath/XPathWildcardAnywhereElement.java → ...e/xpath/XPathWildcardAnywhereElement.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.Trees;

diff --git a/...used/tree/xpath/XPathWildcardElement.java → ...used/tree/xpath/XPathWildcardElement.java b/...used/tree/xpath/XPathWildcardElement.java → ...used/tree/xpath/XPathWildcardElement.java
@@ -4,7 +4,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
-package org.antlr.v5.runtime._unused.tree.xpath;
+package org.antlr.v5.runtime.java._unused.tree.xpath;
 
 import org.antlr.v5.runtime.core.tree.ParseTree;
 import org.antlr.v5.runtime.core.tree.Tree;