From d53bfa2012fd935fcb4e5687cd1d7534a4d6b4ae Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Sat, 11 Feb 2023 20:55:48 +0530 Subject: [PATCH] refactor: rename package 'javax' to 'jdkx' --- make/langtools/netbeans/nb-javac/build.xml | 6 +- .../source/tree/CompilationUnitTreeTest.java | 8 +- .../test/com/sun/source/tree/TreeTest.java | 8 +- .../test/com/sun/source/util/TreesTest.java | 14 +- .../com/sun/tools/javac/code/LintTest.java | 12 +- .../com/sun/tools/javac/code/TypesTest.java | 14 +- .../sun/tools/javac/comp/AnnotateTest.java | 8 +- .../com/sun/tools/javac/comp/AttrTest.java | 32 ++-- .../com/sun/tools/javac/comp/CheckTest.java | 18 +- .../com/sun/tools/javac/comp/FlowTest.java | 12 +- .../com/sun/tools/javac/comp/LowerTest.java | 18 +- .../sun/tools/javac/comp/MemberEnterTest.java | 10 +- .../sun/tools/javac/jvm/ClassReaderTest.java | 22 +-- .../javac/parser/DocCommentParserTest.java | 8 +- .../tools/javac/parser/JavacParserTest.java | 16 +- .../nb-javac/test/global/AP208917Test.java | 26 +-- .../test/global/AnnotationProcessingTest.java | 16 +- .../test/global/DuplicateClassTest.java | 10 +- .../test/global/ErrorToleranceTest.java | 12 +- .../MethodInvocationAttributionTest.java | 12 +- .../nb-javac/test/global/PackageInfoTest.java | 22 +-- .../nb-javac/test/global/ScopeTest.java | 20 +- .../nb-javac/test/global/Test116436.java | 8 +- .../nb-javac/test/global/Test122900.java | 8 +- .../nb-javac/test/global/Test144555.java | 8 +- .../global/TestAnnotationPackageInfo.java | 12 +- .../TestNPEFromSymbolHasOutterInstances.java | 8 +- .../netbeans/nb-javac/test/global/ap1/AP.java | 16 +- .../test/global/ap1/ClassBasedAP.java | 16 +- .../test/global/ap1/ErrorProducingAP.java | 14 +- .../propertiesparser/parser/MessageType.java | 6 +- .../config/JavacConfigProvider.java | 2 +- .../processing/AbstractProcessor.java | 10 +- .../annotation/processing/Completion.java | 2 +- .../annotation/processing/Completions.java | 2 +- .../annotation/processing/Filer.java | 16 +- .../annotation/processing/FilerException.java | 2 +- .../annotation/processing/Generated.java | 2 +- .../annotation/processing/Messager.java | 8 +- .../processing/ProcessingEnvironment.java | 8 +- .../annotation/processing/Processor.java | 30 +-- .../processing/RoundEnvironment.java | 14 +- .../processing/SupportedAnnotationTypes.java | 2 +- .../processing/SupportedOptions.java | 2 +- .../processing/SupportedSourceVersion.java | 4 +- .../annotation/processing/package-info.java | 2 +- .../lang/model/AnnotatedConstruct.java | 14 +- .../lang/model/SourceVersion.java | 2 +- .../lang/model/UnknownEntityException.java | 8 +- .../lang/model/element/AnnotationMirror.java | 6 +- .../lang/model/element/AnnotationValue.java | 2 +- .../model/element/AnnotationValueVisitor.java | 12 +- .../lang/model/element/Element.java | 8 +- .../lang/model/element/ElementKind.java | 2 +- .../lang/model/element/ElementVisitor.java | 10 +- .../lang/model/element/ExecutableElement.java | 8 +- .../lang/model/element/Modifier.java | 2 +- .../lang/model/element/ModuleElement.java | 12 +- .../lang/model/element/Name.java | 12 +- .../lang/model/element/NestingKind.java | 6 +- .../lang/model/element/PackageElement.java | 14 +- .../lang/model/element/Parameterizable.java | 2 +- .../lang/model/element/QualifiedNameable.java | 2 +- .../model/element/RecordComponentElement.java | 2 +- .../lang/model/element/TypeElement.java | 8 +- .../model/element/TypeParameterElement.java | 6 +- .../UnknownAnnotationValueException.java | 4 +- .../element/UnknownDirectiveException.java | 4 +- .../element/UnknownElementException.java | 4 +- .../lang/model/element/VariableElement.java | 8 +- .../lang/model/element/package-info.java | 14 +- .../lang/model/package-info.java | 8 +- .../lang/model/type/ArrayType.java | 2 +- .../lang/model/type/DeclaredType.java | 8 +- .../lang/model/type/ErrorType.java | 2 +- .../lang/model/type/ExecutableType.java | 8 +- .../lang/model/type/IntersectionType.java | 2 +- .../model/type/MirroredTypeException.java | 4 +- .../model/type/MirroredTypesException.java | 4 +- .../lang/model/type/NoType.java | 4 +- .../lang/model/type/NullType.java | 2 +- .../lang/model/type/PrimitiveType.java | 2 +- .../lang/model/type/ReferenceType.java | 2 +- .../lang/model/type/TypeKind.java | 2 +- .../lang/model/type/TypeMirror.java | 8 +- .../lang/model/type/TypeVariable.java | 8 +- .../lang/model/type/TypeVisitor.java | 12 +- .../lang/model/type/UnionType.java | 2 +- .../lang/model/type/UnknownTypeException.java | 4 +- .../lang/model/type/WildcardType.java | 2 +- .../lang/model/type/package-info.java | 4 +- .../AbstractAnnotationValueVisitor14.java | 8 +- .../util/AbstractAnnotationValueVisitor6.java | 10 +- .../util/AbstractAnnotationValueVisitor7.java | 8 +- .../util/AbstractAnnotationValueVisitor8.java | 8 +- .../util/AbstractAnnotationValueVisitor9.java | 8 +- .../model/util/AbstractElementVisitor14.java | 10 +- .../model/util/AbstractElementVisitor6.java | 10 +- .../model/util/AbstractElementVisitor7.java | 8 +- .../model/util/AbstractElementVisitor8.java | 8 +- .../model/util/AbstractElementVisitor9.java | 10 +- .../model/util/AbstractTypeVisitor14.java | 8 +- .../lang/model/util/AbstractTypeVisitor6.java | 10 +- .../lang/model/util/AbstractTypeVisitor7.java | 10 +- .../lang/model/util/AbstractTypeVisitor8.java | 10 +- .../lang/model/util/AbstractTypeVisitor9.java | 10 +- .../lang/model/util/ElementFilter.java | 18 +- .../lang/model/util/ElementKindVisitor14.java | 10 +- .../lang/model/util/ElementKindVisitor6.java | 12 +- .../lang/model/util/ElementKindVisitor7.java | 10 +- .../lang/model/util/ElementKindVisitor8.java | 10 +- .../lang/model/util/ElementKindVisitor9.java | 10 +- .../lang/model/util/ElementScanner14.java | 10 +- .../lang/model/util/ElementScanner6.java | 10 +- .../lang/model/util/ElementScanner7.java | 10 +- .../lang/model/util/ElementScanner8.java | 10 +- .../lang/model/util/ElementScanner9.java | 10 +- .../lang/model/util/Elements.java | 16 +- .../util/SimpleAnnotationValueVisitor14.java | 8 +- .../util/SimpleAnnotationValueVisitor6.java | 12 +- .../util/SimpleAnnotationValueVisitor7.java | 8 +- .../util/SimpleAnnotationValueVisitor8.java | 8 +- .../util/SimpleAnnotationValueVisitor9.java | 8 +- .../model/util/SimpleElementVisitor14.java | 10 +- .../model/util/SimpleElementVisitor6.java | 10 +- .../model/util/SimpleElementVisitor7.java | 10 +- .../model/util/SimpleElementVisitor8.java | 8 +- .../model/util/SimpleElementVisitor9.java | 10 +- .../lang/model/util/SimpleTypeVisitor14.java | 8 +- .../lang/model/util/SimpleTypeVisitor6.java | 10 +- .../lang/model/util/SimpleTypeVisitor7.java | 10 +- .../lang/model/util/SimpleTypeVisitor8.java | 10 +- .../lang/model/util/SimpleTypeVisitor9.java | 10 +- .../lang/model/util/TypeKindVisitor14.java | 10 +- .../lang/model/util/TypeKindVisitor6.java | 10 +- .../lang/model/util/TypeKindVisitor7.java | 10 +- .../lang/model/util/TypeKindVisitor8.java | 10 +- .../lang/model/util/TypeKindVisitor9.java | 10 +- .../lang/model/util/Types.java | 8 +- .../lang/model/util/package-info.java | 6 +- .../{javax => jdkx}/tools/Diagnostic.java | 2 +- .../tools/DiagnosticCollector.java | 2 +- .../tools/DiagnosticListener.java | 2 +- .../tools/DocumentationTool.java | 2 +- .../{javax => jdkx}/tools/FileObject.java | 2 +- .../tools/ForwardingFileObject.java | 2 +- .../tools/ForwardingJavaFileManager.java | 4 +- .../tools/ForwardingJavaFileObject.java | 6 +- .../{javax => jdkx}/tools/JavaCompiler.java | 8 +- .../tools/JavaFileManager.java | 4 +- .../{javax => jdkx}/tools/JavaFileObject.java | 6 +- .../{javax => jdkx}/tools/OptionChecker.java | 2 +- .../tools/SimpleJavaFileObject.java | 6 +- .../tools/StandardJavaFileManager.java | 2 +- .../tools/StandardLocation.java | 4 +- .../classes/{javax => jdkx}/tools/Tool.java | 4 +- .../{javax => jdkx}/tools/ToolProvider.java | 2 +- .../{javax => jdkx}/tools/package-info.java | 14 +- .../share/classes/module-info.java | 16 +- .../shellsupport/doc/JavadocFormatter.java | 8 +- .../shellsupport/doc/JavadocHelper.java | 40 ++-- .../share/classes/module-info.java | 22 +-- .../openjdk/source/doctree/AttributeTree.java | 2 +- .../source/doctree/EndElementTree.java | 2 +- .../openjdk/source/doctree/EntityTree.java | 2 +- .../openjdk/source/doctree/ErroneousTree.java | 4 +- .../source/doctree/IdentifierTree.java | 2 +- .../source/doctree/StartElementTree.java | 2 +- .../source/doctree/SystemPropertyTree.java | 2 +- .../openjdk/source/tree/BreakTree.java | 2 +- .../openjdk/source/tree/ClassTree.java | 2 +- .../source/tree/CompilationUnitTree.java | 2 +- .../openjdk/source/tree/ContinueTree.java | 2 +- .../openjdk/source/tree/IdentifierTree.java | 2 +- .../source/tree/LabeledStatementTree.java | 2 +- .../source/tree/MemberReferenceTree.java | 2 +- .../openjdk/source/tree/MemberSelectTree.java | 2 +- .../openjdk/source/tree/MethodTree.java | 2 +- .../openjdk/source/tree/ModifiersTree.java | 2 +- .../source/tree/PrimitiveTypeTree.java | 2 +- .../classes/openjdk/source/tree/Scope.java | 6 +- .../source/tree/TypeParameterTree.java | 2 +- .../openjdk/source/tree/VariableTree.java | 2 +- .../source/util/DocSourcePositions.java | 4 +- .../openjdk/source/util/DocTreeFactory.java | 8 +- .../classes/openjdk/source/util/DocTrees.java | 14 +- .../openjdk/source/util/JavacTask.java | 16 +- .../source/util/ParameterNameProvider.java | 2 +- .../classes/openjdk/source/util/Plugin.java | 2 +- .../openjdk/source/util/SourcePositions.java | 4 +- .../openjdk/source/util/TaskEvent.java | 4 +- .../classes/openjdk/source/util/Trees.java | 22 +-- .../openjdk/tools/doclint/Checker.java | 18 +- .../classes/openjdk/tools/doclint/Env.java | 16 +- .../openjdk/tools/doclint/HtmlTag.java | 2 +- .../openjdk/tools/doclint/Messages.java | 2 +- .../tools/javac/api/BasicJavacTask.java | 12 +- .../javac/api/ClassNamesForFileOraculum.java | 2 +- .../tools/javac/api/ClientCodeWrapper.java | 18 +- .../tools/javac/api/DiagnosticFormatter.java | 2 +- .../javac/api/DuplicateClassChecker.java | 4 +- .../openjdk/tools/javac/api/JavacScope.java | 6 +- .../tools/javac/api/JavacTaskImpl.java | 12 +- .../tools/javac/api/JavacTaskPool.java | 12 +- .../openjdk/tools/javac/api/JavacTool.java | 8 +- .../openjdk/tools/javac/api/JavacTrees.java | 44 ++--- .../javac/api/WrappingJavaFileManager.java | 6 +- .../tools/javac/code/AnnoConstruct.java | 8 +- .../openjdk/tools/javac/code/Attribute.java | 8 +- .../openjdk/tools/javac/code/ClassFinder.java | 18 +- .../openjdk/tools/javac/code/Directive.java | 4 +- .../openjdk/tools/javac/code/Flags.java | 2 +- .../tools/javac/code/ModuleFinder.java | 10 +- .../openjdk/tools/javac/code/Preview.java | 2 +- .../openjdk/tools/javac/code/Source.java | 4 +- .../openjdk/tools/javac/code/Symbol.java | 32 ++-- .../openjdk/tools/javac/code/Symtab.java | 2 +- .../openjdk/tools/javac/code/Type.java | 12 +- .../tools/javac/code/TypeAnnotations.java | 8 +- .../openjdk/tools/javac/code/TypeTag.java | 2 +- .../openjdk/tools/javac/code/Types.java | 2 +- .../openjdk/tools/javac/comp/Annotate.java | 2 +- .../openjdk/tools/javac/comp/Attr.java | 4 +- .../openjdk/tools/javac/comp/Check.java | 8 +- .../openjdk/tools/javac/comp/Enter.java | 12 +- .../tools/javac/comp/LambdaToMethod.java | 4 +- .../openjdk/tools/javac/comp/MemberEnter.java | 4 +- .../openjdk/tools/javac/comp/Modules.java | 12 +- .../openjdk/tools/javac/comp/Repair.java | 4 +- .../openjdk/tools/javac/comp/Resolve.java | 2 +- .../openjdk/tools/javac/comp/Todo.java | 2 +- .../openjdk/tools/javac/comp/TypeEnter.java | 2 +- .../tools/javac/file/BaseFileManager.java | 10 +- .../openjdk/tools/javac/file/JRTIndex.java | 2 +- .../tools/javac/file/JavacFileManager.java | 14 +- .../openjdk/tools/javac/file/Locations.java | 18 +- .../tools/javac/file/PathFileObject.java | 8 +- .../tools/javac/file/RelativePath.java | 2 +- .../openjdk/tools/javac/jvm/ClassReader.java | 8 +- .../openjdk/tools/javac/jvm/ClassWriter.java | 10 +- .../classes/openjdk/tools/javac/jvm/Gen.java | 4 +- .../openjdk/tools/javac/jvm/JNIWriter.java | 8 +- .../tools/javac/jvm/ModuleNameReader.java | 2 +- .../openjdk/tools/javac/launcher/Main.java | 22 +-- .../openjdk/tools/javac/main/Arguments.java | 14 +- .../javac/main/DelegatingJavaFileManager.java | 12 +- .../tools/javac/main/JavaCompiler.java | 18 +- .../openjdk/tools/javac/main/Main.java | 2 +- .../openjdk/tools/javac/main/Option.java | 2 +- .../javac/model/AnnotationProxyMaker.java | 6 +- .../tools/javac/model/JavacElements.java | 12 +- .../openjdk/tools/javac/model/JavacTypes.java | 6 +- .../javac/platform/JDKPlatformProvider.java | 16 +- .../javac/platform/PlatformDescription.java | 4 +- .../tools/javac/processing/JavacFiler.java | 22 +-- .../tools/javac/processing/JavacMessager.java | 8 +- .../JavacProcessingEnvironment.java | 20 +- .../processing/JavacRoundEnvironment.java | 6 +- .../javac/processing/PrintingProcessor.java | 16 +- .../tools/javac/resources/compiler.properties | 6 +- .../javac/resources/compiler_ja.properties | 6 +- .../javac/resources/compiler_zh_CN.properties | 6 +- .../tools/javac/resources/ct.properties | 120 ++++++------ .../tools/javac/resources/legacy.properties | 174 +++++++++--------- .../openjdk/tools/javac/tree/DCTree.java | 6 +- .../tools/javac/tree/DocTreeMaker.java | 6 +- .../openjdk/tools/javac/tree/JCTree.java | 8 +- .../openjdk/tools/javac/tree/TreeInfo.java | 2 +- .../util/AbstractDiagnosticFormatter.java | 2 +- .../openjdk/tools/javac/util/AbstractLog.java | 2 +- .../javac/util/BasicDiagnosticFormatter.java | 2 +- .../tools/javac/util/CouplingAbort.java | 2 +- .../openjdk/tools/javac/util/DefinedBy.java | 6 +- .../tools/javac/util/Dependencies.java | 2 +- .../tools/javac/util/DiagnosticSource.java | 2 +- .../util/ForwardingDiagnosticFormatter.java | 2 +- .../tools/javac/util/JCDiagnostic.java | 6 +- .../classes/openjdk/tools/javac/util/Log.java | 6 +- .../javac/util/MandatoryWarningHandler.java | 2 +- .../tools/javac/util/MatchingUtils.java | 2 +- .../openjdk/tools/javac/util/Name.java | 2 +- .../javac/util/RawDiagnosticFormatter.java | 2 +- .../openjdk/tools/sjavac/PubApiExtractor.java | 4 +- .../tools/sjavac/comp/CompilationService.java | 8 +- .../sjavac/comp/FileObjectWithLocation.java | 6 +- .../comp/JavaFileObjectWithLocation.java | 6 +- .../sjavac/comp/PathAndPackageVerifier.java | 2 +- .../openjdk/tools/sjavac/comp/PubAPIs.java | 4 +- .../tools/sjavac/comp/PubapiVisitor.java | 8 +- .../openjdk/tools/sjavac/comp/SjavacImpl.java | 2 +- .../tools/sjavac/comp/SmartFileManager.java | 4 +- .../tools/sjavac/comp/SmartFileObject.java | 6 +- .../tools/sjavac/comp/SmartWriter.java | 2 +- .../dependencies/NewDependencyCollector.java | 6 +- .../comp/dependencies/PublicApiCollector.java | 2 +- .../tools/sjavac/pubapi/ArrayTypeDesc.java | 2 +- .../sjavac/pubapi/PrimitiveTypeDesc.java | 2 +- .../openjdk/tools/sjavac/pubapi/PubApi.java | 2 +- .../tools/sjavac/pubapi/PubMethod.java | 2 +- .../openjdk/tools/sjavac/pubapi/PubType.java | 2 +- .../openjdk/tools/sjavac/pubapi/PubVar.java | 2 +- .../sjavac/pubapi/ReferenceTypeDesc.java | 2 +- .../openjdk/tools/sjavac/pubapi/TypeDesc.java | 20 +- .../tools/sjavac/pubapi/TypeVarTypeDesc.java | 2 +- src/jdk.compiler/share/man/javac.1 | 14 +- .../openjdk/tools/javap/DisassemblerTool.java | 20 +- .../openjdk/tools/javap/JavapFileManager.java | 4 +- .../openjdk/tools/javap/JavapTask.java | 18 +- .../openjdk/tools/javap/SourceWriter.java | 8 +- .../openjdk/tools/jdeprscan/DeprDB.java | 2 +- .../openjdk/tools/jdeprscan/DeprData.java | 4 +- .../openjdk/tools/jdeprscan/LoadProc.java | 38 ++-- .../classes/openjdk/tools/jdeprscan/Main.java | 22 +-- .../openjdk/tools/jdeprscan/TraverseProc.java | 32 ++-- .../openjdk/tools/jdeprscan/internals.md | 4 +- .../jdeps/resources/jdkinternals.properties | 18 +- src/jdk.jdeps/share/man/javap.1 | 10 +- src/jdk.jdeps/share/man/jdeps.1 | 24 +-- 318 files changed, 1421 insertions(+), 1421 deletions(-) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/AbstractProcessor.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/Completion.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/Completions.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/Filer.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/FilerException.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/Generated.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/Messager.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/ProcessingEnvironment.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/Processor.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/RoundEnvironment.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/SupportedAnnotationTypes.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/SupportedOptions.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/SupportedSourceVersion.java (96%) rename src/java.compiler/share/classes/{javax => jdkx}/annotation/processing/package-info.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/AnnotatedConstruct.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/SourceVersion.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/UnknownEntityException.java (90%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/AnnotationMirror.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/AnnotationValue.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/AnnotationValueVisitor.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/Element.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/ElementKind.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/ElementVisitor.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/ExecutableElement.java (96%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/Modifier.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/ModuleElement.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/Name.java (90%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/NestingKind.java (96%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/PackageElement.java (91%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/Parameterizable.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/QualifiedNameable.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/RecordComponentElement.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/TypeElement.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/TypeParameterElement.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/UnknownAnnotationValueException.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/UnknownDirectiveException.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/UnknownElementException.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/VariableElement.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/element/package-info.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/package-info.java (91%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/ArrayType.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/DeclaredType.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/ErrorType.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/ExecutableType.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/IntersectionType.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/MirroredTypeException.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/MirroredTypesException.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/NoType.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/NullType.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/PrimitiveType.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/ReferenceType.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/TypeKind.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/TypeMirror.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/TypeVariable.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/TypeVisitor.java (96%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/UnionType.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/UnknownTypeException.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/WildcardType.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/type/package-info.java (96%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractAnnotationValueVisitor14.java (92%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractAnnotationValueVisitor6.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractAnnotationValueVisitor7.java (92%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractAnnotationValueVisitor8.java (92%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractAnnotationValueVisitor9.java (92%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractElementVisitor14.java (91%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractElementVisitor6.java (96%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractElementVisitor7.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractElementVisitor8.java (92%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractElementVisitor9.java (91%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractTypeVisitor14.java (92%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractTypeVisitor6.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractTypeVisitor7.java (91%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractTypeVisitor8.java (91%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/AbstractTypeVisitor9.java (91%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementFilter.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementKindVisitor14.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementKindVisitor6.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementKindVisitor7.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementKindVisitor8.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementKindVisitor9.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementScanner14.java (96%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementScanner6.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementScanner7.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementScanner8.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/ElementScanner9.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/Elements.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleAnnotationValueVisitor14.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleAnnotationValueVisitor6.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleAnnotationValueVisitor7.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleAnnotationValueVisitor8.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleAnnotationValueVisitor9.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleElementVisitor14.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleElementVisitor6.java (96%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleElementVisitor7.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleElementVisitor8.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleElementVisitor9.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleTypeVisitor14.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleTypeVisitor6.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleTypeVisitor7.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleTypeVisitor8.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/SimpleTypeVisitor9.java (92%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/TypeKindVisitor14.java (93%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/TypeKindVisitor6.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/TypeKindVisitor7.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/TypeKindVisitor8.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/TypeKindVisitor9.java (94%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/Types.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/lang/model/util/package-info.java (92%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/Diagnostic.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/DiagnosticCollector.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/DiagnosticListener.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/DocumentationTool.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/FileObject.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/ForwardingFileObject.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/ForwardingJavaFileManager.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/ForwardingJavaFileObject.java (95%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/JavaCompiler.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/JavaFileManager.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/JavaFileObject.java (97%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/OptionChecker.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/SimpleJavaFileObject.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/StandardJavaFileManager.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/StandardLocation.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/Tool.java (98%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/ToolProvider.java (99%) rename src/java.compiler/share/classes/{javax => jdkx}/tools/package-info.java (89%) diff --git a/make/langtools/netbeans/nb-javac/build.xml b/make/langtools/netbeans/nb-javac/build.xml index e997467..f108e10 100644 --- a/make/langtools/netbeans/nb-javac/build.xml +++ b/make/langtools/netbeans/nb-javac/build.xml @@ -100,9 +100,9 @@ - - - + + + diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/source/tree/CompilationUnitTreeTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/source/tree/CompilationUnitTreeTest.java index 86e9a0a..1635404 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/source/tree/CompilationUnitTreeTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/source/tree/CompilationUnitTreeTest.java @@ -29,10 +29,10 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/source/tree/TreeTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/source/tree/TreeTest.java index 50535f3..a416b19 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/source/tree/TreeTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/source/tree/TreeTest.java @@ -29,10 +29,10 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; import org.junit.Ignore; diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/source/util/TreesTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/source/util/TreesTest.java index 4e884ce..3c65238 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/source/util/TreesTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/source/util/TreesTest.java @@ -40,13 +40,13 @@ import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.TypeElement; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/code/LintTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/code/LintTest.java index 9783049..e718021 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/code/LintTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/code/LintTest.java @@ -29,12 +29,12 @@ import java.net.URI; import java.util.Arrays; import java.util.concurrent.atomic.AtomicInteger; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticListener; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/code/TypesTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/code/TypesTest.java index 87d61be..a6ebed9 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/code/TypesTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/code/TypesTest.java @@ -36,13 +36,13 @@ import java.net.URI; import java.util.Arrays; import java.util.LinkedList; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.Types; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.Types; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/AnnotateTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/AnnotateTest.java index 19bcdea..35d52d7 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/AnnotateTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/AnnotateTest.java @@ -34,10 +34,10 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/AttrTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/AttrTest.java index 9241fe8..4b8afd8 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/AttrTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/AttrTest.java @@ -50,22 +50,22 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.FileObject; +import jdkx.tools.ForwardingJavaFileManager; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.ToolProvider; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import junit.framework.TestCase; diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/CheckTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/CheckTest.java index 8fe1bc1..054f038 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/CheckTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/CheckTest.java @@ -33,15 +33,15 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.ToolProvider; +import jdkx.tools.FileObject; +import jdkx.tools.ForwardingJavaFileManager; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/FlowTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/FlowTest.java index e34da57..371f8ee 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/FlowTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/FlowTest.java @@ -35,12 +35,12 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.DiagnosticCollector; -import javax.tools.DiagnosticListener; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/LowerTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/LowerTest.java index 0f1d55d..b78c2e1 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/LowerTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/LowerTest.java @@ -37,15 +37,15 @@ import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.ToolProvider; +import jdkx.tools.FileObject; +import jdkx.tools.ForwardingJavaFileManager; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/MemberEnterTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/MemberEnterTest.java index 4cb45ed..8816c70 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/MemberEnterTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/comp/MemberEnterTest.java @@ -38,11 +38,11 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import javax.tools.DiagnosticCollector; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/jvm/ClassReaderTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/jvm/ClassReaderTest.java index 814bdd0..e82e0ef 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/jvm/ClassReaderTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/jvm/ClassReaderTest.java @@ -38,17 +38,17 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.ElementFilter; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardLocation; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.util.ElementFilter; +import jdkx.tools.FileObject; +import jdkx.tools.ForwardingJavaFileManager; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardLocation; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/DocCommentParserTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/DocCommentParserTest.java index 60c3fa4..52ce01d 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/DocCommentParserTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/DocCommentParserTest.java @@ -14,10 +14,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; import org.junit.Ignore; diff --git a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/JavacParserTest.java b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/JavacParserTest.java index 51ec600..be2abee 100644 --- a/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/JavacParserTest.java +++ b/make/langtools/netbeans/nb-javac/test/com/sun/tools/javac/parser/JavacParserTest.java @@ -53,14 +53,14 @@ import java.util.List; import java.util.Objects; import java.util.function.Consumer; -import javax.lang.model.element.Modifier; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.DiagnosticListener; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Modifier; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; public class JavacParserTest extends TestCase { diff --git a/make/langtools/netbeans/nb-javac/test/global/AP208917Test.java b/make/langtools/netbeans/nb-javac/test/global/AP208917Test.java index f3261c9..9967089 100644 --- a/make/langtools/netbeans/nb-javac/test/global/AP208917Test.java +++ b/make/langtools/netbeans/nb-javac/test/global/AP208917Test.java @@ -33,19 +33,19 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.annotation.processing.AbstractProcessor; +import jdkx.annotation.processing.RoundEnvironment; +import jdkx.annotation.processing.SupportedAnnotationTypes; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import org.junit.Assert; import org.junit.Test; diff --git a/make/langtools/netbeans/nb-javac/test/global/AnnotationProcessingTest.java b/make/langtools/netbeans/nb-javac/test/global/AnnotationProcessingTest.java index 85c78cb..44680e2 100644 --- a/make/langtools/netbeans/nb-javac/test/global/AnnotationProcessingTest.java +++ b/make/langtools/netbeans/nb-javac/test/global/AnnotationProcessingTest.java @@ -41,14 +41,14 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; import org.junit.Ignore; diff --git a/make/langtools/netbeans/nb-javac/test/global/DuplicateClassTest.java b/make/langtools/netbeans/nb-javac/test/global/DuplicateClassTest.java index 62b4a29..4ac0c36 100644 --- a/make/langtools/netbeans/nb-javac/test/global/DuplicateClassTest.java +++ b/make/langtools/netbeans/nb-javac/test/global/DuplicateClassTest.java @@ -29,11 +29,11 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.lang.model.element.TypeElement; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/global/ErrorToleranceTest.java b/make/langtools/netbeans/nb-javac/test/global/ErrorToleranceTest.java index 183ccc4..d7ccfc4 100644 --- a/make/langtools/netbeans/nb-javac/test/global/ErrorToleranceTest.java +++ b/make/langtools/netbeans/nb-javac/test/global/ErrorToleranceTest.java @@ -41,12 +41,12 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.ElementFilter; -import javax.tools.*; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject.Kind; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.util.ElementFilter; +import jdkx.tools.*; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject.Kind; import junit.framework.TestCase; /** diff --git a/make/langtools/netbeans/nb-javac/test/global/MethodInvocationAttributionTest.java b/make/langtools/netbeans/nb-javac/test/global/MethodInvocationAttributionTest.java index 67da971..b58021c 100644 --- a/make/langtools/netbeans/nb-javac/test/global/MethodInvocationAttributionTest.java +++ b/make/langtools/netbeans/nb-javac/test/global/MethodInvocationAttributionTest.java @@ -34,12 +34,12 @@ import openjdk.source.util.Trees; import java.net.URI; import java.util.Arrays; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; public class MethodInvocationAttributionTest extends TestCase { diff --git a/make/langtools/netbeans/nb-javac/test/global/PackageInfoTest.java b/make/langtools/netbeans/nb-javac/test/global/PackageInfoTest.java index 2459ce3..07b7358 100644 --- a/make/langtools/netbeans/nb-javac/test/global/PackageInfoTest.java +++ b/make/langtools/netbeans/nb-javac/test/global/PackageInfoTest.java @@ -32,17 +32,17 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.Set; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.PackageElement; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardLocation; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.PackageElement; +import jdkx.tools.ForwardingJavaFileManager; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardLocation; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertFalse; diff --git a/make/langtools/netbeans/nb-javac/test/global/ScopeTest.java b/make/langtools/netbeans/nb-javac/test/global/ScopeTest.java index a4e922f..d933270 100644 --- a/make/langtools/netbeans/nb-javac/test/global/ScopeTest.java +++ b/make/langtools/netbeans/nb-javac/test/global/ScopeTest.java @@ -38,16 +38,16 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.ElementFilter; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.ElementFilter; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; public class ScopeTest extends TestCase { diff --git a/make/langtools/netbeans/nb-javac/test/global/Test116436.java b/make/langtools/netbeans/nb-javac/test/global/Test116436.java index d4df47d..691ec43 100644 --- a/make/langtools/netbeans/nb-javac/test/global/Test116436.java +++ b/make/langtools/netbeans/nb-javac/test/global/Test116436.java @@ -29,10 +29,10 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; public class Test116436 extends TestCase { diff --git a/make/langtools/netbeans/nb-javac/test/global/Test122900.java b/make/langtools/netbeans/nb-javac/test/global/Test122900.java index a6ceff7..b7bd643 100644 --- a/make/langtools/netbeans/nb-javac/test/global/Test122900.java +++ b/make/langtools/netbeans/nb-javac/test/global/Test122900.java @@ -29,10 +29,10 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; public class Test122900 extends TestCase { diff --git a/make/langtools/netbeans/nb-javac/test/global/Test144555.java b/make/langtools/netbeans/nb-javac/test/global/Test144555.java index 0d0f741..f816365 100644 --- a/make/langtools/netbeans/nb-javac/test/global/Test144555.java +++ b/make/langtools/netbeans/nb-javac/test/global/Test144555.java @@ -29,10 +29,10 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; public class Test144555 extends TestCase { diff --git a/make/langtools/netbeans/nb-javac/test/global/TestAnnotationPackageInfo.java b/make/langtools/netbeans/nb-javac/test/global/TestAnnotationPackageInfo.java index 03eb686..e0bc562 100644 --- a/make/langtools/netbeans/nb-javac/test/global/TestAnnotationPackageInfo.java +++ b/make/langtools/netbeans/nb-javac/test/global/TestAnnotationPackageInfo.java @@ -29,12 +29,12 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticCollector; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticCollector; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; public class TestAnnotationPackageInfo extends TestCase { diff --git a/make/langtools/netbeans/nb-javac/test/global/TestNPEFromSymbolHasOutterInstances.java b/make/langtools/netbeans/nb-javac/test/global/TestNPEFromSymbolHasOutterInstances.java index aa3dbba..86f616c 100644 --- a/make/langtools/netbeans/nb-javac/test/global/TestNPEFromSymbolHasOutterInstances.java +++ b/make/langtools/netbeans/nb-javac/test/global/TestNPEFromSymbolHasOutterInstances.java @@ -33,10 +33,10 @@ import java.io.IOException; import java.net.URI; import java.util.Arrays; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import junit.framework.TestCase; public class TestNPEFromSymbolHasOutterInstances extends TestCase { diff --git a/make/langtools/netbeans/nb-javac/test/global/ap1/AP.java b/make/langtools/netbeans/nb-javac/test/global/ap1/AP.java index b41569f..996f837 100644 --- a/make/langtools/netbeans/nb-javac/test/global/ap1/AP.java +++ b/make/langtools/netbeans/nb-javac/test/global/ap1/AP.java @@ -33,14 +33,14 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.tools.Diagnostic.Kind; -import javax.tools.JavaFileObject; +import jdkx.annotation.processing.AbstractProcessor; +import jdkx.annotation.processing.RoundEnvironment; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.Diagnostic.Kind; +import jdkx.tools.JavaFileObject; /** * diff --git a/make/langtools/netbeans/nb-javac/test/global/ap1/ClassBasedAP.java b/make/langtools/netbeans/nb-javac/test/global/ap1/ClassBasedAP.java index c19ed07..4fa79b9 100644 --- a/make/langtools/netbeans/nb-javac/test/global/ap1/ClassBasedAP.java +++ b/make/langtools/netbeans/nb-javac/test/global/ap1/ClassBasedAP.java @@ -31,14 +31,14 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.ElementFilter; -import javax.tools.FileObject; -import javax.tools.StandardLocation; +import jdkx.annotation.processing.AbstractProcessor; +import jdkx.annotation.processing.RoundEnvironment; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.util.ElementFilter; +import jdkx.tools.FileObject; +import jdkx.tools.StandardLocation; /** * diff --git a/make/langtools/netbeans/nb-javac/test/global/ap1/ErrorProducingAP.java b/make/langtools/netbeans/nb-javac/test/global/ap1/ErrorProducingAP.java index 31c43db..d2bb5fa 100644 --- a/make/langtools/netbeans/nb-javac/test/global/ap1/ErrorProducingAP.java +++ b/make/langtools/netbeans/nb-javac/test/global/ap1/ErrorProducingAP.java @@ -28,13 +28,13 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.tools.Diagnostic.Kind; +import jdkx.annotation.processing.AbstractProcessor; +import jdkx.annotation.processing.RoundEnvironment; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.Diagnostic.Kind; /** * diff --git a/make/langtools/tools/propertiesparser/parser/MessageType.java b/make/langtools/tools/propertiesparser/parser/MessageType.java index bac7bdd..0b03484 100644 --- a/make/langtools/tools/propertiesparser/parser/MessageType.java +++ b/make/langtools/tools/propertiesparser/parser/MessageType.java @@ -79,16 +79,16 @@ public enum SimpleType implements MessageType { FLAG("flag", "Flag", "openjdk.tools.javac.code.Flags"), FRAGMENT("fragment", "Fragment", null), DIAGNOSTIC("diagnostic", "JCDiagnostic", "openjdk.tools.javac.util"), - MODIFIER("modifier", "Modifier", "javax.lang.model.element"), + MODIFIER("modifier", "Modifier", "jdkx.lang.model.element"), FILE("file", "File", "java.io"), - FILE_OBJECT("file object", "JavaFileObject", "javax.tools"), + FILE_OBJECT("file object", "JavaFileObject", "jdkx.tools"), PATH("path", "Path", "java.nio.file"), NAME("name", "Name", "openjdk.tools.javac.util"), NUMBER("number", "int", null), OPTION_NAME("option name", "Option", "openjdk.tools.javac.main"), PROFILE("profile", "Profile", "openjdk.tools.javac.jvm"), SOURCE("source", "Source", "openjdk.tools.javac.code"), - SOURCE_VERSION("source version", "SourceVersion", "javax.lang.model"), + SOURCE_VERSION("source version", "SourceVersion", "jdkx.lang.model"), STRING("string", "String", null), SYMBOL("symbol", "Symbol", "openjdk.tools.javac.code"), SYMBOL_KIND("symbol kind", "Kind", "openjdk.tools.javac.code.Kinds"), diff --git a/src/java.compiler/share/classes/com/itsaky/androidide/config/JavacConfigProvider.java b/src/java.compiler/share/classes/com/itsaky/androidide/config/JavacConfigProvider.java index dfd5126..cc99661 100644 --- a/src/java.compiler/share/classes/com/itsaky/androidide/config/JavacConfigProvider.java +++ b/src/java.compiler/share/classes/com/itsaky/androidide/config/JavacConfigProvider.java @@ -1,6 +1,6 @@ package com.itsaky.androidide.config; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.SourceVersion; import java.lang.reflect.Field; public class JavacConfigProvider { diff --git a/src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java b/src/java.compiler/share/classes/jdkx/annotation/processing/AbstractProcessor.java similarity index 97% rename from src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/AbstractProcessor.java index 40517fe..3c308c6 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/AbstractProcessor.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/AbstractProcessor.java @@ -23,16 +23,16 @@ * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; import java.util.List; import java.util.Set; import java.util.HashSet; import java.util.Collections; import java.util.Objects; -import javax.lang.model.element.*; -import javax.lang.model.SourceVersion; -import javax.tools.Diagnostic; +import jdkx.lang.model.element.*; +import jdkx.lang.model.SourceVersion; +import jdkx.tools.Diagnostic; /** * An abstract annotation processor designed to be a convenient @@ -50,7 +50,7 @@ * *

Subclasses are free to override the implementation and * specification of any of the methods in this class as long as the - * general {@link javax.annotation.processing.Processor Processor} + * general {@link jdkx.annotation.processing.Processor Processor} * contract for that method is obeyed. * * @author Joseph D. Darcy diff --git a/src/java.compiler/share/classes/javax/annotation/processing/Completion.java b/src/java.compiler/share/classes/jdkx/annotation/processing/Completion.java similarity index 97% rename from src/java.compiler/share/classes/javax/annotation/processing/Completion.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/Completion.java index 58c1582..fbb1edf 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/Completion.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/Completion.java @@ -23,7 +23,7 @@ * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; /** * A suggested {@linkplain Processor#getCompletions completion} for an diff --git a/src/java.compiler/share/classes/javax/annotation/processing/Completions.java b/src/java.compiler/share/classes/jdkx/annotation/processing/Completions.java similarity index 98% rename from src/java.compiler/share/classes/javax/annotation/processing/Completions.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/Completions.java index 8b7aa29..45ce2cf 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/Completions.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/Completions.java @@ -23,7 +23,7 @@ * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; /** * Utility class for assembling {@link Completion} objects. diff --git a/src/java.compiler/share/classes/javax/annotation/processing/Filer.java b/src/java.compiler/share/classes/jdkx/annotation/processing/Filer.java similarity index 98% rename from src/java.compiler/share/classes/javax/annotation/processing/Filer.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/Filer.java index 257b008..65ceb2c 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/Filer.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/Filer.java @@ -23,12 +23,12 @@ * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; -import javax.tools.JavaFileManager; -import javax.tools.*; -import javax.lang.model.element.Element; -import javax.lang.model.util.Elements; +import jdkx.tools.JavaFileManager; +import jdkx.tools.*; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.util.Elements; import java.io.IOException; /** @@ -48,8 +48,8 @@ *

There are two distinguished supported locations (subtrees * within the logical file system) where newly created files are * placed: one for {@linkplain - * javax.tools.StandardLocation#SOURCE_OUTPUT new source files}, and - * one for {@linkplain javax.tools.StandardLocation#CLASS_OUTPUT new + * jdkx.tools.StandardLocation#SOURCE_OUTPUT new source files}, and + * one for {@linkplain jdkx.tools.StandardLocation#CLASS_OUTPUT new * class files}. (These might be specified on a tool's command line, * for example, using flags such as {@code -s} and {@code -d}.) The * actual locations for new source files and new class files may or @@ -113,7 +113,7 @@ * to overwrite existing files that were not generated. * *

Processors can indicate a source or class file is generated by - * including a {@link javax.annotation.processing.Generated} + * including a {@link jdkx.annotation.processing.Generated} * annotation if the environment is configured so that that class or * interface is accessible. * diff --git a/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java b/src/java.compiler/share/classes/jdkx/annotation/processing/FilerException.java similarity index 98% rename from src/java.compiler/share/classes/javax/annotation/processing/FilerException.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/FilerException.java index 0e7d9cd..8fabb58 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/FilerException.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/FilerException.java @@ -23,7 +23,7 @@ * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; import java.io.IOException; diff --git a/src/java.compiler/share/classes/javax/annotation/processing/Generated.java b/src/java.compiler/share/classes/jdkx/annotation/processing/Generated.java similarity index 98% rename from src/java.compiler/share/classes/javax/annotation/processing/Generated.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/Generated.java index 74de893..b87600f 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/Generated.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/Generated.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; import java.lang.annotation.*; import static java.lang.annotation.ElementType.*; diff --git a/src/java.compiler/share/classes/javax/annotation/processing/Messager.java b/src/java.compiler/share/classes/jdkx/annotation/processing/Messager.java similarity index 95% rename from src/java.compiler/share/classes/javax/annotation/processing/Messager.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/Messager.java index f79e64e..cd2f0d6 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/Messager.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/Messager.java @@ -23,10 +23,10 @@ * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; -import javax.tools.Diagnostic; -import javax.lang.model.element.*; +import jdkx.tools.Diagnostic; +import jdkx.lang.model.element.*; /** * A {@code Messager} provides the way for an annotation processor to @@ -36,7 +36,7 @@ * unavailable or only approximate. * *

Printing a message with an {@linkplain - * javax.tools.Diagnostic.Kind#ERROR error kind} will {@linkplain + * jdkx.tools.Diagnostic.Kind#ERROR error kind} will {@linkplain * RoundEnvironment#errorRaised raise an error}. * *

Note that the messages "printed" by methods in this diff --git a/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java b/src/java.compiler/share/classes/jdkx/annotation/processing/ProcessingEnvironment.java similarity index 97% rename from src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/ProcessingEnvironment.java index 6b1e3b5..d70b53a 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/ProcessingEnvironment.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/ProcessingEnvironment.java @@ -23,13 +23,13 @@ * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; import java.util.Map; import java.util.Locale; -import javax.lang.model.SourceVersion; -import javax.lang.model.util.Elements; -import javax.lang.model.util.Types; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.util.Elements; +import jdkx.lang.model.util.Types; /** * An annotation processing tool framework will {@linkplain diff --git a/src/java.compiler/share/classes/javax/annotation/processing/Processor.java b/src/java.compiler/share/classes/jdkx/annotation/processing/Processor.java similarity index 95% rename from src/java.compiler/share/classes/javax/annotation/processing/Processor.java rename to src/java.compiler/share/classes/jdkx/annotation/processing/Processor.java index 0b2160d..8ef6a68 100644 --- a/src/java.compiler/share/classes/javax/annotation/processing/Processor.java +++ b/src/java.compiler/share/classes/jdkx/annotation/processing/Processor.java @@ -23,19 +23,19 @@ * questions. */ -package javax.annotation.processing; +package jdkx.annotation.processing; import java.util.Set; -import javax.lang.model.util.Elements; -import javax.lang.model.AnnotatedConstruct; -import javax.lang.model.element.*; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.util.Elements; +import jdkx.lang.model.AnnotatedConstruct; +import jdkx.lang.model.element.*; +import jdkx.lang.model.SourceVersion; /** * The interface for an annotation processor. * *

Annotation processing happens in a sequence of {@linkplain - * javax.annotation.processing.RoundEnvironment rounds}. On each + * jdkx.annotation.processing.RoundEnvironment rounds}. On each * round, a processor may be asked to {@linkplain #process process} a * subset of the annotations found on the source and class files * produced by a prior round. The inputs to the first round of @@ -80,11 +80,11 @@ *

The tool uses a discovery process to find annotation * processors and decide whether or not they should be run. By * configuring the tool, the set of potential processors can be - * controlled. For example, for a {@link javax.tools.JavaCompiler + * controlled. For example, for a {@link jdkx.tools.JavaCompiler * JavaCompiler} the list of candidate processors to run can be - * {@linkplain javax.tools.JavaCompiler.CompilationTask#setProcessors + * {@linkplain jdkx.tools.JavaCompiler.CompilationTask#setProcessors * set directly} or controlled by a {@linkplain - * javax.tools.StandardLocation#ANNOTATION_PROCESSOR_PATH search path} + * jdkx.tools.StandardLocation#ANNOTATION_PROCESSOR_PATH search path} * used for a {@linkplain java.util.ServiceLoader service-style} * lookup. Other tool implementations may have different * configuration mechanisms, such as command line options; for @@ -213,7 +213,7 @@ public interface Processor { * *

Each string returned in the set must be a period separated * sequence of {@linkplain - * javax.lang.model.SourceVersion#isIdentifier identifiers}: + * jdkx.lang.model.SourceVersion#isIdentifier identifiers}: * *

*
@@ -235,7 +235,7 @@ public interface Processor { * * @return the options recognized by this processor or an * empty set if none - * @see javax.annotation.processing.SupportedOptions + * @see jdkx.annotation.processing.SupportedOptions */ Set getSupportedOptions(); @@ -258,7 +258,7 @@ public interface Processor { * is matched. In particular, if a module name is given in an * environment where modules are not supported, such as an * annotation processing environment configured for a {@linkplain - * javax.annotation.processing.ProcessingEnvironment#getSourceVersion + * jdkx.annotation.processing.ProcessingEnvironment#getSourceVersion * source version} without modules, then the annotation interfaces with * a module name do not match. * @@ -299,7 +299,7 @@ public interface Processor { * * @return the names of the annotation interfaces supported by this processor * or an empty set if none - * @see javax.annotation.processing.SupportedAnnotationTypes + * @see jdkx.annotation.processing.SupportedAnnotationTypes * @jls 3.8 Identifiers */ Set getSupportedAnnotationTypes(); @@ -308,7 +308,7 @@ public interface Processor { * {@return the latest source version supported by this annotation * processor} * - * @see javax.annotation.processing.SupportedSourceVersion + * @see jdkx.annotation.processing.SupportedSourceVersion * @see ProcessingEnvironment#getSourceVersion */ SourceVersion getSupportedSourceVersion(); @@ -387,7 +387,7 @@ boolean process(Set annotations, * *
* 
-    * import static javax.annotation.processing.Completions.*;
+    * import static jdkx.annotation.processing.Completions.*;
     * ...
     * return List.of({@link Completions#of(String) of}("3"),
     *                of("7"),
diff --git a/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java b/src/java.compiler/share/classes/jdkx/annotation/processing/RoundEnvironment.java
similarity index 95%
rename from src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java
rename to src/java.compiler/share/classes/jdkx/annotation/processing/RoundEnvironment.java
index c50c6b7..aab1e14 100644
--- a/src/java.compiler/share/classes/javax/annotation/processing/RoundEnvironment.java
+++ b/src/java.compiler/share/classes/jdkx/annotation/processing/RoundEnvironment.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package javax.annotation.processing;
+package jdkx.annotation.processing;
 
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
+import jdkx.lang.model.element.Element;
+import jdkx.lang.model.element.TypeElement;
 import java.util.LinkedHashSet;
 import java.util.Collections;
 import java.util.Set;
@@ -154,8 +154,8 @@ default Set getElementsAnnotatedWithAny(TypeElement... annota
      * @throws IllegalArgumentException if the argument does not
      * represent an annotation type
      *
-     * @see javax.lang.model.AnnotatedConstruct#getAnnotation(Class)
-     * @see javax.lang.model.AnnotatedConstruct#getAnnotationsByType(Class)
+     * @see jdkx.lang.model.AnnotatedConstruct#getAnnotation(Class)
+     * @see jdkx.lang.model.AnnotatedConstruct#getAnnotationsByType(Class)
      */
     Set getElementsAnnotatedWith(Class a);
 
@@ -193,8 +193,8 @@ default Set getElementsAnnotatedWithAny(TypeElement... annota
      * argument set do not represent an annotation type
      * @jls 9.6.3 Repeatable Annotation Interfaces
      *
-     * @see javax.lang.model.AnnotatedConstruct#getAnnotation(Class)
-     * @see javax.lang.model.AnnotatedConstruct#getAnnotationsByType(Class)
+     * @see jdkx.lang.model.AnnotatedConstruct#getAnnotation(Class)
+     * @see jdkx.lang.model.AnnotatedConstruct#getAnnotationsByType(Class)
      *
      * @since 9
      */
diff --git a/src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java b/src/java.compiler/share/classes/jdkx/annotation/processing/SupportedAnnotationTypes.java
similarity index 98%
rename from src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java
rename to src/java.compiler/share/classes/jdkx/annotation/processing/SupportedAnnotationTypes.java
index bb6c87e..7e79c7a 100644
--- a/src/java.compiler/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java
+++ b/src/java.compiler/share/classes/jdkx/annotation/processing/SupportedAnnotationTypes.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.annotation.processing;
+package jdkx.annotation.processing;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.RetentionPolicy.*;
diff --git a/src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java b/src/java.compiler/share/classes/jdkx/annotation/processing/SupportedOptions.java
similarity index 98%
rename from src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java
rename to src/java.compiler/share/classes/jdkx/annotation/processing/SupportedOptions.java
index 7f8817a..71a3cae 100644
--- a/src/java.compiler/share/classes/javax/annotation/processing/SupportedOptions.java
+++ b/src/java.compiler/share/classes/jdkx/annotation/processing/SupportedOptions.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.annotation.processing;
+package jdkx.annotation.processing;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.RetentionPolicy.*;
diff --git a/src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java b/src/java.compiler/share/classes/jdkx/annotation/processing/SupportedSourceVersion.java
similarity index 96%
rename from src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java
rename to src/java.compiler/share/classes/jdkx/annotation/processing/SupportedSourceVersion.java
index 18fa420..675eef7 100644
--- a/src/java.compiler/share/classes/javax/annotation/processing/SupportedSourceVersion.java
+++ b/src/java.compiler/share/classes/jdkx/annotation/processing/SupportedSourceVersion.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package javax.annotation.processing;
+package jdkx.annotation.processing;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.RetentionPolicy.*;
 import static java.lang.annotation.ElementType.*;
-import javax.lang.model.SourceVersion;
+import jdkx.lang.model.SourceVersion;
 
 
 /**
diff --git a/src/java.compiler/share/classes/javax/annotation/processing/package-info.java b/src/java.compiler/share/classes/jdkx/annotation/processing/package-info.java
similarity index 98%
rename from src/java.compiler/share/classes/javax/annotation/processing/package-info.java
rename to src/java.compiler/share/classes/jdkx/annotation/processing/package-info.java
index 64bbf61..c06e854 100644
--- a/src/java.compiler/share/classes/javax/annotation/processing/package-info.java
+++ b/src/java.compiler/share/classes/jdkx/annotation/processing/package-info.java
@@ -40,4 +40,4 @@
  * @author Peter von der Ahé
  * @since 1.6
  */
-package javax.annotation.processing;
+package jdkx.annotation.processing;
diff --git a/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java b/src/java.compiler/share/classes/jdkx/lang/model/AnnotatedConstruct.java
similarity index 95%
rename from src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
rename to src/java.compiler/share/classes/jdkx/lang/model/AnnotatedConstruct.java
index d10a1cb..5533b76 100644
--- a/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/AnnotatedConstruct.java
@@ -23,19 +23,19 @@
  * questions.
  */
 
-package javax.lang.model;
+package jdkx.lang.model;
 
 import java.lang.annotation.*;
 import java.util.List;
-import javax.lang.model.element.*;
-import javax.lang.model.type.*;
+import jdkx.lang.model.element.*;
+import jdkx.lang.model.type.*;
 
 /**
  * Represents a construct that can be annotated.
  *
  * A construct is either an {@linkplain
- * javax.lang.model.element.Element element} or a {@linkplain
- * javax.lang.model.type.TypeMirror type}.  Annotations on an element
+ * jdkx.lang.model.element.Element element} or a {@linkplain
+ * jdkx.lang.model.type.TypeMirror type}.  Annotations on an element
  * are on a declaration, whereas annotations on a type are on
  * a specific use of a type name.
  *
@@ -60,7 +60,7 @@
  * 
    
  *
  * 
  • A is {@linkplain
- * javax.lang.model.util.Elements#getOrigin(AnnotatedConstruct,
+ * jdkx.lang.model.util.Elements#getOrigin(AnnotatedConstruct,
  * AnnotationMirror) explicitly or implicitly}
  * declared as applying to
  * the source code representation of C.
@@ -79,7 +79,7 @@
  *
  * If there are multiple annotations of type AT present on
  * C, then if AT is repeatable annotation type, an
- * annotation of type ATC is {@linkplain javax.lang.model.util.Elements#getOrigin(AnnotatedConstruct, AnnotationMirror) implicitly declared} on C.
+ * annotation of type ATC is {@linkplain jdkx.lang.model.util.Elements#getOrigin(AnnotatedConstruct, AnnotationMirror) implicitly declared} on C.
  * 
  •  A representation of A appears in the executable output
  * for C, such as the {@code RuntimeVisibleAnnotations} (JVMS {@jvms 4.7.16}) or
  * {@code RuntimeVisibleParameterAnnotations} (JVMS {@jvms 4.7.17}) attributes of a class
diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/jdkx/lang/model/SourceVersion.java
similarity index 99%
rename from src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
rename to src/java.compiler/share/classes/jdkx/lang/model/SourceVersion.java
index 3096d99..bd1cca1 100644
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/SourceVersion.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model;
+package jdkx.lang.model;
 
 import java.util.Collections;
 import java.util.Set;
diff --git a/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java b/src/java.compiler/share/classes/jdkx/lang/model/UnknownEntityException.java
similarity index 90%
rename from src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java
rename to src/java.compiler/share/classes/jdkx/lang/model/UnknownEntityException.java
index 3e2cee4..8bf6a7a 100644
--- a/src/java.compiler/share/classes/javax/lang/model/UnknownEntityException.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/UnknownEntityException.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model;
+package jdkx.lang.model;
 
 /**
  * Superclass of exceptions which indicate that an unknown kind of
@@ -33,9 +33,9 @@
  * visitor was created for a prior version of the language.
  *
  * @author Joseph D. Darcy
- * @see javax.lang.model.element.UnknownElementException
- * @see javax.lang.model.element.UnknownAnnotationValueException
- * @see javax.lang.model.type.UnknownTypeException
+ * @see jdkx.lang.model.element.UnknownElementException
+ * @see jdkx.lang.model.element.UnknownAnnotationValueException
+ * @see jdkx.lang.model.type.UnknownTypeException
  * @since 1.7
  */
 public class UnknownEntityException extends RuntimeException {
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java b/src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationMirror.java
similarity index 94%
rename from src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationMirror.java
index 1f493ca..d44f679 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationMirror.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationMirror.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 import java.util.Map;
-import javax.lang.model.type.DeclaredType;
+import jdkx.lang.model.type.DeclaredType;
 
 /**
  * Represents an annotation.  An annotation associates a value with
@@ -62,7 +62,7 @@ public interface AnnotationMirror {
      * will by definition have an empty map.
      *
      * 
    To fill in default values, use {@link
-     * javax.lang.model.util.Elements#getElementValuesWithDefaults
+     * jdkx.lang.model.util.Elements#getElementValuesWithDefaults
      * getElementValuesWithDefaults}.
      *
      * @return the values of this annotation's elements,
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java b/src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationValue.java
similarity index 98%
rename from src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationValue.java
index ed7a180..8823463 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValue.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationValue.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 /**
  * Represents a value of an annotation interface element.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java b/src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationValueVisitor.java
similarity index 97%
rename from src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationValueVisitor.java
index be66b95..cfe2dee 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/AnnotationValueVisitor.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 
 import java.util.List;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.*;
+import jdkx.lang.model.type.TypeMirror;
+import jdkx.lang.model.util.*;
 
 /**
  * A visitor of the values of annotation interface elements, using a
@@ -76,10 +76,10 @@
  * construct.
  *
  * 
    There are several families of classes implementing this visitor
- * interface in the {@linkplain javax.lang.model.util util
+ * interface in the {@linkplain jdkx.lang.model.util util
  * package}. The families follow a naming pattern along the lines of
  * {@code FooVisitor}N where N indicates the
- * {@linkplain javax.lang.model.SourceVersion source version} the
+ * {@linkplain jdkx.lang.model.SourceVersion source version} the
  * visitor is appropriate for.
  *
  * In particular, a {@code FooVisitor}N is expected to handle
@@ -88,7 +88,7 @@
  * N + 1 (or subsequent releases), {@code
  * FooVisitor}N may also handle that later source version; in
  * that case, the {@link
- * javax.annotation.processing.SupportedSourceVersion
+ * jdkx.annotation.processing.SupportedSourceVersion
  * SupportedSourceVersion} annotation on the {@code
  * FooVisitor}N class will indicate a later version.
  *
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/Element.java b/src/java.compiler/share/classes/jdkx/lang/model/element/Element.java
similarity index 98%
rename from src/java.compiler/share/classes/javax/lang/model/element/Element.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/Element.java
index 01bad07..cbe418e 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/Element.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/Element.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 
 import java.lang.annotation.Annotation;
@@ -32,8 +32,8 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.lang.model.type.*;
-import javax.lang.model.util.*;
+import jdkx.lang.model.type.*;
+import jdkx.lang.model.util.*;
 
 /**
  * Represents a program element such as a module, package, class, or method.
@@ -59,7 +59,7 @@
  * @see TypeMirror
  * @since 1.6
  */
-public interface Element extends javax.lang.model.AnnotatedConstruct {
+public interface Element extends jdkx.lang.model.AnnotatedConstruct {
     /**
      * {@return the type defined by this element}
      *
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java b/src/java.compiler/share/classes/jdkx/lang/model/element/ElementKind.java
similarity index 99%
rename from src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/ElementKind.java
index 213a376..2e68b68 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/ElementKind.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 /**
  * The {@code kind} of an element.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java b/src/java.compiler/share/classes/jdkx/lang/model/element/ElementVisitor.java
similarity index 97%
rename from src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/ElementVisitor.java
index 44635fa..34f457e 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/ElementVisitor.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
-import javax.lang.model.util.*;
+import jdkx.lang.model.util.*;
 
 /**
  * A visitor of program elements, in the style of the visitor design
@@ -66,10 +66,10 @@
  * construct.
  *
  * 
    There are several families of classes implementing this visitor
- * interface in the {@linkplain javax.lang.model.util util
+ * interface in the {@linkplain jdkx.lang.model.util util
  * package}. The families follow a naming pattern along the lines of
  * {@code FooVisitor}N where N indicates the
- * {@linkplain javax.lang.model.SourceVersion source version} the
+ * {@linkplain jdkx.lang.model.SourceVersion source version} the
  * visitor is appropriate for.
  *
  * In particular, a {@code FooVisitor}N is expected to handle
@@ -78,7 +78,7 @@
  * N + 1 (or subsequent releases), {@code
  * FooVisitor}N may also handle that later source version; in
  * that case, the {@link
- * javax.annotation.processing.SupportedSourceVersion
+ * jdkx.annotation.processing.SupportedSourceVersion
  * SupportedSourceVersion} annotation on the {@code
  * FooVisitor}N class will indicate a later version.
  *
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java b/src/java.compiler/share/classes/jdkx/lang/model/element/ExecutableElement.java
similarity index 96%
rename from src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/ExecutableElement.java
index 9f8e399..8723751 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/ExecutableElement.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 import java.util.List;
-import javax.lang.model.type.*;
+import jdkx.lang.model.type.*;
 
 /**
  * Represents a method, constructor, or initializer (static or
@@ -77,8 +77,8 @@ public interface ExecutableElement extends Element, Parameterizable {
 
     /**
      * Returns the receiver type of this executable,
-     * or {@link javax.lang.model.type.NoType NoType} with
-     * kind {@link javax.lang.model.type.TypeKind#NONE NONE}
+     * or {@link jdkx.lang.model.type.NoType NoType} with
+     * kind {@link jdkx.lang.model.type.TypeKind#NONE NONE}
      * if the executable has no receiver type.
      *
      * An executable which is an instance method, or a constructor of an
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java b/src/java.compiler/share/classes/jdkx/lang/model/element/Modifier.java
similarity index 99%
rename from src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/Modifier.java
index dfbd76d..ef4a95f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/Modifier.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 
 /**
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java b/src/java.compiler/share/classes/jdkx/lang/model/element/ModuleElement.java
similarity index 97%
rename from src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/ModuleElement.java
index 31b9dbd..2cfd842 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/ModuleElement.java
@@ -23,26 +23,26 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 import java.util.List;
-import javax.lang.model.type.TypeMirror;
+import jdkx.lang.model.type.TypeMirror;
 
 /**
  * Represents a module program element.  Provides access to
  * information about the module, its directives, and its members.
  *
- * @see javax.lang.model.util.Elements#getModuleOf
+ * @see jdkx.lang.model.util.Elements#getModuleOf
  * @since 9
  * @jls 7.7 Module Declarations
  */
 public interface ModuleElement extends Element, QualifiedNameable {
     /**
-     * {@return a {@linkplain javax.lang.model.type.NoType pseudo-type}
+     * {@return a {@linkplain jdkx.lang.model.type.NoType pseudo-type}
      * for this module}
      *
-     * @see javax.lang.model.type.NoType
-     * @see javax.lang.model.type.TypeKind#MODULE
+     * @see jdkx.lang.model.type.NoType
+     * @see jdkx.lang.model.type.TypeKind#MODULE
      */
     @Override
     TypeMirror asType();
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/Name.java b/src/java.compiler/share/classes/jdkx/lang/model/element/Name.java
similarity index 90%
rename from src/java.compiler/share/classes/javax/lang/model/element/Name.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/Name.java
index 9e40bcf..5639674 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/Name.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/Name.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 /**
  * An immutable sequence of characters.  When created by the same
@@ -38,18 +38,18 @@
  * zero.
  *
  * 
    In the context of {@linkplain
- * javax.annotation.processing.ProcessingEnvironment annotation
+ * jdkx.annotation.processing.ProcessingEnvironment annotation
  * processing}, the guarantees for "the same" implementation must
- * include contexts where the {@linkplain javax.annotation.processing
+ * include contexts where the {@linkplain jdkx.annotation.processing
  * API mediated} side effects of {@linkplain
- * javax.annotation.processing.Processor processors} could be visible
+ * jdkx.annotation.processing.Processor processors} could be visible
  * to each other, including successive annotation processing
- * {@linkplain javax.annotation.processing.RoundEnvironment rounds}.
+ * {@linkplain jdkx.annotation.processing.RoundEnvironment rounds}.
  *
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @author Peter von der Ahé
- * @see javax.lang.model.util.Elements#getName
+ * @see jdkx.lang.model.util.Elements#getName
  * @since 1.6
  */
 public interface Name extends CharSequence {
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java b/src/java.compiler/share/classes/jdkx/lang/model/element/NestingKind.java
similarity index 96%
rename from src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/NestingKind.java
index 62cc65d..6b7ad9b 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/NestingKind.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/NestingKind.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 /**
  * The nesting kind of a type element.
@@ -40,8 +40,8 @@
  *
  * import java.lang.annotation.*;
  * import static java.lang.annotation.RetentionPolicy.*;
- * import javax.lang.model.element.*;
- * import static javax.lang.model.element.NestingKind.*;
+ * import jdkx.lang.model.element.*;
+ * import static jdkx.lang.model.element.NestingKind.*;
  *
  * @Nesting(TOP_LEVEL)
  * public class NestingExamples {
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java b/src/java.compiler/share/classes/jdkx/lang/model/element/PackageElement.java
similarity index 91%
rename from src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/PackageElement.java
index 42d62cb..547f1c7 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/PackageElement.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/PackageElement.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 import java.util.List;
-import javax.lang.model.type.TypeMirror;
+import jdkx.lang.model.type.TypeMirror;
 
 /**
  * Represents a package program element.  Provides access to information
@@ -35,16 +35,16 @@
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @author Peter von der Ahé
- * @see javax.lang.model.util.Elements#getPackageOf
+ * @see jdkx.lang.model.util.Elements#getPackageOf
  * @since 1.6
  */
 public interface PackageElement extends Element, QualifiedNameable {
     /**
-     * {@return a {@linkplain javax.lang.model.type.NoType pseudo-type}
+     * {@return a {@linkplain jdkx.lang.model.type.NoType pseudo-type}
      * for this package}
      *
-     * @see javax.lang.model.type.NoType
-     * @see javax.lang.model.type.TypeKind#PACKAGE
+     * @see jdkx.lang.model.type.NoType
+     * @see jdkx.lang.model.type.TypeKind#PACKAGE
      */
     @Override
     TypeMirror asType();
@@ -103,7 +103,7 @@ public interface PackageElement extends Element, QualifiedNameable {
      * One situation where a module does not exist for a package is if
      * the environment does not include modules, such as an annotation
      * processing environment configured for a {@linkplain
-     * javax.annotation.processing.ProcessingEnvironment#getSourceVersion
+     * jdkx.annotation.processing.ProcessingEnvironment#getSourceVersion
      * source version} without modules.
      *
      * @revised 9
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java b/src/java.compiler/share/classes/jdkx/lang/model/element/Parameterizable.java
similarity index 97%
rename from src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/Parameterizable.java
index 55d9042..800363e 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/Parameterizable.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/Parameterizable.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 import java.util.List;
 
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java b/src/java.compiler/share/classes/jdkx/lang/model/element/QualifiedNameable.java
similarity index 97%
rename from src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/QualifiedNameable.java
index fe7663a..30e0f6e 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/QualifiedNameable.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/QualifiedNameable.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 /**
  * A mixin interface for an element that has a qualified name.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/RecordComponentElement.java b/src/java.compiler/share/classes/jdkx/lang/model/element/RecordComponentElement.java
similarity index 98%
rename from src/java.compiler/share/classes/javax/lang/model/element/RecordComponentElement.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/RecordComponentElement.java
index c3eba70..d3e030e 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/RecordComponentElement.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/RecordComponentElement.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 /**
  * Represents a record component.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java b/src/java.compiler/share/classes/jdkx/lang/model/element/TypeElement.java
similarity index 98%
rename from src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/TypeElement.java
index 0a8b389..92dcc3b 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/TypeElement.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.lang.model.type.*;
-import javax.lang.model.util.*;
+import jdkx.lang.model.type.*;
+import jdkx.lang.model.util.*;
 
 /**
  * Represents a class or interface program element.  Provides access
@@ -96,7 +96,7 @@ public interface TypeElement extends Element, Parameterizable, QualifiedNameable
      * an enum class.
      *
      * @apiNote As a particular instance of the {@linkplain
-     * javax.lang.model.element general accuracy requirements} and the
+     * jdkx.lang.model.element general accuracy requirements} and the
      * ordering behavior required of this interface, the list of
      * enclosed elements will be returned in the natural order for the
      * originating source of information about the class or interface.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java b/src/java.compiler/share/classes/jdkx/lang/model/element/TypeParameterElement.java
similarity index 95%
rename from src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/TypeParameterElement.java
index bd8e0a3..ee46c51 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/TypeParameterElement.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/TypeParameterElement.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
 import java.util.List;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.type.TypeVariable;
+import jdkx.lang.model.type.TypeMirror;
+import jdkx.lang.model.type.TypeVariable;
 
 /**
  * Represents a formal type parameter of a generic class, interface, method,
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java b/src/java.compiler/share/classes/jdkx/lang/model/element/UnknownAnnotationValueException.java
similarity index 97%
rename from src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/UnknownAnnotationValueException.java
index efe761e..31ba160 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/UnknownAnnotationValueException.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
-import javax.lang.model.UnknownEntityException;
+import jdkx.lang.model.UnknownEntityException;
 
 /**
  * Indicates that an unknown kind of annotation value was encountered.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java b/src/java.compiler/share/classes/jdkx/lang/model/element/UnknownDirectiveException.java
similarity index 97%
rename from src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/UnknownDirectiveException.java
index 534183a..4aecae7 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/UnknownDirectiveException.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/UnknownDirectiveException.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
-import javax.lang.model.UnknownEntityException;
+import jdkx.lang.model.UnknownEntityException;
 
 /**
  * Indicates that an unknown kind of module directive was encountered.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java b/src/java.compiler/share/classes/jdkx/lang/model/element/UnknownElementException.java
similarity index 97%
rename from src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/UnknownElementException.java
index 3977991..04bb522 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/UnknownElementException.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/UnknownElementException.java
@@ -23,9 +23,9 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
-import javax.lang.model.UnknownEntityException;
+import jdkx.lang.model.UnknownEntityException;
 
 /**
  * Indicates that an unknown kind of element was encountered.  This
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java b/src/java.compiler/share/classes/jdkx/lang/model/element/VariableElement.java
similarity index 95%
rename from src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/VariableElement.java
index ac7a949..2320f31 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/VariableElement.java
@@ -23,11 +23,11 @@
  * questions.
  */
 
-package javax.lang.model.element;
+package jdkx.lang.model.element;
 
-import javax.lang.model.util.Elements;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.type.TypeKind;
+import jdkx.lang.model.util.Elements;
+import jdkx.lang.model.type.TypeMirror;
+import jdkx.lang.model.type.TypeKind;
 
 /**
  * Represents a field, {@code enum} constant, method or constructor
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/package-info.java b/src/java.compiler/share/classes/jdkx/lang/model/element/package-info.java
similarity index 93%
rename from src/java.compiler/share/classes/javax/lang/model/element/package-info.java
rename to src/java.compiler/share/classes/jdkx/lang/model/element/package-info.java
index 094dd18..6ce2a5d 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/package-info.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/element/package-info.java
@@ -51,10 +51,10 @@
  * provide source position information.
  *
  * Names of {@linkplain
- * javax.lang.model.element.ExecutableElement#getParameters()
+ * jdkx.lang.model.element.ExecutableElement#getParameters()
  * parameters} may not be recoverable from class files.
  *
- * The {@linkplain javax.lang.model.element.Modifier modifiers} on an
+ * The {@linkplain jdkx.lang.model.element.Modifier modifiers} on an
  * element created from a class file may differ in some cases from an
  * element for the same declaration created from a source file
  * including:
@@ -66,14 +66,14 @@
  * 

  *
  * Some elements which are {@linkplain
- * javax.lang.model.util.Elements.Origin#MANDATED mandated} may not be
+ * jdkx.lang.model.util.Elements.Origin#MANDATED mandated} may not be
  * marked as such when created from class files.
  *
  * Additionally, {@linkplain
- * javax.lang.model.util.Elements.Origin#SYNTHETIC synthetic}
+ * jdkx.lang.model.util.Elements.Origin#SYNTHETIC synthetic}
  * constructs in a class file, such as accessor methods used in
  * implementing nested classes and {@linkplain
- * javax.lang.model.util.Elements.Origin#isBridge(ExecutableElement)
+ * jdkx.lang.model.util.Elements.Origin#isBridge(ExecutableElement)
  * bridge methods} used in implementing covariant returns, are
  * translation artifacts strictly outside of this model. However, when
  * operating on class files, it is helpful be able to operate on such
@@ -109,7 +109,7 @@
  * @author Joseph D. Darcy
  * @author Scott Seligman
  * @author Peter von der Ahé
- * @see javax.lang.model.util.Elements
+ * @see jdkx.lang.model.util.Elements
  * @jls 6.1 Declarations
  * @jls 7.4 Package Declarations
  * @jls 7.7 Module Declarations
@@ -121,4 +121,4 @@
  * @jls 9.1 Interface Declarations
  * @since 1.6
  */
-package javax.lang.model.element;
+package jdkx.lang.model.element;
diff --git a/src/java.compiler/share/classes/javax/lang/model/package-info.java b/src/java.compiler/share/classes/jdkx/lang/model/package-info.java
similarity index 91%
rename from src/java.compiler/share/classes/javax/lang/model/package-info.java
rename to src/java.compiler/share/classes/jdkx/lang/model/package-info.java
index fbdb003..861f59d 100644
--- a/src/java.compiler/share/classes/javax/lang/model/package-info.java
+++ b/src/java.compiler/share/classes/jdkx/lang/model/package-info.java
@@ -30,7 +30,7 @@
  *
  * The members of this package and its subpackages are for use in
  * language modeling and language processing tasks and APIs including,
- * but not limited to, the {@linkplain javax.annotation.processing
+ * but not limited to, the {@linkplain jdkx.annotation.processing
  * annotation processing} framework.
  *
  * 
 This language model follows a mirror-based design; see
@@ -43,9 +43,9 @@
  *
* * In particular, the model makes a distinction between declared - * language constructs, like the {@linkplain javax.lang.model.element + * language constructs, like the {@linkplain jdkx.lang.model.element * element} representing {@code java.util.Set}, and the family of - * {@linkplain javax.lang.model.type types} that may be associated + * {@linkplain jdkx.lang.model.type types} that may be associated * with an element, like the raw type {@code java.util.Set}, {@code * java.util.Set}, and {@code java.util.Set}. * @@ -58,4 +58,4 @@ * @since 1.6 */ -package javax.lang.model; +package jdkx.lang.model; diff --git a/src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/ArrayType.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/ArrayType.java index ac8c96c..462131d 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/ArrayType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/ArrayType.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/DeclaredType.java similarity index 95% rename from src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/DeclaredType.java index 3f68570..ab5f3be 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/DeclaredType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/DeclaredType.java @@ -23,14 +23,14 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; import java.util.List; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.Types; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.util.Types; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/ErrorType.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/ErrorType.java index 9d03ab9..753324d 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/ErrorType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/ErrorType.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; /** * Represents a class or interface type that cannot be properly modeled. diff --git a/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/ExecutableType.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/ExecutableType.java index f711ebc..80e959c 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/ExecutableType.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; import java.util.List; -import javax.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.ExecutableElement; /** * Represents the type of an executable. An executable @@ -76,8 +76,8 @@ public interface ExecutableType extends TypeMirror { /** * Returns the receiver type of this executable, - * or {@link javax.lang.model.type.NoType NoType} with - * kind {@link javax.lang.model.type.TypeKind#NONE NONE} + * or {@link jdkx.lang.model.type.NoType NoType} with + * kind {@link jdkx.lang.model.type.TypeKind#NONE NONE} * if the executable has no receiver type. * * An executable which is an instance method, or a constructor of an diff --git a/src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/IntersectionType.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/IntersectionType.java index 98b50a5..7f93623 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/IntersectionType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/IntersectionType.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; import java.util.List; diff --git a/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java b/src/java.compiler/share/classes/jdkx/lang/model/type/MirroredTypeException.java similarity index 97% rename from src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/MirroredTypeException.java index 21af507..0a6b496 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypeException.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/MirroredTypeException.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; import java.io.ObjectInputStream; import java.io.IOException; -import javax.lang.model.element.Element; +import jdkx.lang.model.element.Element; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java b/src/java.compiler/share/classes/jdkx/lang/model/type/MirroredTypesException.java similarity index 97% rename from src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/MirroredTypesException.java index 2cff3ff..e151bae 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/MirroredTypesException.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/MirroredTypesException.java @@ -23,14 +23,14 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; import java.util.ArrayList; import java.util.List; import java.util.Collections; import java.io.ObjectInputStream; import java.io.IOException; -import javax.lang.model.element.Element; +import jdkx.lang.model.element.Element; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/NoType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/NoType.java similarity index 95% rename from src/java.compiler/share/classes/javax/lang/model/type/NoType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/NoType.java index 1114722..2bb9a0f 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/NoType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/NoType.java @@ -23,9 +23,9 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; -import javax.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.ExecutableElement; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/NullType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/NullType.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/type/NullType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/NullType.java index cc41a02..efa6d74 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/NullType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/NullType.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/PrimitiveType.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/PrimitiveType.java index e91f1ef..afc655c 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/PrimitiveType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/PrimitiveType.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/ReferenceType.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/ReferenceType.java index 9ab823e..9ee94fc 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/ReferenceType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/ReferenceType.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java b/src/java.compiler/share/classes/jdkx/lang/model/type/TypeKind.java similarity index 99% rename from src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/TypeKind.java index cd6ece8..251164d 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/TypeKind.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java b/src/java.compiler/share/classes/jdkx/lang/model/type/TypeMirror.java similarity index 97% rename from src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/TypeMirror.java index 08d7f6f..5d392df 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/TypeMirror.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/TypeMirror.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; import java.lang.annotation.Annotation; import java.util.List; -import javax.lang.model.element.*; -import javax.lang.model.util.Types; +import jdkx.lang.model.element.*; +import jdkx.lang.model.util.Types; /** * Represents a type in the Java programming language. @@ -65,7 +65,7 @@ * @jls 10.1 Array Types * @since 1.6 */ -public interface TypeMirror extends javax.lang.model.AnnotatedConstruct { +public interface TypeMirror extends jdkx.lang.model.AnnotatedConstruct { /** * {@return the {@code kind} of this type} diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java b/src/java.compiler/share/classes/jdkx/lang/model/type/TypeVariable.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/TypeVariable.java index fbb06d6..c43cf6f 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/TypeVariable.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeParameterElement; -import javax.lang.model.util.Types; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeParameterElement; +import jdkx.lang.model.util.Types; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java b/src/java.compiler/share/classes/jdkx/lang/model/type/TypeVisitor.java similarity index 96% rename from src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/TypeVisitor.java index 7172c17..789e792 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/TypeVisitor.java @@ -23,10 +23,10 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; -import javax.lang.model.element.*; -import javax.lang.model.util.*; +import jdkx.lang.model.element.*; +import jdkx.lang.model.util.*; /** * A visitor of types, in the style of the @@ -66,10 +66,10 @@ * the new language construct. * *

There are several families of classes implementing this visitor - * interface in the {@linkplain javax.lang.model.util util + * interface in the {@linkplain jdkx.lang.model.util util * package}. The families follow a naming pattern along the lines of * {@code FooVisitor}N where N indicates the - * {@linkplain javax.lang.model.SourceVersion source version} the + * {@linkplain jdkx.lang.model.SourceVersion source version} the * visitor is appropriate for. * * In particular, a {@code FooVisitor}N is expected to handle @@ -78,7 +78,7 @@ * N + 1 (or subsequent releases), {@code * FooVisitor}N may also handle that later source version; in * that case, the {@link - * javax.annotation.processing.SupportedSourceVersion + * jdkx.annotation.processing.SupportedSourceVersion * SupportedSourceVersion} annotation on the {@code * FooVisitor}N class will indicate a later version. * diff --git a/src/java.compiler/share/classes/javax/lang/model/type/UnionType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/UnionType.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/type/UnionType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/UnionType.java index a7eb2c6..792f3b6 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/UnionType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/UnionType.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; import java.util.List; diff --git a/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java b/src/java.compiler/share/classes/jdkx/lang/model/type/UnknownTypeException.java similarity index 97% rename from src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/UnknownTypeException.java index bd187d0..3967d6e 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/UnknownTypeException.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/UnknownTypeException.java @@ -23,9 +23,9 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; -import javax.lang.model.UnknownEntityException; +import jdkx.lang.model.UnknownEntityException; /** * Indicates that an unknown kind of type was encountered. This can diff --git a/src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java b/src/java.compiler/share/classes/jdkx/lang/model/type/WildcardType.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/WildcardType.java index ee1d0da..33c8337 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/WildcardType.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/WildcardType.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.type; +package jdkx.lang.model.type; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/type/package-info.java b/src/java.compiler/share/classes/jdkx/lang/model/type/package-info.java similarity index 96% rename from src/java.compiler/share/classes/javax/lang/model/type/package-info.java rename to src/java.compiler/share/classes/jdkx/lang/model/type/package-info.java index 13ec0f6..1ee857e 100644 --- a/src/java.compiler/share/classes/javax/lang/model/type/package-info.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/type/package-info.java @@ -36,7 +36,7 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé - * @see javax.lang.model.util.Types + * @see jdkx.lang.model.util.Types * @jls 4.1 The Kinds of Types and Values * @jls 4.2 Primitive Types and Values * @jls 4.3 Reference Types and Values @@ -47,4 +47,4 @@ * @jls 10.1 Array Types * @since 1.6 */ -package javax.lang.model.type; +package jdkx.lang.model.type; diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor14.java similarity index 92% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor14.java index 08a2fb5..3e4f62b 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor14.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; -import javax.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; +import jdkx.annotation.processing.SupportedSourceVersion; /** * A skeletal visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor6.java similarity index 95% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor6.java index 0bf5674..766af8a 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor6.java @@ -23,14 +23,14 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; +import jdkx.lang.model.element.*; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; -import javax.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; +import jdkx.annotation.processing.SupportedSourceVersion; /** * A skeletal visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor7.java similarity index 92% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor7.java index c66ffc9..1395c15 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor7.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; -import javax.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; +import jdkx.annotation.processing.SupportedSourceVersion; /** * A skeletal visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor8.java similarity index 92% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor8.java index 2391293..f867864 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor8.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; -import javax.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; +import jdkx.annotation.processing.SupportedSourceVersion; /** * A skeletal visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor9.java similarity index 92% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor9.java index 77ee8d9..182bdd2 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractAnnotationValueVisitor9.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; -import javax.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; +import jdkx.annotation.processing.SupportedSourceVersion; /** * A skeletal visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor14.java similarity index 91% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor14.java index dbb9e73..d85cc66 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor14.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.RecordComponentElement; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.RecordComponentElement; +import static jdkx.lang.model.SourceVersion.*; /** * A skeletal visitor of program elements with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor6.java similarity index 96% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor6.java index 38adeb0..2cb95eb 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor6.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.*; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.*; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor7.java similarity index 93% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor7.java index 509ed4e..fc81383 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor7.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor8.java similarity index 92% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor8.java index b474247..9706b14 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor8.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor9.java similarity index 91% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor9.java index a04bc6c..3291559 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractElementVisitor9.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.ModuleElement; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.ModuleElement; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor14.java similarity index 92% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor14.java index ac7ac4e..c6a7691 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor14.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A skeletal visitor of types with default behavior appropriate for the diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor6.java similarity index 95% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor6.java index 52e2686..95073f2 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor6.java @@ -23,16 +23,16 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.type.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.type.*; -import static javax.lang.model.SourceVersion.*; +import static jdkx.lang.model.SourceVersion.*; /** * A skeletal visitor of types with default behavior appropriate for - * the {@link javax.lang.model.SourceVersion#RELEASE_6 RELEASE_6} + * the {@link jdkx.lang.model.SourceVersion#RELEASE_6 RELEASE_6} * source version. * * @apiNote diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor7.java similarity index 91% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor7.java index 28cab50..381958f 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor7.java @@ -23,16 +23,16 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.type.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.type.*; -import static javax.lang.model.SourceVersion.*; +import static jdkx.lang.model.SourceVersion.*; /** * A skeletal visitor of types with default behavior appropriate for - * the {@link javax.lang.model.SourceVersion#RELEASE_7 RELEASE_7} + * the {@link jdkx.lang.model.SourceVersion#RELEASE_7 RELEASE_7} * source version. * * @param the return type of this visitor's methods. Use {@link diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor8.java similarity index 91% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor8.java index e3dff2f..06a57f7 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor8.java @@ -23,16 +23,16 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.type.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.type.*; -import static javax.lang.model.SourceVersion.*; +import static jdkx.lang.model.SourceVersion.*; /** * A skeletal visitor of types with default behavior appropriate for - * the {@link javax.lang.model.SourceVersion#RELEASE_8 RELEASE_8} + * the {@link jdkx.lang.model.SourceVersion#RELEASE_8 RELEASE_8} * source version. * * @param the return type of this visitor's methods. Use {@link diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor9.java similarity index 91% rename from src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor9.java index 3878513..cba8263 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/AbstractTypeVisitor9.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.type.*; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.type.*; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A skeletal visitor of types with default behavior appropriate for diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementFilter.java similarity index 95% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementFilter.java index e1595ba..32e6690 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementFilter.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementFilter.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; import java.util.Collections; import java.util.List; @@ -32,14 +32,14 @@ import java.util.ArrayList; import java.util.LinkedHashSet; -import javax.lang.model.element.*; -import javax.lang.model.element.ModuleElement.Directive; -import javax.lang.model.element.ModuleElement.DirectiveKind; -import javax.lang.model.element.ModuleElement.ExportsDirective; -import javax.lang.model.element.ModuleElement.OpensDirective; -import javax.lang.model.element.ModuleElement.ProvidesDirective; -import javax.lang.model.element.ModuleElement.RequiresDirective; -import javax.lang.model.element.ModuleElement.UsesDirective; +import jdkx.lang.model.element.*; +import jdkx.lang.model.element.ModuleElement.Directive; +import jdkx.lang.model.element.ModuleElement.DirectiveKind; +import jdkx.lang.model.element.ModuleElement.ExportsDirective; +import jdkx.lang.model.element.ModuleElement.OpensDirective; +import jdkx.lang.model.element.ModuleElement.ProvidesDirective; +import jdkx.lang.model.element.ModuleElement.RequiresDirective; +import jdkx.lang.model.element.ModuleElement.UsesDirective; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor14.java similarity index 95% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor14.java index e16d232..9e1fa12 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor14.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; /** * A visitor of program elements based on their {@linkplain diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor6.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor6.java index 3d40fee..6413ea4 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor6.java @@ -23,13 +23,13 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import static javax.lang.model.element.ElementKind.*; -import javax.annotation.processing.SupportedSourceVersion; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.element.*; +import static jdkx.lang.model.element.ElementKind.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor7.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor7.java index 4daef61..d68ddc5 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor7.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.*; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.*; +import static jdkx.lang.model.SourceVersion.*; /** * A visitor of program elements based on their {@linkplain diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor8.java similarity index 93% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor8.java index 59522fb..2a7aa0a 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor8.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; /** * A visitor of program elements based on their {@linkplain diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor9.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor9.java index c463c0b..94dafe6 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementKindVisitor9.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; /** * A visitor of program elements based on their {@linkplain diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner14.java similarity index 96% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner14.java index eb483c9..8fbbafa 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner14.java @@ -23,14 +23,14 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; import java.util.List; import java.util.ArrayList; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A scanning visitor of program elements with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner6.java similarity index 97% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner6.java index f19fd56..3d676cc 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner6.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner7.java similarity index 95% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner7.java index e79af27..b487c73 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner7.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner8.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner8.java index 229ab1a..ea9ba36 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner8.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner9.java similarity index 95% rename from src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner9.java index c2b6379..6da6497 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/ElementScanner9.java @@ -23,14 +23,14 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; import java.util.ArrayList; import java.util.List; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/Elements.java b/src/java.compiler/share/classes/jdkx/lang/model/util/Elements.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/util/Elements.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/Elements.java index fc94c17..fcf7239 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/Elements.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/Elements.java @@ -23,7 +23,7 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; import java.util.Collections; import java.util.List; @@ -32,8 +32,8 @@ import java.util.LinkedHashSet; import java.util.Objects; -import javax.lang.model.AnnotatedConstruct; -import javax.lang.model.element.*; +import jdkx.lang.model.AnnotatedConstruct; +import jdkx.lang.model.element.*; /** @@ -45,7 +45,7 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé - * @see javax.annotation.processing.ProcessingEnvironment#getElementUtils + * @see jdkx.annotation.processing.ProcessingEnvironment#getElementUtils * @since 1.6 */ public interface Elements { @@ -229,7 +229,7 @@ default Set getAllTypeElements(CharSequence name) { * returned. One situation where a module cannot be found is if * the environment does not include modules, such as an annotation * processing environment configured for a {@linkplain - * javax.annotation.processing.ProcessingEnvironment#getSourceVersion + * jdkx.annotation.processing.ProcessingEnvironment#getSourceVersion * source version} without modules. * * @implSpec The default implementation of this method returns @@ -251,7 +251,7 @@ default ModuleElement getModuleElement(CharSequence name) { * situation where no modules are present occurs when the * environment does not include modules, such as an annotation * processing environment configured for a {@linkplain - * javax.annotation.processing.ProcessingEnvironment#getSourceVersion + * jdkx.annotation.processing.ProcessingEnvironment#getSourceVersion * source version} without modules. * * @implSpec The default implementation of this method returns @@ -502,7 +502,7 @@ default boolean isBridge(ExecutableElement e) { * (One situation where a package may have a {@code null} module * is if the environment does not include modules, such as an * annotation processing environment configured for a {@linkplain - * javax.annotation.processing.ProcessingEnvironment#getSourceVersion + * jdkx.annotation.processing.ProcessingEnvironment#getSourceVersion * source version} without modules.) * * Otherwise, the module of an element is equal to the module @@ -543,7 +543,7 @@ default ModuleElement getModuleOf(Element e) { * @param e the element being examined * @return all annotations of the element * @see Element#getAnnotationMirrors - * @see javax.lang.model.AnnotatedConstruct + * @see jdkx.lang.model.AnnotatedConstruct */ List getAllAnnotationMirrors(Element e); diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor14.java similarity index 93% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor14.java index 347b522..4c7f5ef 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor14.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor6.java similarity index 97% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor6.java index 64bbdda..df8c9b3 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor6.java @@ -23,16 +23,16 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; import java.util.List; -import javax.lang.model.element.*; +import jdkx.lang.model.element.*; -import javax.lang.model.type.TypeMirror; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; -import javax.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.type.TypeMirror; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; +import jdkx.annotation.processing.SupportedSourceVersion; /** * A simple visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor7.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor7.java index 312f342..6afecc8 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor7.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor8.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor8.java index 257fc58..05e1bdc 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor8.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor9.java similarity index 93% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor9.java index 7574c08..68e6d7a 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleAnnotationValueVisitor9.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor for annotation values with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor14.java similarity index 93% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor14.java index 23a7f10..5ce8d73 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor14.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.RecordComponentElement; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.RecordComponentElement; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor of program elements with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor6.java similarity index 96% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor6.java index 385ace8..8986b09 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor6.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor7.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor7.java index d511dec..d3a3659 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor7.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.element.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.element.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor of program elements with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor8.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor8.java index 1908b06..5c2d9b5 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor8.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor of program elements with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor9.java similarity index 93% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor9.java index 497fed1..50e7e3f 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleElementVisitor9.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.ModuleElement; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.ModuleElement; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor of program elements with default behavior diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor14.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor14.java index 25af668..4867343 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor14.java @@ -23,11 +23,11 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor of types with default behavior appropriate for diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor6.java similarity index 97% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor6.java index 38701ee..3593e1e 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor6.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.type.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.type.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor7.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor7.java index 0e5c6ee..2824a01 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor7.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.type.*; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.type.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor of types with default behavior appropriate for the diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor8.java similarity index 93% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor8.java index 299fee1..17912d0 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor8.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.type.IntersectionType; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.type.IntersectionType; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor of types with default behavior appropriate for the diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor9.java similarity index 92% rename from src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor9.java index 3072564..d8fb202 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/SimpleTypeVisitor9.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.type.IntersectionType; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.type.IntersectionType; +import static jdkx.lang.model.SourceVersion.*; /** * A simple visitor of types with default behavior appropriate for diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor14.java similarity index 93% rename from src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor14.java index 1adc974..60241f1 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor14.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor14.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.type.*; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.type.*; +import static jdkx.lang.model.SourceVersion.*; /** * A visitor of types based on their {@linkplain TypeKind kind} with diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor6.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor6.java index 661ecdd..4cc5a3a 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor6.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.type.*; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.type.*; +import static jdkx.lang.model.SourceVersion.*; /** * A visitor of types based on their {@linkplain TypeKind kind} with diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor7.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor7.java index 637a65b..bcda821 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor7.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor7.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.lang.model.type.*; -import javax.annotation.processing.SupportedSourceVersion; -import static javax.lang.model.SourceVersion.*; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.type.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import static jdkx.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; /** * A visitor of types based on their {@linkplain TypeKind kind} with diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor8.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor8.java index bc0da84..b42bdc4 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor8.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor8.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.type.*; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.type.*; +import static jdkx.lang.model.SourceVersion.*; /** * A visitor of types based on their {@linkplain TypeKind kind} with diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor9.java similarity index 94% rename from src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor9.java index 2e7ab2c..7e96d41 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor9.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/TypeKindVisitor9.java @@ -23,12 +23,12 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; -import javax.annotation.processing.SupportedSourceVersion; -import javax.lang.model.SourceVersion; -import javax.lang.model.type.*; -import static javax.lang.model.SourceVersion.*; +import jdkx.annotation.processing.SupportedSourceVersion; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.type.*; +import static jdkx.lang.model.SourceVersion.*; /** * A visitor of types based on their {@linkplain TypeKind kind} with diff --git a/src/java.compiler/share/classes/javax/lang/model/util/Types.java b/src/java.compiler/share/classes/jdkx/lang/model/util/Types.java similarity index 98% rename from src/java.compiler/share/classes/javax/lang/model/util/Types.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/Types.java index cd1fe05..96bd652 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/Types.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/Types.java @@ -23,14 +23,14 @@ * questions. */ -package javax.lang.model.util; +package jdkx.lang.model.util; import java.lang.annotation.Annotation; import java.lang.annotation.AnnotationTypeMismatchException; import java.lang.annotation.IncompleteAnnotationException; import java.util.List; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import jdkx.lang.model.element.*; +import jdkx.lang.model.type.*; /** * Utility methods for operating on types. @@ -41,7 +41,7 @@ * @author Joseph D. Darcy * @author Scott Seligman * @author Peter von der Ahé - * @see javax.annotation.processing.ProcessingEnvironment#getTypeUtils + * @see jdkx.annotation.processing.ProcessingEnvironment#getTypeUtils * @since 1.6 */ public interface Types { diff --git a/src/java.compiler/share/classes/javax/lang/model/util/package-info.java b/src/java.compiler/share/classes/jdkx/lang/model/util/package-info.java similarity index 92% rename from src/java.compiler/share/classes/javax/lang/model/util/package-info.java rename to src/java.compiler/share/classes/jdkx/lang/model/util/package-info.java index 97489de..5192f27 100644 --- a/src/java.compiler/share/classes/javax/lang/model/util/package-info.java +++ b/src/java.compiler/share/classes/jdkx/lang/model/util/package-info.java @@ -25,8 +25,8 @@ /** * Utilities to assist in the processing of - * {@linkplain javax.lang.model.element program elements} and - * {@linkplain javax.lang.model.type types}. + * {@linkplain jdkx.lang.model.element program elements} and + * {@linkplain jdkx.lang.model.type types}. * *

Unless otherwise specified in a particular implementation, the * collections returned by methods in this package should be expected @@ -40,4 +40,4 @@ * @author Peter von der Ahé * @since 1.6 */ -package javax.lang.model.util; +package jdkx.lang.model.util; diff --git a/src/java.compiler/share/classes/javax/tools/Diagnostic.java b/src/java.compiler/share/classes/jdkx/tools/Diagnostic.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/Diagnostic.java rename to src/java.compiler/share/classes/jdkx/tools/Diagnostic.java index 2440787..de039c7 100644 --- a/src/java.compiler/share/classes/javax/tools/Diagnostic.java +++ b/src/java.compiler/share/classes/jdkx/tools/Diagnostic.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.util.Locale; diff --git a/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java b/src/java.compiler/share/classes/jdkx/tools/DiagnosticCollector.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java rename to src/java.compiler/share/classes/jdkx/tools/DiagnosticCollector.java index e1cfc33..56ad470 100644 --- a/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java +++ b/src/java.compiler/share/classes/jdkx/tools/DiagnosticCollector.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.util.ArrayList; import java.util.Collections; diff --git a/src/java.compiler/share/classes/javax/tools/DiagnosticListener.java b/src/java.compiler/share/classes/jdkx/tools/DiagnosticListener.java similarity index 98% rename from src/java.compiler/share/classes/javax/tools/DiagnosticListener.java rename to src/java.compiler/share/classes/jdkx/tools/DiagnosticListener.java index 85a15dd..a6345e0 100644 --- a/src/java.compiler/share/classes/javax/tools/DiagnosticListener.java +++ b/src/java.compiler/share/classes/jdkx/tools/DiagnosticListener.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; /** * Interface for receiving diagnostics from tools. diff --git a/src/java.compiler/share/classes/javax/tools/DocumentationTool.java b/src/java.compiler/share/classes/jdkx/tools/DocumentationTool.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/DocumentationTool.java rename to src/java.compiler/share/classes/jdkx/tools/DocumentationTool.java index b7e3af6..13f64f9 100644 --- a/src/java.compiler/share/classes/javax/tools/DocumentationTool.java +++ b/src/java.compiler/share/classes/jdkx/tools/DocumentationTool.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.io.Writer; import java.nio.charset.Charset; diff --git a/src/java.compiler/share/classes/javax/tools/FileObject.java b/src/java.compiler/share/classes/jdkx/tools/FileObject.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/FileObject.java rename to src/java.compiler/share/classes/jdkx/tools/FileObject.java index 492ca6b..4100deb 100644 --- a/src/java.compiler/share/classes/javax/tools/FileObject.java +++ b/src/java.compiler/share/classes/jdkx/tools/FileObject.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.io.IOException; import java.io.InputStream; diff --git a/src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java b/src/java.compiler/share/classes/jdkx/tools/ForwardingFileObject.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java rename to src/java.compiler/share/classes/jdkx/tools/ForwardingFileObject.java index ac776f3..c5aafc6 100644 --- a/src/java.compiler/share/classes/javax/tools/ForwardingFileObject.java +++ b/src/java.compiler/share/classes/jdkx/tools/ForwardingFileObject.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.io.IOException; import java.io.InputStream; diff --git a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java b/src/java.compiler/share/classes/jdkx/tools/ForwardingJavaFileManager.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java rename to src/java.compiler/share/classes/jdkx/tools/ForwardingJavaFileManager.java index 3d90c1e..6cbae46 100644 --- a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileManager.java +++ b/src/java.compiler/share/classes/jdkx/tools/ForwardingJavaFileManager.java @@ -23,14 +23,14 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.io.IOException; import java.util.Iterator; import java.util.Objects; import java.util.ServiceLoader; import java.util.Set; -import javax.tools.JavaFileObject.Kind; +import jdkx.tools.JavaFileObject.Kind; /** * Forwards calls to a given file manager. Subclasses of this class diff --git a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java b/src/java.compiler/share/classes/jdkx/tools/ForwardingJavaFileObject.java similarity index 95% rename from src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java rename to src/java.compiler/share/classes/jdkx/tools/ForwardingJavaFileObject.java index bf7ad8f..5826503 100644 --- a/src/java.compiler/share/classes/javax/tools/ForwardingJavaFileObject.java +++ b/src/java.compiler/share/classes/jdkx/tools/ForwardingJavaFileObject.java @@ -23,10 +23,10 @@ * questions. */ -package javax.tools; +package jdkx.tools; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; /** * Forwards calls to a given file object. Subclasses of this class diff --git a/src/java.compiler/share/classes/javax/tools/JavaCompiler.java b/src/java.compiler/share/classes/jdkx/tools/JavaCompiler.java similarity index 98% rename from src/java.compiler/share/classes/javax/tools/JavaCompiler.java rename to src/java.compiler/share/classes/jdkx/tools/JavaCompiler.java index f7c1c61..1c07303 100644 --- a/src/java.compiler/share/classes/javax/tools/JavaCompiler.java +++ b/src/java.compiler/share/classes/jdkx/tools/JavaCompiler.java @@ -23,13 +23,13 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.io.Writer; import java.nio.charset.Charset; import java.util.Locale; import java.util.concurrent.Callable; -import javax.annotation.processing.Processor; +import jdkx.annotation.processing.Processor; /** * Interface to invoke Java programming language compilers from @@ -63,8 +63,8 @@ * specifications are defined in the {@linkplain Tool} interface. * * Additionally, an instance of this interface supporting {@link - * javax.lang.model.SourceVersion#RELEASE_6 SourceVersion.RELEASE_6} - * or higher must also support {@linkplain javax.annotation.processing + * jdkx.lang.model.SourceVersion#RELEASE_6 SourceVersion.RELEASE_6} + * or higher must also support {@linkplain jdkx.annotation.processing * annotation processing}. * *

The compiler relies on two services: {@linkplain diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java b/src/java.compiler/share/classes/jdkx/tools/JavaFileManager.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/JavaFileManager.java rename to src/java.compiler/share/classes/jdkx/tools/JavaFileManager.java index 979999c..fd35386 100644 --- a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java +++ b/src/java.compiler/share/classes/jdkx/tools/JavaFileManager.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.io.Closeable; import java.io.Flushable; @@ -32,7 +32,7 @@ import java.util.ServiceLoader; import java.util.Set; -import static javax.tools.JavaFileObject.Kind; +import static jdkx.tools.JavaFileObject.Kind; /** * File manager for tools operating on Java programming language diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileObject.java b/src/java.compiler/share/classes/jdkx/tools/JavaFileObject.java similarity index 97% rename from src/java.compiler/share/classes/javax/tools/JavaFileObject.java rename to src/java.compiler/share/classes/jdkx/tools/JavaFileObject.java index 48d6388..e0c237b 100644 --- a/src/java.compiler/share/classes/javax/tools/JavaFileObject.java +++ b/src/java.compiler/share/classes/jdkx/tools/JavaFileObject.java @@ -23,10 +23,10 @@ * questions. */ -package javax.tools; +package jdkx.tools; -import javax.lang.model.element.NestingKind; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; +import jdkx.lang.model.element.Modifier; import java.util.Objects; /** diff --git a/src/java.compiler/share/classes/javax/tools/OptionChecker.java b/src/java.compiler/share/classes/jdkx/tools/OptionChecker.java similarity index 98% rename from src/java.compiler/share/classes/javax/tools/OptionChecker.java rename to src/java.compiler/share/classes/jdkx/tools/OptionChecker.java index 653cf8f..f534124 100644 --- a/src/java.compiler/share/classes/javax/tools/OptionChecker.java +++ b/src/java.compiler/share/classes/jdkx/tools/OptionChecker.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; /** * Interface for recognizing options. diff --git a/src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java b/src/java.compiler/share/classes/jdkx/tools/SimpleJavaFileObject.java similarity index 98% rename from src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java rename to src/java.compiler/share/classes/jdkx/tools/SimpleJavaFileObject.java index 9c8d491..9354a06 100644 --- a/src/java.compiler/share/classes/javax/tools/SimpleJavaFileObject.java +++ b/src/java.compiler/share/classes/jdkx/tools/SimpleJavaFileObject.java @@ -23,14 +23,14 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.io.*; import java.net.URI; import java.nio.CharBuffer; import java.util.Objects; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; /** * Provides simple implementations for most methods in JavaFileObject. diff --git a/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java b/src/java.compiler/share/classes/jdkx/tools/StandardJavaFileManager.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java rename to src/java.compiler/share/classes/jdkx/tools/StandardJavaFileManager.java index b1fee9e..7bd7aaa 100644 --- a/src/java.compiler/share/classes/javax/tools/StandardJavaFileManager.java +++ b/src/java.compiler/share/classes/jdkx/tools/StandardJavaFileManager.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.io.File; import java.io.IOException; diff --git a/src/java.compiler/share/classes/javax/tools/StandardLocation.java b/src/java.compiler/share/classes/jdkx/tools/StandardLocation.java similarity index 98% rename from src/java.compiler/share/classes/javax/tools/StandardLocation.java rename to src/java.compiler/share/classes/jdkx/tools/StandardLocation.java index afadab0..539ddc9 100644 --- a/src/java.compiler/share/classes/javax/tools/StandardLocation.java +++ b/src/java.compiler/share/classes/jdkx/tools/StandardLocation.java @@ -23,9 +23,9 @@ * questions. */ -package javax.tools; +package jdkx.tools; -import javax.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileManager.Location; import java.util.concurrent.*; diff --git a/src/java.compiler/share/classes/javax/tools/Tool.java b/src/java.compiler/share/classes/jdkx/tools/Tool.java similarity index 98% rename from src/java.compiler/share/classes/javax/tools/Tool.java rename to src/java.compiler/share/classes/jdkx/tools/Tool.java index cb9a79d..dae0624 100644 --- a/src/java.compiler/share/classes/javax/tools/Tool.java +++ b/src/java.compiler/share/classes/jdkx/tools/Tool.java @@ -23,12 +23,12 @@ * questions. */ -package javax.tools; +package jdkx.tools; import java.util.Set; import java.io.InputStream; import java.io.OutputStream; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.SourceVersion; /** * Common interface for tools that can be invoked from a program. diff --git a/src/java.compiler/share/classes/javax/tools/ToolProvider.java b/src/java.compiler/share/classes/jdkx/tools/ToolProvider.java similarity index 99% rename from src/java.compiler/share/classes/javax/tools/ToolProvider.java rename to src/java.compiler/share/classes/jdkx/tools/ToolProvider.java index 802e85c..4e04e0a 100644 --- a/src/java.compiler/share/classes/javax/tools/ToolProvider.java +++ b/src/java.compiler/share/classes/jdkx/tools/ToolProvider.java @@ -23,7 +23,7 @@ * questions. */ -package javax.tools; +package jdkx.tools; /** * Provides methods for locating tool providers, for example, * providers of compilers. This class complements the diff --git a/src/java.compiler/share/classes/javax/tools/package-info.java b/src/java.compiler/share/classes/jdkx/tools/package-info.java similarity index 89% rename from src/java.compiler/share/classes/javax/tools/package-info.java rename to src/java.compiler/share/classes/jdkx/tools/package-info.java index c5ec54e..170e656 100644 --- a/src/java.compiler/share/classes/javax/tools/package-info.java +++ b/src/java.compiler/share/classes/jdkx/tools/package-info.java @@ -42,15 +42,15 @@ * This framework allows clients of the framework to locate and run * compilers from programs. The framework also provides Service * Provider Interfaces (SPI) for structured access to diagnostics - * ({@link javax.tools.DiagnosticListener}) as well as a file + * ({@link jdkx.tools.DiagnosticListener}) as well as a file * abstraction for overriding file access ({@link - * javax.tools.JavaFileManager} and {@link - * javax.tools.JavaFileObject}). See {@link - * javax.tools.JavaCompiler} for more details on using the SPI. + * jdkx.tools.JavaFileManager} and {@link + * jdkx.tools.JavaFileObject}). See {@link + * jdkx.tools.JavaCompiler} for more details on using the SPI. * *

There is no requirement for a compiler at runtime. However, if * a default compiler is provided, it can be located using the - * {@link javax.tools.ToolProvider}, for example: + * {@link jdkx.tools.ToolProvider}, for example: * *

{@code JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();} * @@ -61,7 +61,7 @@ *

For example, if {@code com.vendor.VendorJavaCompiler} is a * provider of the {@code JavaCompiler} tool then its jar file * would contain the file {@code - * META-INF/services/javax.tools.JavaCompiler}. This file would + * META-INF/services/jdkx.tools.JavaCompiler}. This file would * contain the single line: * *

{@code com.vendor.VendorJavaCompiler} @@ -75,4 +75,4 @@ * @author Jonathan Gibbons * @since 1.6 */ -package javax.tools; +package jdkx.tools; diff --git a/src/java.compiler/share/classes/module-info.java b/src/java.compiler/share/classes/module-info.java index 1064543..5a1f272 100644 --- a/src/java.compiler/share/classes/module-info.java +++ b/src/java.compiler/share/classes/module-info.java @@ -43,15 +43,15 @@ exports javac.internal.jimage.decompressor; exports javac.internal.jmod; exports javac.internal.jrtfs; - exports javax.annotation.processing; - exports javax.lang.model; - exports javax.lang.model.element; - exports javax.lang.model.type; - exports javax.lang.model.util; - exports javax.tools; + exports jdkx.annotation.processing; + exports jdkx.lang.model; + exports jdkx.lang.model.element; + exports jdkx.lang.model.type; + exports jdkx.lang.model.util; + exports jdkx.tools; - uses javax.tools.DocumentationTool; - uses javax.tools.JavaCompiler; + uses jdkx.tools.DocumentationTool; + uses jdkx.tools.JavaCompiler; opens com.itsaky.androidide.config to jdk.compiler,jdk.jdeps; } diff --git a/src/jdk.compiler/share/classes/javac/internal/shellsupport/doc/JavadocFormatter.java b/src/jdk.compiler/share/classes/javac/internal/shellsupport/doc/JavadocFormatter.java index 68b13eb..487dafd 100644 --- a/src/jdk.compiler/share/classes/javac/internal/shellsupport/doc/JavadocFormatter.java +++ b/src/jdk.compiler/share/classes/javac/internal/shellsupport/doc/JavadocFormatter.java @@ -38,10 +38,10 @@ import java.util.ResourceBundle; import java.util.Stack; -import javax.lang.model.element.Name; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Name; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.ToolProvider; import openjdk.source.doctree.AttributeTree; import openjdk.source.doctree.DocCommentTree; diff --git a/src/jdk.compiler/share/classes/javac/internal/shellsupport/doc/JavadocHelper.java b/src/jdk.compiler/share/classes/javac/internal/shellsupport/doc/JavadocHelper.java index d46c5ea..b70ff3f 100644 --- a/src/jdk.compiler/share/classes/javac/internal/shellsupport/doc/JavadocHelper.java +++ b/src/jdk.compiler/share/classes/javac/internal/shellsupport/doc/JavadocHelper.java @@ -46,26 +46,26 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.ModuleElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.ElementFilter; -import javax.lang.model.util.Elements; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; -import javax.tools.ToolProvider; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.ModuleElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.ElementFilter; +import jdkx.lang.model.util.Elements; +import jdkx.tools.ForwardingJavaFileManager; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; +import jdkx.tools.ToolProvider; import openjdk.source.doctree.DocCommentTree; import openjdk.source.doctree.DocTree; diff --git a/src/jdk.compiler/share/classes/module-info.java b/src/jdk.compiler/share/classes/module-info.java index 514e334..cb725f2 100644 --- a/src/jdk.compiler/share/classes/module-info.java +++ b/src/jdk.compiler/share/classes/module-info.java @@ -25,7 +25,7 @@ /** * Defines the implementation of the - * {@linkplain javax.tools.ToolProvider#getSystemJavaCompiler system Java compiler} + * {@linkplain jdkx.tools.ToolProvider#getSystemJavaCompiler system Java compiler} * and its command line equivalent, {@index javac javac tool}. * *

javac

@@ -33,8 +33,8 @@ *

* This module provides the equivalent of command-line access to javac * via the {@link java.util.spi.ToolProvider ToolProvider} and - * {@link javax.tools.Tool} service provider interfaces (SPIs), - * and more flexible access via the {@link javax.tools.JavaCompiler JavaCompiler} + * {@link jdkx.tools.Tool} service provider interfaces (SPIs), + * and more flexible access via the {@link jdkx.tools.JavaCompiler JavaCompiler} * SPI.

* *

Instances of the tools can be obtained by calling @@ -43,8 +43,8 @@ * {@code "javac"}. * *

- * In addition, instances of {@link javax.tools.JavaCompiler.CompilationTask} - * obtained from {@linkplain javax.tools.JavaCompiler JavaCompiler} can be + * In addition, instances of {@link jdkx.tools.JavaCompiler.CompilationTask} + * obtained from {@linkplain jdkx.tools.JavaCompiler JavaCompiler} can be * downcast to {@link openjdk.source.util.JavacTask JavacTask} for access to * lower level aspects of javac, such as the * {@link openjdk.source.tree Abstract Syntax Tree} (AST).

@@ -59,10 +59,10 @@ * * @provides java.util.spi.ToolProvider * @provides openjdk.tools.javac.platform.PlatformProvider - * @provides javax.tools.JavaCompiler - * @provides javax.tools.Tool + * @provides jdkx.tools.JavaCompiler + * @provides jdkx.tools.Tool * - * @uses javax.annotation.processing.Processor + * @uses jdkx.annotation.processing.Processor * @uses openjdk.source.util.Plugin * @uses openjdk.tools.javac.platform.PlatformProvider * @@ -117,7 +117,7 @@ exports jdk.internal.shellsupport.doc to jdk.jshell; - uses javax.annotation.processing.Processor; + uses jdkx.annotation.processing.Processor; uses openjdk.source.util.Plugin; uses openjdk.tools.doclint.DocLint; uses openjdk.tools.javac.platform.PlatformProvider; @@ -128,10 +128,10 @@ provides openjdk.tools.javac.platform.PlatformProvider with openjdk.tools.javac.platform.JDKPlatformProvider; - provides javax.tools.JavaCompiler with + provides jdkx.tools.JavaCompiler with openjdk.tools.javac.api.JavacTool; - provides javax.tools.Tool with + provides jdkx.tools.Tool with openjdk.tools.javac.api.JavacTool; } diff --git a/src/jdk.compiler/share/classes/openjdk/source/doctree/AttributeTree.java b/src/jdk.compiler/share/classes/openjdk/source/doctree/AttributeTree.java index be32cac..f1b6399 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/doctree/AttributeTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/doctree/AttributeTree.java @@ -26,7 +26,7 @@ package openjdk.source.doctree; import java.util.List; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for an attribute in an HTML element. diff --git a/src/jdk.compiler/share/classes/openjdk/source/doctree/EndElementTree.java b/src/jdk.compiler/share/classes/openjdk/source/doctree/EndElementTree.java index 787285c..a0a1187 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/doctree/EndElementTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/doctree/EndElementTree.java @@ -25,7 +25,7 @@ package openjdk.source.doctree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for the end of an HTML element. diff --git a/src/jdk.compiler/share/classes/openjdk/source/doctree/EntityTree.java b/src/jdk.compiler/share/classes/openjdk/source/doctree/EntityTree.java index 5e5d045..104712c 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/doctree/EntityTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/doctree/EntityTree.java @@ -25,7 +25,7 @@ package openjdk.source.doctree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for an HTML entity. diff --git a/src/jdk.compiler/share/classes/openjdk/source/doctree/ErroneousTree.java b/src/jdk.compiler/share/classes/openjdk/source/doctree/ErroneousTree.java index 9a41171..60aa00e 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/doctree/ErroneousTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/doctree/ErroneousTree.java @@ -25,8 +25,8 @@ package openjdk.source.doctree; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; /** * A tree node to stand in for malformed text. diff --git a/src/jdk.compiler/share/classes/openjdk/source/doctree/IdentifierTree.java b/src/jdk.compiler/share/classes/openjdk/source/doctree/IdentifierTree.java index d6bef91..4fb55a4 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/doctree/IdentifierTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/doctree/IdentifierTree.java @@ -25,7 +25,7 @@ package openjdk.source.doctree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * An identifier in a documentation comment. diff --git a/src/jdk.compiler/share/classes/openjdk/source/doctree/StartElementTree.java b/src/jdk.compiler/share/classes/openjdk/source/doctree/StartElementTree.java index 5d543c3..69cef12 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/doctree/StartElementTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/doctree/StartElementTree.java @@ -26,7 +26,7 @@ package openjdk.source.doctree; import java.util.List; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for the start of an HTML element. diff --git a/src/jdk.compiler/share/classes/openjdk/source/doctree/SystemPropertyTree.java b/src/jdk.compiler/share/classes/openjdk/source/doctree/SystemPropertyTree.java index 56fec0d..67ae804 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/doctree/SystemPropertyTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/doctree/SystemPropertyTree.java @@ -25,7 +25,7 @@ package openjdk.source.doctree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for an {@code @systemProperty} inline tag. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/BreakTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/BreakTree.java index 95c4a90..65c3c8d 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/BreakTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/BreakTree.java @@ -25,7 +25,7 @@ package openjdk.source.tree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a {@code break} statement. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/ClassTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/ClassTree.java index 552f4b8..cd0153f 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/ClassTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/ClassTree.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.ArrayList; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a class, interface, enum, record, or annotation diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/CompilationUnitTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/CompilationUnitTree.java index f229149..09aca15 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/CompilationUnitTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/CompilationUnitTree.java @@ -26,7 +26,7 @@ package openjdk.source.tree; import java.util.List; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; /** * Represents the abstract syntax tree for ordinary compilation units diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/ContinueTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/ContinueTree.java index 4e751c0..5594a60 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/ContinueTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/ContinueTree.java @@ -25,7 +25,7 @@ package openjdk.source.tree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a {@code continue} statement. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/IdentifierTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/IdentifierTree.java index 207cdc1..c153e7c 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/IdentifierTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/IdentifierTree.java @@ -25,7 +25,7 @@ package openjdk.source.tree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for an identifier expression. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/LabeledStatementTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/LabeledStatementTree.java index 4557275..ac5dcd6 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/LabeledStatementTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/LabeledStatementTree.java @@ -25,7 +25,7 @@ package openjdk.source.tree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a labeled statement. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/MemberReferenceTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/MemberReferenceTree.java index 621230d..6fb1748 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/MemberReferenceTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/MemberReferenceTree.java @@ -27,7 +27,7 @@ import java.util.List; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a member reference expression. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/MemberSelectTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/MemberSelectTree.java index 6893288..56c773f 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/MemberSelectTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/MemberSelectTree.java @@ -25,7 +25,7 @@ package openjdk.source.tree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a member access expression. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/MethodTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/MethodTree.java index 6301167..a8942f1 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/MethodTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/MethodTree.java @@ -26,7 +26,7 @@ package openjdk.source.tree; import java.util.List; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a method or annotation type element declaration. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/ModifiersTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/ModifiersTree.java index 1d90e9d..c84261c 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/ModifiersTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/ModifiersTree.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Set; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; /** * A tree node for the modifiers, including annotations, for a declaration. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/PrimitiveTypeTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/PrimitiveTypeTree.java index e626a37..6128493 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/PrimitiveTypeTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/PrimitiveTypeTree.java @@ -25,7 +25,7 @@ package openjdk.source.tree; -import javax.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeKind; /** * A tree node for a primitive type. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/Scope.java b/src/jdk.compiler/share/classes/openjdk/source/tree/Scope.java index c80c561..65b8924 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/Scope.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/Scope.java @@ -25,9 +25,9 @@ package openjdk.source.tree; -import javax.lang.model.element.Element; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; /** * Interface for determining locally available program elements, such as diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/TypeParameterTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/TypeParameterTree.java index d1aaf7e..b1c9dd5 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/TypeParameterTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/TypeParameterTree.java @@ -26,7 +26,7 @@ package openjdk.source.tree; import java.util.List; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a type parameter. diff --git a/src/jdk.compiler/share/classes/openjdk/source/tree/VariableTree.java b/src/jdk.compiler/share/classes/openjdk/source/tree/VariableTree.java index 5d84f2e..9892bcb 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/tree/VariableTree.java +++ b/src/jdk.compiler/share/classes/openjdk/source/tree/VariableTree.java @@ -25,7 +25,7 @@ package openjdk.source.tree; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; /** * A tree node for a variable declaration. diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/DocSourcePositions.java b/src/jdk.compiler/share/classes/openjdk/source/util/DocSourcePositions.java index b175572..beb3e19 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/DocSourcePositions.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/DocSourcePositions.java @@ -41,7 +41,7 @@ public interface DocSourcePositions extends SourcePositions { /** * Returns the starting position of the tree within the comment within the file. If tree is not found within * file, or if the starting position is not available, - * returns {@link javax.tools.Diagnostic#NOPOS}. + * returns {@link jdkx.tools.Diagnostic#NOPOS}. * The given tree should be under the given comment tree, and the given documentation * comment tree should be returned from a {@link DocTrees#getDocCommentTree(openjdk.source.util.TreePath) } * for a tree under the given file. @@ -65,7 +65,7 @@ public interface DocSourcePositions extends SourcePositions { /** * Returns the ending position of the tree within the comment within the file. If tree is not found within * file, or if the ending position is not available, - * returns {@link javax.tools.Diagnostic#NOPOS}. + * returns {@link jdkx.tools.Diagnostic#NOPOS}. * The given tree should be under the given comment tree, and the given documentation * comment tree should be returned from a {@link DocTrees#getDocCommentTree(openjdk.source.util.TreePath) } * for a tree under the given file. diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/DocTreeFactory.java b/src/jdk.compiler/share/classes/openjdk/source/util/DocTreeFactory.java index f364773..b566948 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/DocTreeFactory.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/DocTreeFactory.java @@ -27,9 +27,9 @@ import java.util.List; -import javax.lang.model.element.Name; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Name; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; import openjdk.source.doctree.AttributeTree; import openjdk.source.doctree.AttributeTree.ValueKind; @@ -413,7 +413,7 @@ default SummaryTree newSummaryTree(List summary) { /** * Sets the position to be recorded in subsequent tree nodes created by this factory. * The position should be a character offset relative to the beginning of the source file - * or {@link javax.tools.Diagnostic#NOPOS NOPOS}. + * or {@link jdkx.tools.Diagnostic#NOPOS NOPOS}. * @param pos the position * @return this object, to facilitate method chaining */ diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/DocTrees.java b/src/jdk.compiler/share/classes/openjdk/source/util/DocTrees.java index d0f0e5c..0936742 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/DocTrees.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/DocTrees.java @@ -29,13 +29,13 @@ import java.text.BreakIterator; import java.util.List; -import javax.annotation.processing.ProcessingEnvironment; -import javax.lang.model.element.Element; -import javax.lang.model.element.PackageElement; -import javax.lang.model.type.TypeMirror; -import javax.tools.Diagnostic; -import javax.tools.FileObject; -import javax.tools.JavaCompiler.CompilationTask; +import jdkx.annotation.processing.ProcessingEnvironment; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.PackageElement; +import jdkx.lang.model.type.TypeMirror; +import jdkx.tools.Diagnostic; +import jdkx.tools.FileObject; +import jdkx.tools.JavaCompiler.CompilationTask; import openjdk.source.doctree.DocCommentTree; import openjdk.source.doctree.DocTree; diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/JavacTask.java b/src/jdk.compiler/share/classes/openjdk/source/util/JavacTask.java index 4cec814..479b09e 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/JavacTask.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/JavacTask.java @@ -27,13 +27,13 @@ import java.io.IOException; -import javax.lang.model.element.Element; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.Elements; -import javax.lang.model.util.Types; -import javax.tools.JavaCompiler.CompilationTask; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.Elements; +import jdkx.lang.model.util.Types; +import jdkx.tools.JavaCompiler.CompilationTask; +import jdkx.tools.JavaFileObject; import openjdk.source.tree.CompilationUnitTree; import openjdk.source.tree.Tree; @@ -130,7 +130,7 @@ public abstract Iterable parse() * {@code ParameterNameProvider}, which won't be queried any more. * * When no {@code ParameterNameProvider} is set, or when it returns null from - * {@link ParameterNameProvider#getParameterName(javax.lang.model.element.VariableElement)}, + * {@link ParameterNameProvider#getParameterName(jdkx.lang.model.element.VariableElement)}, * an automatically synthesized name is returned from {@code VariableElement.getSimpleName()}. * * @implSpec The default implementation of this method does nothing. diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/ParameterNameProvider.java b/src/jdk.compiler/share/classes/openjdk/source/util/ParameterNameProvider.java index c949df3..ef4f853 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/ParameterNameProvider.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/ParameterNameProvider.java @@ -25,7 +25,7 @@ package openjdk.source.util; -import javax.lang.model.element.VariableElement; +import jdkx.lang.model.element.VariableElement; /** * A provider for parameter names when the parameter names are not determined from diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/Plugin.java b/src/jdk.compiler/share/classes/openjdk/source/util/Plugin.java index e8b701a..24f10af 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/Plugin.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/Plugin.java @@ -26,7 +26,7 @@ package openjdk.source.util; import java.util.ServiceLoader; -import javax.tools.StandardLocation; +import jdkx.tools.StandardLocation; /** * The interface for a javac plug-in. diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/SourcePositions.java b/src/jdk.compiler/share/classes/openjdk/source/util/SourcePositions.java index 6e9035a..d0c3b8b 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/SourcePositions.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/SourcePositions.java @@ -40,7 +40,7 @@ public interface SourcePositions { /** * Returns the starting position of tree within file. If tree is not found within * file, or if the starting position is not available, - * returns {@link javax.tools.Diagnostic#NOPOS}. + * returns {@link jdkx.tools.Diagnostic#NOPOS}. * The returned position must be at the start of the yield of this tree, that * is for any sub-tree of this tree, the following must hold: * @@ -59,7 +59,7 @@ public interface SourcePositions { /** * Returns the ending position of tree within file. If tree is not found within * file, or if the ending position is not available, - * returns {@link javax.tools.Diagnostic#NOPOS}. + * returns {@link jdkx.tools.Diagnostic#NOPOS}. * The returned position must be at the end of the yield of this tree, * that is for any sub-tree of this tree, the following must hold: * diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/TaskEvent.java b/src/jdk.compiler/share/classes/openjdk/source/util/TaskEvent.java index 6acbb1e..7db97c6 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/TaskEvent.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/TaskEvent.java @@ -25,8 +25,8 @@ package openjdk.source.util; -import javax.lang.model.element.TypeElement; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.JavaFileObject; import openjdk.source.tree.CompilationUnitTree; diff --git a/src/jdk.compiler/share/classes/openjdk/source/util/Trees.java b/src/jdk.compiler/share/classes/openjdk/source/util/Trees.java index e3ce575..43b2ffb 100644 --- a/src/jdk.compiler/share/classes/openjdk/source/util/Trees.java +++ b/src/jdk.compiler/share/classes/openjdk/source/util/Trees.java @@ -27,17 +27,17 @@ import java.lang.reflect.Method; -import javax.annotation.processing.ProcessingEnvironment; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.Element; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ErrorType; -import javax.lang.model.type.TypeMirror; -import javax.tools.Diagnostic; -import javax.tools.JavaCompiler.CompilationTask; +import jdkx.annotation.processing.ProcessingEnvironment; +import jdkx.lang.model.element.AnnotationMirror; +import jdkx.lang.model.element.AnnotationValue; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.ErrorType; +import jdkx.lang.model.type.TypeMirror; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaCompiler.CompilationTask; import openjdk.source.tree.CatchTree; import openjdk.source.tree.ClassTree; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/doclint/Checker.java b/src/jdk.compiler/share/classes/openjdk/tools/doclint/Checker.java index c3c4007..3c3e7eb 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/doclint/Checker.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/doclint/Checker.java @@ -41,15 +41,15 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Name; -import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.tools.Diagnostic.Kind; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Name; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.tools.Diagnostic.Kind; +import jdkx.tools.JavaFileObject; import openjdk.source.doctree.AttributeTree; import openjdk.source.doctree.AuthorTree; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/doclint/Env.java b/src/jdk.compiler/share/classes/openjdk/tools/doclint/Env.java index 8980a4f..83c2a1e 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/doclint/Env.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/doclint/Env.java @@ -33,14 +33,14 @@ import java.util.Set; import java.util.regex.Pattern; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.Elements; -import javax.lang.model.util.Types; -import javax.tools.Diagnostic.Kind; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.Elements; +import jdkx.lang.model.util.Types; +import jdkx.tools.Diagnostic.Kind; import openjdk.source.doctree.DocCommentTree; import openjdk.source.tree.CompilationUnitTree; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/doclint/HtmlTag.java b/src/jdk.compiler/share/classes/openjdk/tools/doclint/HtmlTag.java index bde2a22..df7d80d 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/doclint/HtmlTag.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/doclint/HtmlTag.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.lang.model.element.Name; +import jdkx.lang.model.element.Name; import openjdk.tools.javac.util.StringUtils; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/doclint/Messages.java b/src/jdk.compiler/share/classes/openjdk/tools/doclint/Messages.java index 3cd2010..82b7a75 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/doclint/Messages.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/doclint/Messages.java @@ -37,7 +37,7 @@ import java.util.TreeMap; import java.util.TreeSet; -import javax.tools.Diagnostic; +import jdkx.tools.Diagnostic; import openjdk.source.doctree.DocTree; import openjdk.source.tree.Tree; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/BasicJavacTask.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/BasicJavacTask.java index b28bd76..306bfeb 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/BasicJavacTask.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/BasicJavacTask.java @@ -33,12 +33,12 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.processing.Processor; -import javax.lang.model.element.Element; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.Elements; -import javax.lang.model.util.Types; -import javax.tools.JavaFileObject; +import jdkx.annotation.processing.Processor; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.Elements; +import jdkx.lang.model.util.Types; +import jdkx.tools.JavaFileObject; import openjdk.source.tree.CompilationUnitTree; import openjdk.source.tree.Tree; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/ClassNamesForFileOraculum.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/ClassNamesForFileOraculum.java index 0b2f315..a996526 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/ClassNamesForFileOraculum.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/ClassNamesForFileOraculum.java @@ -25,7 +25,7 @@ package openjdk.tools.javac.api; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; /** *

This is NOT part of any API supported by Sun Microsystems. diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/ClientCodeWrapper.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/ClientCodeWrapper.java index c839bc2..68c5a9a 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/ClientCodeWrapper.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/ClientCodeWrapper.java @@ -49,15 +49,15 @@ import java.util.ServiceLoader; import java.util.Set; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticListener; -import javax.tools.FileObject; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardJavaFileManager; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.FileObject; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardJavaFileManager; import openjdk.source.util.TaskEvent; import openjdk.source.util.TaskListener; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/DiagnosticFormatter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/DiagnosticFormatter.java index 4e12b9c..eeb504a 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/DiagnosticFormatter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/DiagnosticFormatter.java @@ -27,7 +27,7 @@ import java.util.Locale; import java.util.Set; -import javax.tools.Diagnostic; +import jdkx.tools.Diagnostic; import openjdk.tools.javac.api.DiagnosticFormatter.*; /** diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/DuplicateClassChecker.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/DuplicateClassChecker.java index 9061058..3d9d782 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/DuplicateClassChecker.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/DuplicateClassChecker.java @@ -24,8 +24,8 @@ */ package openjdk.tools.javac.api; -import javax.lang.model.element.Name; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Name; +import jdkx.tools.JavaFileObject; /** * diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacScope.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacScope.java index a08ce7a..c4d7ca1 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacScope.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacScope.java @@ -26,9 +26,9 @@ package openjdk.tools.javac.api; import java.util.function.Predicate; -import javax.lang.model.element.Element; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; import openjdk.tools.javac.code.Kinds.Kind; import openjdk.tools.javac.code.Scope.CompoundScope; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTaskImpl.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTaskImpl.java index a2646cb..20397f3 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTaskImpl.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTaskImpl.java @@ -31,10 +31,10 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.processing.Processor; -import javax.lang.model.element.Element; -import javax.lang.model.element.TypeElement; -import javax.tools.*; +import jdkx.annotation.processing.Processor; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.*; import openjdk.source.tree.*; import openjdk.source.util.SourcePositions; @@ -180,8 +180,8 @@ private Pair invocationHelper(Callable c) { // to forward errors thrown from an annotation processor // ClientCodeException is thrown from ClientCodeWrapper, // to forward errors thrown from user-supplied code for Compiler API - // as specified by javax.tools.JavaCompiler#getTask - // and javax.tools.JavaCompiler.CompilationTask#call + // as specified by jdkx.tools.JavaCompiler#getTask + // and jdkx.tools.JavaCompiler.CompilationTask#call throw new RuntimeException(e.getCause()); } catch (PropagatedException e) { throw e.getCause(); diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTaskPool.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTaskPool.java index 8c1517b..b9a0af8 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTaskPool.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTaskPool.java @@ -40,11 +40,11 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardLocation; import openjdk.source.tree.ClassTree; import openjdk.source.tree.CompilationUnitTree; @@ -126,7 +126,7 @@ public JavacTaskPool(int maxPoolSize) { this.maxPoolSize = maxPoolSize; } - /**Creates a new task as if by {@link javax.tools.JavaCompiler#getTask} and runs the provided + /**Creates a new task as if by {@link jdkx.tools.JavaCompiler#getTask} and runs the provided * worker with it. The task is only valid while the worker is running. The internal structures * may be reused from some previous compilation. * diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTool.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTool.java index b6e2b81..cd9da5c 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTool.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTool.java @@ -37,8 +37,8 @@ import java.util.Objects; import java.util.Set; -import javax.lang.model.SourceVersion; -import javax.tools.*; +import jdkx.lang.model.SourceVersion; +import jdkx.tools.*; import com.itsaky.androidide.config.JavacConfigProvider; import openjdk.source.util.JavacTask; @@ -71,8 +71,8 @@ public final class JavacTool implements JavaCompiler { * Constructor used by service provider mechanism. The recommended way to * obtain an instance of this class is by using {@link #create} or the * service provider mechanism. - * @see javax.tools.JavaCompiler - * @see javax.tools.ToolProvider + * @see jdkx.tools.JavaCompiler + * @see jdkx.tools.ToolProvider * @see #create */ @Deprecated diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTrees.java index 80429fb..4fd2611 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTrees.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/JavacTrees.java @@ -35,27 +35,27 @@ import java.util.Set; import java.util.WeakHashMap; -import javax.annotation.processing.ProcessingEnvironment; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.lang.model.element.PackageElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.tools.Diagnostic; -import javax.tools.FileObject; -import javax.tools.ForwardingFileObject; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardLocation; +import jdkx.annotation.processing.ProcessingEnvironment; +import jdkx.lang.model.element.AnnotationMirror; +import jdkx.lang.model.element.AnnotationValue; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; +import jdkx.lang.model.element.PackageElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.tools.Diagnostic; +import jdkx.tools.FileObject; +import jdkx.tools.ForwardingFileObject; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardLocation; import openjdk.source.doctree.DocCommentTree; import openjdk.source.doctree.DocTree; @@ -1303,7 +1303,7 @@ protected Copier createCopier(TreeMaker maker) { * noType (type.tag == NONE) is returned if there is no original type. */ @Override @DefinedBy(Api.COMPILER_TREE) - public TypeMirror getOriginalType(javax.lang.model.type.ErrorType errorType) { + public TypeMirror getOriginalType(jdkx.lang.model.type.ErrorType errorType) { if (errorType instanceof openjdk.tools.javac.code.Type.ErrorType) { return ((openjdk.tools.javac.code.Type.ErrorType)errorType).getOriginalType(); } diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/WrappingJavaFileManager.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/WrappingJavaFileManager.java index b025ca1..b920869 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/api/WrappingJavaFileManager.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/api/WrappingJavaFileManager.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.Set; -import javax.tools.*; -import javax.tools.JavaFileObject.Kind; +import jdkx.tools.*; +import jdkx.tools.JavaFileObject.Kind; import openjdk.tools.javac.util.ClientCodeException; import openjdk.tools.javac.util.DefinedBy; @@ -44,7 +44,7 @@ * might override some of these methods and might also provide * additional fields and methods. * - *

This class might be moved to {@link javax.tools} in a future + *

This class might be moved to {@link jdkx.tools} in a future * release. * *

This is NOT part of any supported API. diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/AnnoConstruct.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/AnnoConstruct.java index 0f64f04..1cba8af 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/AnnoConstruct.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/AnnoConstruct.java @@ -31,7 +31,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.lang.model.AnnotatedConstruct; +import jdkx.lang.model.AnnotatedConstruct; import openjdk.tools.javac.model.AnnotationProxyMaker; import openjdk.tools.javac.util.DefinedBy; @@ -58,7 +58,7 @@ public abstract class AnnoConstruct implements AnnotatedConstruct { public abstract List getAnnotationMirrors(); - // This method is part of the javax.lang.model API, do not use this in javac code. + // This method is part of the jdkx.lang.model API, do not use this in javac code. protected Attribute.Compound getAttribute(Class annoType) { String name = annoType.getName(); @@ -77,7 +77,7 @@ protected A[] getInheritedAnnotations(Class annoType) } - // This method is part of the javax.lang.model API, do not use this in javac code. + // This method is part of the jdkx.lang.model API, do not use this in javac code. @DefinedBy(Api.LANGUAGE_MODEL) public A[] getAnnotationsByType(Class annoType) { @@ -174,7 +174,7 @@ private Attribute.Compound[] unpackContained(Attribute.Compound container) { return compounds.toArray(new Attribute.Compound[compounds.size()]); } - // This method is part of the javax.lang.model API, do not use this in javac code. + // This method is part of the jdkx.lang.model API, do not use this in javac code. @DefinedBy(Api.LANGUAGE_MODEL) public A getAnnotation(Class annoType) { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Attribute.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Attribute.java index f1d091c..574a78e 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Attribute.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Attribute.java @@ -27,10 +27,10 @@ import java.util.LinkedHashMap; import java.util.Map; -import javax.lang.model.element.AnnotationMirror; -import javax.lang.model.element.AnnotationValue; -import javax.lang.model.element.AnnotationValueVisitor; -import javax.lang.model.type.DeclaredType; +import jdkx.lang.model.element.AnnotationMirror; +import jdkx.lang.model.element.AnnotationValue; +import jdkx.lang.model.element.AnnotationValueVisitor; +import jdkx.lang.model.type.DeclaredType; import openjdk.tools.javac.code.Symbol.*; import openjdk.tools.javac.util.*; import openjdk.tools.javac.util.DefinedBy.Api; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/ClassFinder.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/ClassFinder.java index dacc8ec..e26318e 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/ClassFinder.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/ClassFinder.java @@ -35,13 +35,13 @@ import java.util.Set; import java.util.function.Supplier; -import javax.lang.model.SourceVersion; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; +import jdkx.lang.model.SourceVersion; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; import openjdk.tools.javac.api.ClassNamesForFileOraculum; import openjdk.tools.javac.code.Scope.WriteableScope; @@ -61,7 +61,7 @@ import openjdk.tools.javac.resources.CompilerProperties.Fragments; import openjdk.tools.javac.util.*; -import static javax.tools.StandardLocation.*; +import static jdkx.tools.StandardLocation.*; import static openjdk.tools.javac.code.Flags.*; import static openjdk.tools.javac.code.Kinds.Kind.*; @@ -342,7 +342,7 @@ private void completeOwners(Symbol o) { * Tries to complete lexically enclosing classes if c looks like a * nested class. This is similar to completeOwners but handles * the situation when a nested class is accessed directly as it is - * possible with the Tree API or javax.lang.model.*. + * possible with the Tree API or jdkx.lang.model.*. */ private void completeEnclosing(ClassSymbol c) { if (c.owner.kind == PCK) { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Directive.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Directive.java index f0f239d..85bc68c 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Directive.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Directive.java @@ -30,8 +30,8 @@ import java.util.Locale; import java.util.Set; -import javax.lang.model.element.ModuleElement; -import javax.lang.model.element.ModuleElement.DirectiveVisitor; +import jdkx.lang.model.element.ModuleElement; +import jdkx.lang.model.element.ModuleElement.DirectiveVisitor; import openjdk.tools.javac.api.Messages; import openjdk.tools.javac.code.Symbol.ClassSymbol; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Flags.java index 389301c..108e07b 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Flags.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Flags.java @@ -31,7 +31,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; import openjdk.tools.javac.util.Assert; import openjdk.tools.javac.util.StringUtils; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/ModuleFinder.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/ModuleFinder.java index 1bd649e..4207735 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/ModuleFinder.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/ModuleFinder.java @@ -32,11 +32,11 @@ import java.util.NoSuchElementException; import java.util.Set; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardLocation; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardLocation; import openjdk.tools.javac.code.Symbol.ClassSymbol; import openjdk.tools.javac.code.Symbol.Completer; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Preview.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Preview.java index f1ea7d3..72523f4 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Preview.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Preview.java @@ -40,7 +40,7 @@ import openjdk.tools.javac.util.MandatoryWarningHandler; import openjdk.tools.javac.util.Options; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Source.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Source.java index 1fe8936..1b3a34b 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Source.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Source.java @@ -27,8 +27,8 @@ import java.util.*; -import javax.lang.model.SourceVersion; -import static javax.lang.model.SourceVersion.*; +import jdkx.lang.model.SourceVersion; +import static jdkx.lang.model.SourceVersion.*; import com.itsaky.androidide.config.JavacConfigProvider; import openjdk.tools.javac.jvm.Target; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Symbol.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Symbol.java index 0b6c1be..68ea8ca 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Symbol.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Symbol.java @@ -36,21 +36,21 @@ import java.util.function.Supplier; import java.util.function.Predicate; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ElementVisitor; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.ModuleElement; -import javax.lang.model.element.NestingKind; -import javax.lang.model.element.PackageElement; -import javax.lang.model.element.RecordComponentElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.TypeParameterElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.util.ElementScanner14; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ElementVisitor; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.ModuleElement; +import jdkx.lang.model.element.NestingKind; +import jdkx.lang.model.element.PackageElement; +import jdkx.lang.model.element.RecordComponentElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.element.TypeParameterElement; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.util.ElementScanner14; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.Kinds.Kind; import openjdk.tools.javac.comp.Annotate.AnnotationTypeMetadata; @@ -728,7 +728,7 @@ public Name getSimpleName() { /** * This is the implementation for {@code - * javax.lang.model.element.Element.getAnnotationMirrors()}. + * jdkx.lang.model.element.Element.getAnnotationMirrors()}. */ @Override @DefinedBy(Api.LANGUAGE_MODEL) public List getAnnotationMirrors() { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Symtab.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Symtab.java index 3cabb56..32e3c85 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Symtab.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Symtab.java @@ -32,7 +32,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import javax.lang.model.element.ElementVisitor; +import jdkx.lang.model.element.ElementVisitor; import openjdk.tools.javac.code.Scope.WriteableScope; import openjdk.tools.javac.code.Source.Feature; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Type.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Type.java index d41422b..4d46b0a 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Type.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Type.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.function.Predicate; -import javax.lang.model.type.*; +import jdkx.lang.model.type.*; import openjdk.tools.javac.code.Symbol.*; import openjdk.tools.javac.code.TypeMetadata.Entry; @@ -684,7 +684,7 @@ public R accept(TypeVisitor v, P p) { } public static class JCPrimitiveType extends Type - implements javax.lang.model.type.PrimitiveType { + implements jdkx.lang.model.type.PrimitiveType { TypeTag tag; @@ -818,7 +818,7 @@ public TypeKind getKind() { } public static class WildcardType extends Type - implements javax.lang.model.type.WildcardType { + implements jdkx.lang.model.type.WildcardType { public Type type; public BoundKind kind; @@ -946,7 +946,7 @@ public R accept(TypeVisitor v, P p) { } public static class ClassType extends Type implements DeclaredType, openjdk.tools.javac.jvm.PoolConstant.LoadableConstant, - javax.lang.model.type.ErrorType { + jdkx.lang.model.type.ErrorType { /** The enclosing type of this type. If this is the type of an inner * class, outer_field refers to the type of its enclosing @@ -1302,7 +1302,7 @@ public R accept(TypeVisitor v, P p) { } public static class ArrayType extends Type - implements openjdk.tools.javac.jvm.PoolConstant.LoadableConstant, javax.lang.model.type.ArrayType { + implements openjdk.tools.javac.jvm.PoolConstant.LoadableConstant, jdkx.lang.model.type.ArrayType { public Type elemtype; @@ -2336,7 +2336,7 @@ public boolean isNullOrReference() { } public static class ErrorType extends ClassType - implements javax.lang.model.type.ErrorType { + implements jdkx.lang.model.type.ErrorType { private Type originalType = null; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/TypeAnnotations.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/TypeAnnotations.java index 1c01313..c3d70e9 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/TypeAnnotations.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/TypeAnnotations.java @@ -25,10 +25,10 @@ package openjdk.tools.javac.code; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.type.TypeKind; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.type.TypeKind; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.Attribute.TypeCompound; import openjdk.tools.javac.code.Symbol.ClassSymbol; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/TypeTag.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/TypeTag.java index 5c0a0d4..5415a2c 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/TypeTag.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/TypeTag.java @@ -27,7 +27,7 @@ import openjdk.source.tree.Tree.Kind; -import javax.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeKind; import static openjdk.tools.javac.code.TypeTag.NumericClasses.*; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Types.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Types.java index fb99701..b67981b 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Types.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/code/Types.java @@ -38,7 +38,7 @@ import java.util.function.Predicate; import java.util.stream.Collector; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.Attribute.RetentionPolicy; import openjdk.tools.javac.code.Lint.LintCategory; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Annotate.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Annotate.java index 4dcbd4e..ac44006 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Annotate.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Annotate.java @@ -45,7 +45,7 @@ import openjdk.tools.javac.util.JCDiagnostic.DiagnosticPosition; import openjdk.tools.javac.util.List; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import java.util.*; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Attr.java index 4225ed5..6109c41 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Attr.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Attr.java @@ -28,8 +28,8 @@ import java.util.*; import java.util.function.BiConsumer; -import javax.lang.model.element.ElementKind; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.ElementKind; +import jdkx.tools.JavaFileObject; import openjdk.source.tree.CaseTree; import openjdk.source.tree.IdentifierTree; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Check.java index 94a071c..22f4be7 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Check.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Check.java @@ -29,9 +29,9 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import javax.lang.model.element.NestingKind; -import javax.tools.JavaFileManager; -import javax.lang.model.element.ElementKind; +import jdkx.lang.model.element.NestingKind; +import jdkx.tools.JavaFileManager; +import jdkx.lang.model.element.ElementKind; import openjdk.source.tree.CaseTree; import openjdk.tools.javac.code.*; @@ -2875,7 +2875,7 @@ private boolean isEffectivelyNonPublic(Symbol sym) { private boolean belongsToRestrictedPackage(Symbol sym) { String fullName = sym.packge().fullname.toString(); return fullName.startsWith("java.") || - fullName.startsWith("javax.") || + fullName.startsWith("jdkx.") || fullName.startsWith("sun.") || fullName.contains(".internal."); } diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Enter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Enter.java index d4dfa19..efbbe81 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Enter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Enter.java @@ -30,12 +30,12 @@ import java.util.Map; import java.util.Optional; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.element.VariableElement; -import javax.lang.model.util.ElementScanner14; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileManager; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.element.VariableElement; +import jdkx.lang.model.util.ElementScanner14; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileManager; import openjdk.tools.javac.api.DuplicateClassChecker; import openjdk.tools.javac.code.*; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/LambdaToMethod.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/LambdaToMethod.java index cee63f5..95e4282 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/LambdaToMethod.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/LambdaToMethod.java @@ -71,8 +71,8 @@ import static openjdk.tools.javac.code.TypeTag.*; import static openjdk.tools.javac.tree.JCTree.Tag.*; -import javax.lang.model.element.ElementKind; -import javax.lang.model.type.TypeKind; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.type.TypeKind; import openjdk.tools.javac.main.Option; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/MemberEnter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/MemberEnter.java index 84cbfed..a80ee2a 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/MemberEnter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/MemberEnter.java @@ -27,8 +27,8 @@ import java.util.EnumSet; import java.util.Set; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.Modifier; import openjdk.tools.javac.code.*; import openjdk.tools.javac.code.Scope.WriteableScope; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Modules.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Modules.java index 2317195..78d36f0 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Modules.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Modules.java @@ -44,12 +44,12 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.lang.model.SourceVersion; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardLocation; +import jdkx.lang.model.SourceVersion; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardLocation; import openjdk.source.tree.ModuleTree.ModuleKind; import openjdk.tools.javac.code.ClassFinder; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Repair.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Repair.java index 93f60da..5d78aee 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Repair.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Repair.java @@ -76,8 +76,8 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Logger; -import javax.lang.model.element.ElementKind; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.ElementKind; +import jdkx.tools.JavaFileObject; /** diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Resolve.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Resolve.java index 1624869..5414c7c 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Resolve.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Resolve.java @@ -71,7 +71,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import javax.lang.model.element.ElementVisitor; +import jdkx.lang.model.element.ElementVisitor; import static openjdk.tools.javac.code.Flags.*; import static openjdk.tools.javac.code.Flags.BLOCK; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Todo.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Todo.java index 4ab2299..cf28315 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Todo.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/Todo.java @@ -34,7 +34,7 @@ import java.util.LinkedList; import java.util.Map; import java.util.Queue; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.util.Context; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/TypeEnter.java index 05e9cb8..ff9170d 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/TypeEnter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/comp/TypeEnter.java @@ -31,7 +31,7 @@ import java.util.function.BiConsumer; import java.util.stream.Collectors; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.*; import openjdk.tools.javac.code.Lint.LintCategory; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/BaseFileManager.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/BaseFileManager.java index 8362162..c1e1c04 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/BaseFileManager.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/BaseFileManager.java @@ -48,9 +48,9 @@ import java.util.Objects; import java.util.Set; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; import openjdk.tools.javac.main.Option; import openjdk.tools.javac.main.OptionHelper; @@ -92,7 +92,7 @@ public void setContext(Context context) { // This is to accommodate clients which save references to Symbols created for use // within doclets or annotation processors, and which then attempt to use those // references after the tool exits, having closed any internally managed file manager. - // Ideally, such clients should run the tool via the javax.tools API, providing their + // Ideally, such clients should run the tool via the jdkx.tools API, providing their // own file manager, which can be closed by the client when all use of that file // manager is complete. // If the option has a numeric value, it will be interpreted as the duration, @@ -119,7 +119,7 @@ protected Locations createLocations() { public Log log; /** - * User provided charset (through javax.tools). + * User provided charset (through jdkx.tools). */ protected Charset charset; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/JRTIndex.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/JRTIndex.java index a0ad997..43844ed 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/JRTIndex.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/JRTIndex.java @@ -45,7 +45,7 @@ import java.util.ResourceBundle; import java.util.Set; -import javax.tools.FileObject; +import jdkx.tools.FileObject; import com.itsaky.androidide.config.JavacConfigProvider; import com.itsaky.androidide.zipfs2.AndroidFsProvider; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/JavacFileManager.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/JavacFileManager.java index 35d340c..014b9cd 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/JavacFileManager.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/JavacFileManager.java @@ -62,11 +62,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.lang.model.SourceVersion; -import javax.tools.FileObject; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; +import jdkx.lang.model.SourceVersion; +import jdkx.tools.FileObject; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardJavaFileManager; import openjdk.tools.javac.file.RelativePath.RelativeDirectory; import openjdk.tools.javac.file.RelativePath.RelativeFile; @@ -85,7 +85,7 @@ import static java.nio.file.FileVisitOption.FOLLOW_LINKS; import java.util.Optional; -import static javax.tools.StandardLocation.*; +import static jdkx.tools.StandardLocation.*; /** * This class provides access to the source, class and other files used by the @@ -1346,7 +1346,7 @@ protected static boolean isRelativeUri(String u) { * @return a relative URI * @throws IllegalArgumentException if the file name is not relative * according to the definition given in {@link - * javax.tools.JavaFileManager#getFileForInput} + * jdkx.tools.JavaFileManager#getFileForInput} */ public static String getRelativeName(File file) { if (!file.isAbsolute()) { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/Locations.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/Locations.java index 8e66cd3..0fa6180 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/Locations.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/Locations.java @@ -69,13 +69,13 @@ import java.util.jar.Attributes; import java.util.jar.Manifest; -import javax.lang.model.SourceVersion; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardJavaFileManager.PathFactory; -import javax.tools.StandardLocation; +import jdkx.lang.model.SourceVersion; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardJavaFileManager.PathFactory; +import jdkx.tools.StandardLocation; import com.itsaky.androidide.config.JavacConfigProvider; @@ -94,8 +94,8 @@ import openjdk.tools.javac.util.Pair; import openjdk.tools.javac.util.StringUtils; -import static javax.tools.StandardLocation.SYSTEM_MODULES; -import static javax.tools.StandardLocation.PLATFORM_CLASS_PATH; +import static jdkx.tools.StandardLocation.SYSTEM_MODULES; +import static jdkx.tools.StandardLocation.PLATFORM_CLASS_PATH; import static openjdk.tools.javac.main.Option.BOOT_CLASS_PATH; import static openjdk.tools.javac.main.Option.ENDORSEDDIRS; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/PathFileObject.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/PathFileObject.java index 4265bf2..614329f 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/PathFileObject.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/PathFileObject.java @@ -45,10 +45,10 @@ import java.text.Normalizer; import java.util.Objects; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.FileObject; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; +import jdkx.tools.FileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.file.RelativePath.RelativeFile; import openjdk.tools.javac.util.DefinedBy; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/RelativePath.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/RelativePath.java index 9b6beb5..2802285 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/file/RelativePath.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/file/RelativePath.java @@ -31,7 +31,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; /** * Used to represent a platform-neutral path within a platform-specific diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ClassReader.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ClassReader.java index 6e6f2aa..c415f99 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ClassReader.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ClassReader.java @@ -38,10 +38,10 @@ import java.util.Set; import java.util.function.IntFunction; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.Source.Feature; import openjdk.tools.javac.comp.Annotate; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ClassWriter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ClassWriter.java index f62a83b..2a56210 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ClassWriter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ClassWriter.java @@ -32,10 +32,10 @@ import java.util.LinkedHashSet; import java.util.function.ToIntFunction; -import javax.tools.JavaFileManager; -import javax.tools.FileObject; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileManager; +import jdkx.tools.FileObject; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.*; import openjdk.tools.javac.code.Attribute.RetentionPolicy; @@ -59,7 +59,7 @@ import static openjdk.tools.javac.code.TypeTag.*; import static openjdk.tools.javac.main.Option.*; -import static javax.tools.StandardLocation.CLASS_OUTPUT; +import static jdkx.tools.StandardLocation.CLASS_OUTPUT; /** This class provides operations to map an internal symbol table graph * rooted in a ClassSymbol into a classfile. diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/Gen.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/Gen.java index 4d12367..b3d6300 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/Gen.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/Gen.java @@ -1914,8 +1914,8 @@ public void visitConditional(JCConditional tree) { private void setTypeAnnotationPositions(int treePos) { MethodSymbol meth = code.meth; - boolean initOrClinit = code.meth.getKind() == javax.lang.model.element.ElementKind.CONSTRUCTOR - || code.meth.getKind() == javax.lang.model.element.ElementKind.STATIC_INIT; + boolean initOrClinit = code.meth.getKind() == jdkx.lang.model.element.ElementKind.CONSTRUCTOR + || code.meth.getKind() == jdkx.lang.model.element.ElementKind.STATIC_INIT; for (Attribute.TypeCompound ta : meth.getRawTypeAttributes()) { if (ta.hasUnknownPosition()) diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/JNIWriter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/JNIWriter.java index 3a0a542..e8a7771 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/JNIWriter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/JNIWriter.java @@ -31,10 +31,10 @@ import java.util.Collections; import java.util.List; -import javax.tools.FileObject; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.StandardLocation; +import jdkx.tools.FileObject; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.StandardLocation; import openjdk.tools.javac.code.Attribute; import openjdk.tools.javac.code.Flags; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ModuleNameReader.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ModuleNameReader.java index ef34c6a..0d94d75 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ModuleNameReader.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/jvm/ModuleNameReader.java @@ -33,7 +33,7 @@ import java.nio.file.Files; import java.nio.file.Path; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import static openjdk.tools.javac.jvm.ClassFile.*; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/launcher/Main.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/launcher/Main.java index 7124937..5371806 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/launcher/Main.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/launcher/Main.java @@ -67,16 +67,16 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.NestingKind; -import javax.lang.model.element.TypeElement; -import javax.tools.FileObject; -import javax.tools.ForwardingJavaFileManager; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.SimpleJavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.NestingKind; +import jdkx.lang.model.element.TypeElement; +import jdkx.tools.FileObject; +import jdkx.tools.ForwardingJavaFileManager; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.SimpleJavaFileObject; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; import openjdk.source.util.JavacTask; import openjdk.source.util.TaskEvent; @@ -88,7 +88,7 @@ import jdk.internal.misc.VM; -import static javax.tools.JavaFileObject.Kind.SOURCE; +import static jdkx.tools.JavaFileObject.Kind.SOURCE; /** * Compiles a source file, and executes the main method it contains. diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Arguments.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Arguments.java index 5abc5ec..82e5897 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Arguments.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Arguments.java @@ -43,13 +43,13 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import javax.lang.model.SourceVersion; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; +import jdkx.lang.model.SourceVersion; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; import openjdk.tools.doclint.DocLint; import openjdk.tools.javac.code.Lint.LintCategory; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/DelegatingJavaFileManager.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/DelegatingJavaFileManager.java index b45f465..7dc87ce 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/DelegatingJavaFileManager.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/DelegatingJavaFileManager.java @@ -33,12 +33,12 @@ import java.util.ServiceLoader; import java.util.Set; -import javax.tools.FileObject; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardJavaFileManager; +import jdkx.tools.FileObject; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardJavaFileManager; import openjdk.tools.javac.util.Context; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/JavaCompiler.java index c5e1195..61c91af 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/JavaCompiler.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/JavaCompiler.java @@ -39,14 +39,14 @@ import java.util.Set; import java.util.function.Function; -import javax.annotation.processing.Processor; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.ElementVisitor; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardLocation; +import jdkx.annotation.processing.Processor; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.ElementVisitor; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardLocation; import openjdk.source.util.TaskEvent; import openjdk.tools.javac.api.DuplicateClassChecker; @@ -92,7 +92,7 @@ import static openjdk.tools.javac.util.JCDiagnostic.DiagnosticFlag.*; import java.util.Iterator; -import static javax.tools.StandardLocation.CLASS_OUTPUT; +import static jdkx.tools.StandardLocation.CLASS_OUTPUT; import openjdk.tools.javac.tree.JCTree.JCModuleDecl; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Main.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Main.java index a01f9b5..6609216 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Main.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Main.java @@ -45,7 +45,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.tools.JavaFileManager; +import jdkx.tools.JavaFileManager; import openjdk.tools.javac.api.BasicJavacTask; import openjdk.tools.javac.file.CacheFSInfo; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Option.java index b3a3648..44fba01 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Option.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/main/Option.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.SourceVersion; import openjdk.tools.doclint.DocLint; import openjdk.tools.javac.code.Lint; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/model/AnnotationProxyMaker.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/model/AnnotationProxyMaker.java index ba8d622..e8ef337 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/model/AnnotationProxyMaker.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/model/AnnotationProxyMaker.java @@ -35,9 +35,9 @@ import java.util.stream.Collectors; import sun.reflect.annotation.*; -import javax.lang.model.type.MirroredTypeException; -import javax.lang.model.type.MirroredTypesException; -import javax.lang.model.type.TypeMirror; +import jdkx.lang.model.type.MirroredTypeException; +import jdkx.lang.model.type.MirroredTypesException; +import jdkx.lang.model.type.TypeMirror; import openjdk.tools.javac.code.*; import openjdk.tools.javac.code.Symbol.*; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/model/JavacElements.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/model/JavacElements.java index 30cf8b4..f416663 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/model/JavacElements.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/model/JavacElements.java @@ -35,12 +35,12 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.lang.model.AnnotatedConstruct; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.*; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.util.Elements; -import static javax.lang.model.util.ElementFilter.methodsIn; +import jdkx.lang.model.AnnotatedConstruct; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.*; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.util.Elements; +import static jdkx.lang.model.util.ElementFilter.methodsIn; import openjdk.source.util.JavacTask; import openjdk.tools.javac.api.JavacTaskImpl; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/model/JavacTypes.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/model/JavacTypes.java index e4903b6..0d1512a 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/model/JavacTypes.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/model/JavacTypes.java @@ -33,8 +33,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.lang.model.element.*; -import javax.lang.model.type.*; +import jdkx.lang.model.element.*; +import jdkx.lang.model.type.*; import openjdk.tools.javac.code.*; import openjdk.tools.javac.code.Symbol.*; @@ -52,7 +52,7 @@ * risk. This code and its internal interfaces are subject to change * or deletion without notice.

*/ -public class JavacTypes implements javax.lang.model.util.Types { +public class JavacTypes implements jdkx.lang.model.util.Types { private final Symtab syms; private final Types types; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/platform/JDKPlatformProvider.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/platform/JDKPlatformProvider.java index 64f66e1..05d0dda 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/platform/JDKPlatformProvider.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/platform/JDKPlatformProvider.java @@ -52,14 +52,14 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.annotation.processing.Processor; -import javax.tools.ForwardingJavaFileObject; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; +import jdkx.annotation.processing.Processor; +import jdkx.tools.ForwardingJavaFileObject; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; import openjdk.source.util.Plugin; import openjdk.tools.javac.code.Source; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/platform/PlatformDescription.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/platform/PlatformDescription.java index 719094c..ce5c3f9 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/platform/PlatformDescription.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/platform/PlatformDescription.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.processing.Processor; -import javax.tools.JavaFileManager; +import jdkx.annotation.processing.Processor; +import jdkx.tools.JavaFileManager; import openjdk.source.util.Plugin; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacFiler.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacFiler.java index 681de09..f8103d1 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacFiler.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacFiler.java @@ -39,17 +39,17 @@ import static java.util.Collections.*; -import javax.annotation.processing.*; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.NestingKind; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.tools.*; -import javax.tools.JavaFileManager.Location; - -import static javax.tools.StandardLocation.SOURCE_OUTPUT; -import static javax.tools.StandardLocation.CLASS_OUTPUT; +import jdkx.annotation.processing.*; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.NestingKind; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.tools.*; +import jdkx.tools.JavaFileManager.Location; + +import static jdkx.tools.StandardLocation.SOURCE_OUTPUT; +import static jdkx.tools.StandardLocation.CLASS_OUTPUT; import openjdk.tools.javac.code.Lint; import openjdk.tools.javac.code.Symbol.ClassSymbol; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacMessager.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacMessager.java index 9ecf1ac..535a422 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacMessager.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacMessager.java @@ -35,10 +35,10 @@ import openjdk.tools.javac.tree.JCTree; import openjdk.tools.javac.tree.JCTree.*; import java.util.Set; -import javax.lang.model.element.*; -import javax.tools.JavaFileObject; -import javax.tools.Diagnostic; -import javax.annotation.processing.*; +import jdkx.lang.model.element.*; +import jdkx.tools.JavaFileObject; +import jdkx.tools.Diagnostic; +import jdkx.annotation.processing.*; /** * An implementation of the Messager built on top of log. diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacProcessingEnvironment.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacProcessingEnvironment.java index 759af8e..940d09d 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacProcessingEnvironment.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacProcessingEnvironment.java @@ -39,16 +39,16 @@ import java.util.regex.*; import java.util.stream.Collectors; -import javax.annotation.processing.*; -import javax.lang.model.SourceVersion; -import javax.lang.model.element.*; -import javax.lang.model.util.*; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardJavaFileManager; - -import static javax.tools.StandardLocation.*; +import jdkx.annotation.processing.*; +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.*; +import jdkx.lang.model.util.*; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardJavaFileManager; + +import static jdkx.tools.StandardLocation.*; import openjdk.source.util.TaskEvent; import openjdk.tools.javac.api.MultiTaskListener; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacRoundEnvironment.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacRoundEnvironment.java index 300dfab..b6c3357 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacRoundEnvironment.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/JavacRoundEnvironment.java @@ -26,9 +26,9 @@ package openjdk.tools.javac.processing; import java.lang.annotation.Annotation; -import javax.annotation.processing.*; -import javax.lang.model.element.*; -import javax.lang.model.util.*; +import jdkx.annotation.processing.*; +import jdkx.lang.model.element.*; +import jdkx.lang.model.util.*; import java.util.*; import openjdk.tools.javac.code.Source.Feature; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/PrintingProcessor.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/PrintingProcessor.java index 506b176..3f82fee 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/PrintingProcessor.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/processing/PrintingProcessor.java @@ -25,14 +25,14 @@ package openjdk.tools.javac.processing; -import javax.annotation.processing.*; -import javax.lang.model.*; -import javax.lang.model.element.*; -import static javax.lang.model.element.ElementKind.*; -import static javax.lang.model.element.NestingKind.*; -import static javax.lang.model.element.ModuleElement.*; -import javax.lang.model.type.*; -import javax.lang.model.util.*; +import jdkx.annotation.processing.*; +import jdkx.lang.model.*; +import jdkx.lang.model.element.*; +import static jdkx.lang.model.element.ElementKind.*; +import static jdkx.lang.model.element.NestingKind.*; +import static jdkx.lang.model.element.ModuleElement.*; +import jdkx.lang.model.type.*; +import jdkx.lang.model.util.*; import java.io.PrintWriter; import java.io.Writer; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler.properties index c4c5961..44b2f2f 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler.properties +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler.properties @@ -42,7 +42,7 @@ # path a path # profile a profile name # source a source version number, such as 1.5, 1.6, 1.7, taken from a openjdk.tools.javac.code.Source -# source version a source version number, such as 1.5, 1.6, 1.7, taken from a javax.lang.model.SourceVersion +# source version a source version number, such as 1.5, 1.6, 1.7, taken from a jdkx.lang.model.SourceVersion # string a general string # symbol the name of a declared type # symbol kind the kind of a symbol (i.e. method, variable) @@ -1116,7 +1116,7 @@ compiler.err.proc.processor.not.found=\ # 0: string compiler.err.proc.processor.wrong.type=\ - Annotation processor ''{0}'' does not implement javax.annotation.processing.Processor + Annotation processor ''{0}'' does not implement jdkx.annotation.processing.Processor compiler.err.proc.service.problem=\ Error creating a service loader to load Processors. @@ -1694,7 +1694,7 @@ compiler.note.proc.messager=\ # 0: string, 1: string, 2: string compiler.note.multiple.elements=\ - Multiple elements named ''{1}'' in modules ''{2}'' were found by javax.lang.model.util.Elements.{0}. + Multiple elements named ''{1}'' in modules ''{2}'' were found by jdkx.lang.model.util.Elements.{0}. ##### diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler_ja.properties b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler_ja.properties index 1b72894..3ac9788 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler_ja.properties +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler_ja.properties @@ -42,7 +42,7 @@ # path a path # profile a profile name # source a source version number, such as 1.5, 1.6, 1.7, taken from a openjdk.tools.javac.code.Source -# source version a source version number, such as 1.5, 1.6, 1.7, taken from a javax.lang.model.SourceVersion +# source version a source version number, such as 1.5, 1.6, 1.7, taken from a jdkx.lang.model.SourceVersion # string a general string # symbol the name of a declared type # symbol kind the kind of a symbol (i.e. method, variable) @@ -799,7 +799,7 @@ compiler.err.proc.processor.cant.instantiate=\u30d7\u30ed\u30bb\u30c3\u30b5''{0} compiler.err.proc.processor.not.found=\u6ce8\u91c8\u30d7\u30ed\u30bb\u30c3\u30b5''{0}''\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093 # 0: string -compiler.err.proc.processor.wrong.type=\u6ce8\u91c8\u30d7\u30ed\u30bb\u30c3\u30b5''{0}''\u304cjavax.annotation.processing.Processor\u3092\u5b9f\u88c5\u3057\u3066\u3044\u307e\u305b\u3093 +compiler.err.proc.processor.wrong.type=\u6ce8\u91c8\u30d7\u30ed\u30bb\u30c3\u30b5''{0}''\u304cjdkx.annotation.processing.Processor\u3092\u5b9f\u88c5\u3057\u3066\u3044\u307e\u305b\u3093 compiler.err.proc.service.problem=\u30d7\u30ed\u30bb\u30c3\u30b5\u3092\u30ed\u30fc\u30c9\u3059\u308b\u305f\u3081\u306e\u30b5\u30fc\u30d3\u30b9\u30fb\u30ed\u30fc\u30c0\u30fc\u3092\u4f5c\u6210\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 @@ -1206,7 +1206,7 @@ compiler.note.preview.plural.additional=\u4e00\u90e8\u306e\u5165\u529b\u30d5\u30 compiler.note.proc.messager={0} # 0: string, 1: string, 2: string -compiler.note.multiple.elements=\u30e2\u30b8\u30e5\u30fc\u30eb''{2}''\u306b''{1}\u3068\u3044\u3046\u540d\u524d\u306e\u8907\u6570\u306e\u8981\u7d20\u304cjavax.lang.model.util.Elements.{0}\u306b\u3088\u3063\u3066\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002 +compiler.note.multiple.elements=\u30e2\u30b8\u30e5\u30fc\u30eb''{2}''\u306b''{1}\u3068\u3044\u3046\u540d\u524d\u306e\u8907\u6570\u306e\u8981\u7d20\u304cjdkx.lang.model.util.Elements.{0}\u306b\u3088\u3063\u3066\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002 ##### diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler_zh_CN.properties b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler_zh_CN.properties index e7aee91..849c781 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler_zh_CN.properties +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/compiler_zh_CN.properties @@ -42,7 +42,7 @@ # path a path # profile a profile name # source a source version number, such as 1.5, 1.6, 1.7, taken from a openjdk.tools.javac.code.Source -# source version a source version number, such as 1.5, 1.6, 1.7, taken from a javax.lang.model.SourceVersion +# source version a source version number, such as 1.5, 1.6, 1.7, taken from a jdkx.lang.model.SourceVersion # string a general string # symbol the name of a declared type # symbol kind the kind of a symbol (i.e. method, variable) @@ -785,7 +785,7 @@ compiler.err.proc.processor.cant.instantiate=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u590 compiler.err.proc.processor.not.found=\u627E\u4E0D\u5230\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' # 0: string -compiler.err.proc.processor.wrong.type=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' \u672A\u5B9E\u73B0 javax.annotation.processing.Processor +compiler.err.proc.processor.wrong.type=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F ''{0}'' \u672A\u5B9E\u73B0 jdkx.annotation.processing.Processor compiler.err.proc.service.problem=\u521B\u5EFA\u670D\u52A1\u52A0\u8F7D\u5668\u4EE5\u52A0\u8F7D\u5904\u7406\u7A0B\u5E8F\u65F6\u51FA\u9519\u3002 @@ -1189,7 +1189,7 @@ compiler.note.preview.plural.additional=\u67D0\u4E9B\u8F93\u5165\u6587\u4EF6\u8F compiler.note.proc.messager={0} # 0: string, 1: string, 2: string -compiler.note.multiple.elements=\u901A\u8FC7 javax.lang.model.util.Elements.{0} \u5728\u6A21\u5757 ''{2}'' \u4E2D\u627E\u5230\u4E86\u591A\u4E2A\u540D\u4E3A ''{1}'' \u7684\u5143\u7D20\u3002 +compiler.note.multiple.elements=\u901A\u8FC7 jdkx.lang.model.util.Elements.{0} \u5728\u6A21\u5757 ''{2}'' \u4E2D\u627E\u5230\u4E86\u591A\u4E2A\u540D\u4E3A ''{1}'' \u7684\u5143\u7D20\u3002 ##### diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/ct.properties b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/ct.properties index 6d499c7..013565c 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/ct.properties +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/ct.properties @@ -54,8 +54,8 @@ openjdk.corba.se.impl.interceptors.*: proprietary openjdk.corba.se.impl.io.*: proprietary openjdk.corba.se.impl.ior.*: proprietary openjdk.corba.se.impl.ior.iiop.*: proprietary -openjdk.corba.se.impl.javax.rmi.*: proprietary -openjdk.corba.se.impl.javax.rmi.CORBA.*: proprietary +openjdk.corba.se.impl.jdkx.rmi.*: proprietary +openjdk.corba.se.impl.jdkx.rmi.CORBA.*: proprietary openjdk.corba.se.impl.legacy.connection.*: proprietary openjdk.corba.se.impl.logging.*: proprietary openjdk.corba.se.impl.monitoring.*: proprietary @@ -523,64 +523,64 @@ java.util.regex.*: compact1 java.util.spi.*: compact1 java.util.stream.*: compact1 java.util.zip.*: compact1 -javax.annotation.processing.*: compact3 -javax.lang.model.*: compact3 -javax.lang.model.element.*: compact3 -javax.lang.model.type.*: compact3 -javax.lang.model.util.*: compact3 -javax.management.*: compact3 -javax.management.loading.*: compact3 -javax.management.modelmbean.*: compact3 -javax.management.monitor.*: compact3 -javax.management.openmbean.*: compact3 -javax.management.relation.*: compact3 -javax.management.remote.*: compact3 -javax.management.remote.rmi.*: compact3 -javax.management.timer.*: compact3 -javax.naming.*: compact3 -javax.naming.directory.*: compact3 -javax.naming.event.*: compact3 -javax.naming.ldap.*: compact3 -javax.naming.spi.*: compact3 -javax.net.*: compact1 -javax.net.ssl.*: compact1 -javax.rmi.ssl.*: compact2 -javax.script.*: compact1 -javax.security.auth.*: compact1 -javax.security.auth.callback.*: compact1 -javax.security.auth.kerberos.*: compact3 -javax.security.auth.login.*: compact1 -javax.security.auth.spi.*: compact1 -javax.security.auth.x500.*: compact1 -javax.security.cert.*: compact1 -javax.security.sasl.*: compact3 -javax.smartcardio.*: compact3 -javax.sql.*: compact2 -javax.sql.rowset.*: compact3 -javax.sql.rowset.serial.*: compact3 -javax.sql.rowset.spi.*: compact3 -javax.tools.*: compact3 -javax.transaction.xa.*: compact2 -javax.xml.*: compact2 -javax.xml.crypto.*: compact3 -javax.xml.crypto.dom.*: compact3 -javax.xml.crypto.dsig.*: compact3 -javax.xml.crypto.dsig.dom.*: compact3 -javax.xml.crypto.dsig.keyinfo.*: compact3 -javax.xml.crypto.dsig.spec.*: compact3 -javax.xml.datatype.*: compact2 -javax.xml.namespace.*: compact2 -javax.xml.parsers.*: compact2 -javax.xml.stream.*: compact2 -javax.xml.stream.events.*: compact2 -javax.xml.stream.util.*: compact2 -javax.xml.transform.*: compact2 -javax.xml.transform.dom.*: compact2 -javax.xml.transform.sax.*: compact2 -javax.xml.transform.stax.*: compact2 -javax.xml.transform.stream.*: compact2 -javax.xml.validation.*: compact2 -javax.xml.xpath.*: compact2 +jdkx.annotation.processing.*: compact3 +jdkx.lang.model.*: compact3 +jdkx.lang.model.element.*: compact3 +jdkx.lang.model.type.*: compact3 +jdkx.lang.model.util.*: compact3 +jdkx.management.*: compact3 +jdkx.management.loading.*: compact3 +jdkx.management.modelmbean.*: compact3 +jdkx.management.monitor.*: compact3 +jdkx.management.openmbean.*: compact3 +jdkx.management.relation.*: compact3 +jdkx.management.remote.*: compact3 +jdkx.management.remote.rmi.*: compact3 +jdkx.management.timer.*: compact3 +jdkx.naming.*: compact3 +jdkx.naming.directory.*: compact3 +jdkx.naming.event.*: compact3 +jdkx.naming.ldap.*: compact3 +jdkx.naming.spi.*: compact3 +jdkx.net.*: compact1 +jdkx.net.ssl.*: compact1 +jdkx.rmi.ssl.*: compact2 +jdkx.script.*: compact1 +jdkx.security.auth.*: compact1 +jdkx.security.auth.callback.*: compact1 +jdkx.security.auth.kerberos.*: compact3 +jdkx.security.auth.login.*: compact1 +jdkx.security.auth.spi.*: compact1 +jdkx.security.auth.x500.*: compact1 +jdkx.security.cert.*: compact1 +jdkx.security.sasl.*: compact3 +jdkx.smartcardio.*: compact3 +jdkx.sql.*: compact2 +jdkx.sql.rowset.*: compact3 +jdkx.sql.rowset.serial.*: compact3 +jdkx.sql.rowset.spi.*: compact3 +jdkx.tools.*: compact3 +jdkx.transaction.xa.*: compact2 +jdkx.xml.*: compact2 +jdkx.xml.crypto.*: compact3 +jdkx.xml.crypto.dom.*: compact3 +jdkx.xml.crypto.dsig.*: compact3 +jdkx.xml.crypto.dsig.dom.*: compact3 +jdkx.xml.crypto.dsig.keyinfo.*: compact3 +jdkx.xml.crypto.dsig.spec.*: compact3 +jdkx.xml.datatype.*: compact2 +jdkx.xml.namespace.*: compact2 +jdkx.xml.parsers.*: compact2 +jdkx.xml.stream.*: compact2 +jdkx.xml.stream.events.*: compact2 +jdkx.xml.stream.util.*: compact2 +jdkx.xml.transform.*: compact2 +jdkx.xml.transform.dom.*: compact2 +jdkx.xml.transform.sax.*: compact2 +jdkx.xml.transform.stax.*: compact2 +jdkx.xml.transform.stream.*: compact2 +jdkx.xml.validation.*: compact2 +jdkx.xml.xpath.*: compact2 jdk.*: compact1 jdk.internal.org.objectweb.asm.*: hidden jdk.internal.org.objectweb.asm.commons.*: hidden diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/legacy.properties b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/legacy.properties index 8e98674..fed5ad8 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/legacy.properties +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/resources/legacy.properties @@ -35,8 +35,8 @@ openjdk.corba.se.impl.interceptors = tiger legacy openjdk.corba.se.impl.io = tiger legacy openjdk.corba.se.impl.ior = tiger legacy openjdk.corba.se.impl.ior.iiop = tiger legacy -openjdk.corba.se.impl.javax.rmi = tiger legacy -openjdk.corba.se.impl.javax.rmi.CORBA = tiger legacy +openjdk.corba.se.impl.jdkx.rmi = tiger legacy +openjdk.corba.se.impl.jdkx.rmi.CORBA = tiger legacy openjdk.corba.se.impl.legacy.connection = tiger legacy openjdk.corba.se.impl.logging = tiger legacy openjdk.corba.se.impl.monitoring = tiger legacy @@ -318,90 +318,90 @@ java.util.logging = tiger legacy java.util.prefs = tiger legacy java.util.regex = tiger legacy java.util.zip = tiger legacy -javax.accessibility = tiger legacy -javax.activity = tiger legacy -javax.imageio = tiger legacy -javax.imageio.event = tiger legacy -javax.imageio.metadata = tiger legacy -javax.imageio.plugins.bmp = tiger legacy -javax.imageio.plugins.jpeg = tiger legacy -javax.imageio.spi = tiger legacy -javax.imageio.stream = tiger legacy -javax.management = tiger legacy -javax.management.loading = tiger legacy -javax.management.modelmbean = tiger legacy -javax.management.monitor = tiger legacy -javax.management.openmbean = tiger legacy -javax.management.relation = tiger legacy -javax.management.remote = tiger legacy -javax.management.remote.rmi = tiger legacy -javax.management.timer = tiger legacy -javax.naming = tiger legacy -javax.naming.directory = tiger legacy -javax.naming.event = tiger legacy -javax.naming.ldap = tiger legacy -javax.naming.spi = tiger legacy -javax.net = tiger legacy -javax.net.ssl = tiger legacy -javax.print = tiger legacy -javax.print.attribute = tiger legacy -javax.print.attribute.standard = tiger legacy -javax.print.event = tiger legacy -javax.rmi = tiger legacy -javax.rmi.CORBA = tiger legacy -javax.rmi.ssl = tiger legacy -javax.security.auth = tiger legacy -javax.security.auth.callback = tiger legacy -javax.security.auth.kerberos = tiger legacy -javax.security.auth.login = tiger legacy -javax.security.auth.spi = tiger legacy -javax.security.auth.x500 = tiger legacy -javax.security.cert = tiger legacy -javax.security.sasl = tiger legacy -javax.sound.midi = tiger legacy -javax.sound.midi.spi = tiger legacy -javax.sound.sampled = tiger legacy -javax.sound.sampled.spi = tiger legacy -javax.sql = tiger legacy -javax.sql.rowset = tiger legacy -javax.sql.rowset.serial = tiger legacy -javax.sql.rowset.spi = tiger legacy -javax.swing = tiger legacy -javax.swing.border = tiger legacy -javax.swing.colorchooser = tiger legacy -javax.swing.event = tiger legacy -javax.swing.filechooser = tiger legacy -javax.swing.plaf = tiger legacy -javax.swing.plaf.basic = tiger legacy -javax.swing.plaf.basic.icons = tiger legacy -javax.swing.plaf.metal = tiger legacy -javax.swing.plaf.metal.icons = tiger legacy -javax.swing.plaf.metal.icons.ocean = tiger legacy -javax.swing.plaf.metal.sounds = tiger legacy -javax.swing.plaf.multi = tiger legacy -javax.swing.plaf.nimbus = tiger legacy -javax.swing.plaf.synth = tiger legacy -javax.swing.table = tiger legacy -javax.swing.text = tiger legacy -javax.swing.text.html = tiger legacy -javax.swing.text.html.icons = tiger legacy -javax.swing.text.html.parser = tiger legacy -javax.swing.text.rtf = tiger legacy -javax.swing.text.rtf.charsets = tiger legacy -javax.swing.tree = tiger legacy -javax.swing.undo = tiger legacy -javax.transaction = tiger legacy -javax.transaction.xa = tiger legacy -javax.xml = tiger legacy -javax.xml.datatype = tiger legacy -javax.xml.namespace = tiger legacy -javax.xml.parsers = tiger legacy -javax.xml.transform = tiger legacy -javax.xml.transform.dom = tiger legacy -javax.xml.transform.sax = tiger legacy -javax.xml.transform.stream = tiger legacy -javax.xml.validation = tiger legacy -javax.xml.xpath = tiger legacy +jdkx.accessibility = tiger legacy +jdkx.activity = tiger legacy +jdkx.imageio = tiger legacy +jdkx.imageio.event = tiger legacy +jdkx.imageio.metadata = tiger legacy +jdkx.imageio.plugins.bmp = tiger legacy +jdkx.imageio.plugins.jpeg = tiger legacy +jdkx.imageio.spi = tiger legacy +jdkx.imageio.stream = tiger legacy +jdkx.management = tiger legacy +jdkx.management.loading = tiger legacy +jdkx.management.modelmbean = tiger legacy +jdkx.management.monitor = tiger legacy +jdkx.management.openmbean = tiger legacy +jdkx.management.relation = tiger legacy +jdkx.management.remote = tiger legacy +jdkx.management.remote.rmi = tiger legacy +jdkx.management.timer = tiger legacy +jdkx.naming = tiger legacy +jdkx.naming.directory = tiger legacy +jdkx.naming.event = tiger legacy +jdkx.naming.ldap = tiger legacy +jdkx.naming.spi = tiger legacy +jdkx.net = tiger legacy +jdkx.net.ssl = tiger legacy +jdkx.print = tiger legacy +jdkx.print.attribute = tiger legacy +jdkx.print.attribute.standard = tiger legacy +jdkx.print.event = tiger legacy +jdkx.rmi = tiger legacy +jdkx.rmi.CORBA = tiger legacy +jdkx.rmi.ssl = tiger legacy +jdkx.security.auth = tiger legacy +jdkx.security.auth.callback = tiger legacy +jdkx.security.auth.kerberos = tiger legacy +jdkx.security.auth.login = tiger legacy +jdkx.security.auth.spi = tiger legacy +jdkx.security.auth.x500 = tiger legacy +jdkx.security.cert = tiger legacy +jdkx.security.sasl = tiger legacy +jdkx.sound.midi = tiger legacy +jdkx.sound.midi.spi = tiger legacy +jdkx.sound.sampled = tiger legacy +jdkx.sound.sampled.spi = tiger legacy +jdkx.sql = tiger legacy +jdkx.sql.rowset = tiger legacy +jdkx.sql.rowset.serial = tiger legacy +jdkx.sql.rowset.spi = tiger legacy +jdkx.swing = tiger legacy +jdkx.swing.border = tiger legacy +jdkx.swing.colorchooser = tiger legacy +jdkx.swing.event = tiger legacy +jdkx.swing.filechooser = tiger legacy +jdkx.swing.plaf = tiger legacy +jdkx.swing.plaf.basic = tiger legacy +jdkx.swing.plaf.basic.icons = tiger legacy +jdkx.swing.plaf.metal = tiger legacy +jdkx.swing.plaf.metal.icons = tiger legacy +jdkx.swing.plaf.metal.icons.ocean = tiger legacy +jdkx.swing.plaf.metal.sounds = tiger legacy +jdkx.swing.plaf.multi = tiger legacy +jdkx.swing.plaf.nimbus = tiger legacy +jdkx.swing.plaf.synth = tiger legacy +jdkx.swing.table = tiger legacy +jdkx.swing.text = tiger legacy +jdkx.swing.text.html = tiger legacy +jdkx.swing.text.html.icons = tiger legacy +jdkx.swing.text.html.parser = tiger legacy +jdkx.swing.text.rtf = tiger legacy +jdkx.swing.text.rtf.charsets = tiger legacy +jdkx.swing.tree = tiger legacy +jdkx.swing.undo = tiger legacy +jdkx.transaction = tiger legacy +jdkx.transaction.xa = tiger legacy +jdkx.xml = tiger legacy +jdkx.xml.datatype = tiger legacy +jdkx.xml.namespace = tiger legacy +jdkx.xml.parsers = tiger legacy +jdkx.xml.transform = tiger legacy +jdkx.xml.transform.dom = tiger legacy +jdkx.xml.transform.sax = tiger legacy +jdkx.xml.transform.stream = tiger legacy +jdkx.xml.validation = tiger legacy +jdkx.xml.xpath = tiger legacy org.ietf.jgss = tiger legacy org.omg.CORBA = tiger legacy org.omg.CORBA.DynAnyPackage = tiger legacy @@ -431,7 +431,7 @@ org.omg.PortableServer.ServantLocatorPackage = tiger legacy org.omg.PortableServer.portable = tiger legacy org.omg.SendingContext = tiger legacy org.omg.stub.java.rmi = tiger legacy -org.omg.stub.javax.management.remote.rmi = tiger legacy +org.omg.stub.jdkx.management.remote.rmi = tiger legacy org.w3c.dom = tiger legacy org.w3c.dom.bootstrap = tiger legacy org.w3c.dom.css = tiger legacy diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/DCTree.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/DCTree.java index 9cf594e..e153ed2 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/DCTree.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/DCTree.java @@ -25,7 +25,7 @@ package openjdk.tools.javac.tree; -import javax.tools.Diagnostic; +import jdkx.tools.Diagnostic; import openjdk.source.doctree.*; import openjdk.tools.javac.code.Symbol; @@ -42,8 +42,8 @@ import java.io.StringWriter; import java.util.List; -import javax.lang.model.element.Name; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Name; +import jdkx.tools.JavaFileObject; /** *

This is NOT part of any supported API. diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/DocTreeMaker.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/DocTreeMaker.java index 2005811..8603a64 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/DocTreeMaker.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/DocTreeMaker.java @@ -34,9 +34,9 @@ import java.util.ListIterator; import java.util.Set; -import javax.lang.model.element.Name; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Name; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; import openjdk.source.doctree.AttributeTree.ValueKind; import openjdk.source.doctree.DocTree; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/JCTree.java index 8fd0eee..40b15af 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/JCTree.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/JCTree.java @@ -29,9 +29,9 @@ import java.io.StringWriter; import java.util.*; -import javax.lang.model.element.Modifier; -import javax.lang.model.type.TypeKind; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.type.TypeKind; +import jdkx.tools.JavaFileObject; import openjdk.source.tree.*; import openjdk.tools.javac.code.*; @@ -47,7 +47,7 @@ import static openjdk.tools.javac.tree.JCTree.Tag.*; -import javax.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileManager.Location; import openjdk.source.tree.ModuleTree.ModuleKind; import openjdk.tools.javac.code.Directive.ExportsDirective; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/TreeInfo.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/TreeInfo.java index 910f9ce..c09e67d 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/TreeInfo.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/tree/TreeInfo.java @@ -46,7 +46,7 @@ import static openjdk.tools.javac.tree.JCTree.Tag.BLOCK; import static openjdk.tools.javac.tree.JCTree.Tag.SYNCHRONIZED; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import java.util.function.ToIntFunction; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/AbstractDiagnosticFormatter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/AbstractDiagnosticFormatter.java index c6b5b71..0bfb0ad 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/AbstractDiagnosticFormatter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/AbstractDiagnosticFormatter.java @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Set; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.api.DiagnosticFormatter; import openjdk.tools.javac.api.DiagnosticFormatter.Configuration.DiagnosticPart; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/AbstractLog.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/AbstractLog.java index 1c65c44..148a35f 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/AbstractLog.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/AbstractLog.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Map; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.Lint.LintCategory; import openjdk.tools.javac.util.JCDiagnostic.DiagnosticFlag; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/BasicDiagnosticFormatter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/BasicDiagnosticFormatter.java index fa7972a..6dd71fa 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/BasicDiagnosticFormatter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/BasicDiagnosticFormatter.java @@ -32,7 +32,7 @@ import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.util.AbstractDiagnosticFormatter.SimpleConfiguration; import openjdk.tools.javac.util.BasicDiagnosticFormatter.BasicConfiguration; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/CouplingAbort.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/CouplingAbort.java index 77a081b..62158db 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/CouplingAbort.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/CouplingAbort.java @@ -27,7 +27,7 @@ import openjdk.source.tree.Tree; import openjdk.tools.javac.code.Symbol.ClassSymbol; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; /** * diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/DefinedBy.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/DefinedBy.java index 6fbb566..dca6e05 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/DefinedBy.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/DefinedBy.java @@ -42,10 +42,10 @@ Api value(); public enum Api { - ANNOTATION_PROCESSING("javax.annotation.processing"), - COMPILER("javax.tools"), + ANNOTATION_PROCESSING("jdkx.annotation.processing"), + COMPILER("jdkx.tools"), COMPILER_TREE("openjdk.source"), - LANGUAGE_MODEL("javax.lang.model"); + LANGUAGE_MODEL("jdkx.lang.model"); /**The package under which all interfaces/classes of this API belong. */ diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Dependencies.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Dependencies.java index d167985..3f7a30e 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Dependencies.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Dependencies.java @@ -48,7 +48,7 @@ import java.util.Properties; import java.util.Stack; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; /** * This class is used to track dependencies in the javac symbol completion process. diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/DiagnosticSource.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/DiagnosticSource.java index 139f92c..2ae82b3 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/DiagnosticSource.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/DiagnosticSource.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.lang.ref.SoftReference; import java.nio.CharBuffer; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.file.JavacFileManager; import openjdk.tools.javac.tree.EndPosTable; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/ForwardingDiagnosticFormatter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/ForwardingDiagnosticFormatter.java index d59ea3e..e1623e7 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/ForwardingDiagnosticFormatter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/ForwardingDiagnosticFormatter.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.Locale; -import javax.tools.Diagnostic; +import jdkx.tools.Diagnostic; import openjdk.tools.javac.api.DiagnosticFormatter; import openjdk.tools.javac.api.DiagnosticFormatter.Configuration; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/JCDiagnostic.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/JCDiagnostic.java index f3fa92e..164549d 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/JCDiagnostic.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/JCDiagnostic.java @@ -30,8 +30,8 @@ import java.util.Set; import java.util.stream.Stream; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; +import jdkx.tools.Diagnostic; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.api.DiagnosticFormatter; import openjdk.tools.javac.code.Lint.LintCategory; @@ -773,7 +773,7 @@ public String toString() { @Deprecated private static DiagnosticFormatter fragmentFormatter; - // Methods for javax.tools.Diagnostic + // Methods for jdkx.tools.Diagnostic @DefinedBy(Api.COMPILER) public Diagnostic.Kind getKind() { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Log.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Log.java index ff04ad4..7681d75 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Log.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Log.java @@ -36,8 +36,8 @@ import java.util.Set; import java.util.function.Predicate; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileObject; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.api.DiagnosticFormatter; import openjdk.tools.javac.main.Main; @@ -90,7 +90,7 @@ public String key(String k) { * client has finished using a handler, the client should call * {@code log.removeDiagnosticHandler();} * - * Note that javax.tools.DiagnosticListener (if set) is called later in the + * Note that jdkx.tools.DiagnosticListener (if set) is called later in the * diagnostic pipeline. */ public static abstract class DiagnosticHandler { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/MandatoryWarningHandler.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/MandatoryWarningHandler.java index 1e15c64..7c4d6c9 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/MandatoryWarningHandler.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/MandatoryWarningHandler.java @@ -28,7 +28,7 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.Lint.LintCategory; import openjdk.tools.javac.code.Source; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/MatchingUtils.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/MatchingUtils.java index 34d7e06..1b63cce 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/MatchingUtils.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/MatchingUtils.java @@ -26,7 +26,7 @@ package openjdk.tools.javac.util; import java.util.regex.Pattern; -import javax.lang.model.SourceVersion; +import jdkx.lang.model.SourceVersion; /**Utilities to convert an import-like string to a regexp. * diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Name.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Name.java index 49f8a02..f9d3761 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Name.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/Name.java @@ -39,7 +39,7 @@ * This code and its internal interfaces are subject to change or * deletion without notice. */ -public abstract class Name implements javax.lang.model.element.Name, PoolConstant { +public abstract class Name implements jdkx.lang.model.element.Name, PoolConstant { public final Table table; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/RawDiagnosticFormatter.java b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/RawDiagnosticFormatter.java index 3d52438..e6fe246 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/javac/util/RawDiagnosticFormatter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/javac/util/RawDiagnosticFormatter.java @@ -29,7 +29,7 @@ import java.util.EnumSet; import java.util.Locale; import java.util.Set; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.api.DiagnosticFormatter.Configuration.*; import openjdk.tools.javac.api.Formattable; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/PubApiExtractor.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/PubApiExtractor.java index 0601183..41aa422 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/PubApiExtractor.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/PubApiExtractor.java @@ -29,8 +29,8 @@ import java.io.PrintWriter; import java.util.Arrays; -import javax.tools.JavaCompiler.CompilationTask; -import javax.tools.JavaFileManager; +import jdkx.tools.JavaCompiler.CompilationTask; +import jdkx.tools.JavaFileManager; import openjdk.tools.javac.api.JavacTool; import openjdk.tools.javac.code.ClassFinder; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/CompilationService.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/CompilationService.java index 5830334..7016e6d 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/CompilationService.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/CompilationService.java @@ -35,10 +35,10 @@ import java.util.List; import java.util.Set; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; -import javax.tools.ToolProvider; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; +import jdkx.tools.ToolProvider; import openjdk.tools.javac.api.JavacTaskImpl; import openjdk.tools.javac.api.JavacTool; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/FileObjectWithLocation.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/FileObjectWithLocation.java index 11a0944..3bf1827 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/FileObjectWithLocation.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/FileObjectWithLocation.java @@ -25,9 +25,9 @@ package openjdk.tools.sjavac.comp; -import javax.tools.FileObject; -import javax.tools.ForwardingFileObject; -import javax.tools.JavaFileManager.Location; +import jdkx.tools.FileObject; +import jdkx.tools.ForwardingFileObject; +import jdkx.tools.JavaFileManager.Location; import openjdk.tools.javac.api.ClientCodeWrapper.Trusted; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/JavaFileObjectWithLocation.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/JavaFileObjectWithLocation.java index 2d215a4..e61737f 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/JavaFileObjectWithLocation.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/JavaFileObjectWithLocation.java @@ -25,9 +25,9 @@ package openjdk.tools.sjavac.comp; -import javax.tools.ForwardingJavaFileObject; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; +import jdkx.tools.ForwardingJavaFileObject; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.api.ClientCodeWrapper.Trusted; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PathAndPackageVerifier.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PathAndPackageVerifier.java index 50ab8b3..205e246 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PathAndPackageVerifier.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PathAndPackageVerifier.java @@ -31,7 +31,7 @@ import java.util.Iterator; import java.util.Set; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.source.tree.CompilationUnitTree; import openjdk.source.util.TaskEvent; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PubAPIs.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PubAPIs.java index 1ae3445..a461c5a 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PubAPIs.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PubAPIs.java @@ -29,8 +29,8 @@ import java.util.HashMap; import java.util.Map; -import javax.lang.model.element.Element; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Element; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.code.Symbol.ClassSymbol; import openjdk.tools.javac.util.Context; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PubapiVisitor.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PubapiVisitor.java index 599ae19..83fb6f6 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PubapiVisitor.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/PubapiVisitor.java @@ -25,14 +25,14 @@ package openjdk.tools.sjavac.comp; -import static javax.lang.model.element.Modifier.PRIVATE; +import static jdkx.lang.model.element.Modifier.PRIVATE; import java.util.List; import java.util.stream.Collectors; -import javax.lang.model.element.*; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.ElementScanner14; +import jdkx.lang.model.element.*; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.ElementScanner14; import openjdk.tools.javac.code.Symbol.ClassSymbol; import openjdk.tools.javac.util.DefinedBy; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SjavacImpl.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SjavacImpl.java index cbf7930..deda5af 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SjavacImpl.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SjavacImpl.java @@ -56,7 +56,7 @@ import openjdk.tools.sjavac.server.Sjavac; import java.io.UncheckedIOException; -import javax.tools.JavaFileManager; +import jdkx.tools.JavaFileManager; /** * The sjavac implementation that interacts with javac and performs the actual diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartFileManager.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartFileManager.java index 480168a..5800155 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartFileManager.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartFileManager.java @@ -35,8 +35,8 @@ import java.util.Map; import java.util.Set; -import javax.tools.*; -import javax.tools.JavaFileObject.Kind; +import jdkx.tools.*; +import jdkx.tools.JavaFileObject.Kind; import openjdk.tools.javac.file.JavacFileManager; import openjdk.tools.javac.util.DefinedBy; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartFileObject.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartFileObject.java index 5e55c9d..8c7ed90 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartFileObject.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartFileObject.java @@ -29,9 +29,9 @@ import java.net.URI; import java.nio.file.NoSuchFileException; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.JavaFileObject; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.util.DefinedBy; import openjdk.tools.javac.util.DefinedBy.Api; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartWriter.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartWriter.java index 1c9e6c4..323adcc 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartWriter.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/SmartWriter.java @@ -28,7 +28,7 @@ import openjdk.tools.sjavac.Log; import java.io.*; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; /** * The SmartWriter will cache the written data and when the writer is closed, diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/dependencies/NewDependencyCollector.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/dependencies/NewDependencyCollector.java index d3b6423..2801010 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/dependencies/NewDependencyCollector.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/dependencies/NewDependencyCollector.java @@ -34,9 +34,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardLocation; import openjdk.source.util.TaskEvent; import openjdk.source.util.TaskListener; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/dependencies/PublicApiCollector.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/dependencies/PublicApiCollector.java index 8d557d1..94eb6c0 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/dependencies/PublicApiCollector.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/comp/dependencies/PublicApiCollector.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Set; -import javax.tools.JavaFileObject; +import jdkx.tools.JavaFileObject; import openjdk.source.tree.Tree; import openjdk.source.util.TaskEvent; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/ArrayTypeDesc.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/ArrayTypeDesc.java index 0e69360..87c8cf7 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/ArrayTypeDesc.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/ArrayTypeDesc.java @@ -27,7 +27,7 @@ import java.io.Serializable; -import javax.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeKind; public class ArrayTypeDesc extends TypeDesc implements Serializable { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PrimitiveTypeDesc.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PrimitiveTypeDesc.java index 91ab5c1..5fea4af 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PrimitiveTypeDesc.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PrimitiveTypeDesc.java @@ -27,7 +27,7 @@ import java.io.Serializable; -import javax.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeKind; import openjdk.tools.javac.util.StringUtils; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubApi.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubApi.java index c90de4b..3981bb3 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubApi.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubApi.java @@ -44,7 +44,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; import openjdk.tools.javac.util.Assert; import openjdk.tools.javac.util.StringUtils; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubMethod.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubMethod.java index e8cc648..c82c57e 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubMethod.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubMethod.java @@ -30,7 +30,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; public class PubMethod implements Serializable { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubType.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubType.java index 9886809..cece59c 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubType.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubType.java @@ -28,7 +28,7 @@ import java.io.Serializable; import java.util.Set; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; public class PubType implements Serializable { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubVar.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubVar.java index b8115d2..a404e50 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubVar.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/PubVar.java @@ -29,7 +29,7 @@ import java.util.Optional; import java.util.Set; -import javax.lang.model.element.Modifier; +import jdkx.lang.model.element.Modifier; public class PubVar implements Serializable { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/ReferenceTypeDesc.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/ReferenceTypeDesc.java index 74679bd..e7a73f2 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/ReferenceTypeDesc.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/ReferenceTypeDesc.java @@ -27,7 +27,7 @@ import java.io.Serializable; -import javax.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeKind; public class ReferenceTypeDesc extends TypeDesc implements Serializable { diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/TypeDesc.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/TypeDesc.java index 21e87d9..e775536 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/TypeDesc.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/TypeDesc.java @@ -27,16 +27,16 @@ import java.io.Serializable; -import javax.lang.model.type.ArrayType; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ErrorType; -import javax.lang.model.type.NoType; -import javax.lang.model.type.PrimitiveType; -import javax.lang.model.type.TypeKind; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.type.TypeVariable; -import javax.lang.model.type.TypeVisitor; -import javax.lang.model.util.SimpleTypeVisitor14; +import jdkx.lang.model.type.ArrayType; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.ErrorType; +import jdkx.lang.model.type.NoType; +import jdkx.lang.model.type.PrimitiveType; +import jdkx.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.type.TypeVariable; +import jdkx.lang.model.type.TypeVisitor; +import jdkx.lang.model.util.SimpleTypeVisitor14; import openjdk.tools.javac.code.Type.ClassType; import openjdk.tools.javac.util.DefinedBy; diff --git a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/TypeVarTypeDesc.java b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/TypeVarTypeDesc.java index 772a7b1..d0ff382 100644 --- a/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/TypeVarTypeDesc.java +++ b/src/jdk.compiler/share/classes/openjdk/tools/sjavac/pubapi/TypeVarTypeDesc.java @@ -27,7 +27,7 @@ import java.io.Serializable; -import javax.lang.model.type.TypeKind; +import jdkx.lang.model.type.TypeKind; public class TypeVarTypeDesc extends TypeDesc implements Serializable { diff --git a/src/jdk.compiler/share/man/javac.1 b/src/jdk.compiler/share/man/javac.1 index efc0a22..6cdfcf6 100644 --- a/src/jdk.compiler/share/man/javac.1 +++ b/src/jdk.compiler/share/man/javac.1 @@ -489,10 +489,10 @@ and a limited number of previous releases, detailed in the command\-line help. .PP For the current release, the Java SE API consists of the -\f[CB]java.*\f[R], \f[CB]javax.*\f[R], and \f[CB]org.*\f[R] packages that are +\f[CB]java.*\f[R], \f[CB]jdkx.*\f[R], and \f[CB]org.*\f[R] packages that are exported by the Java SE modules in the release; the JDK API consists of the \f[CB]com.*\f[R] and \f[CB]jdk.*\f[R] packages that are exported by the -JDK modules in the release, plus the \f[CB]javax.*\f[R] packages that are +JDK modules in the release, plus the \f[CB]jdkx.*\f[R] packages that are exported by standard, but non\-Java SE, modules in the release. .PP For previous releases, the Java SE API and the JDK API are as defined in @@ -1747,7 +1747,7 @@ The \f[CB]javac\f[R] command provides direct support for annotation processing. .PP The API for annotation processors is defined in the -\f[CB]javax.annotation.processing\f[R] and \f[CB]javax.lang.model\f[R] +\f[CB]jdkx.annotation.processing\f[R] and \f[CB]jdkx.lang.model\f[R] packages and subpackages. .SS How Annotation Processing Works .PP @@ -1758,7 +1758,7 @@ The search path can be specified with the \f[B]\f[BC]\-processorpath\f[B]\f[R] option. If no path is specified, then the user class path is used. Processors are located by means of service provider\-configuration files -named \f[CB]META\-INF/services/javax.annotation.processing\f[R]. +named \f[CB]META\-INF/services/jdkx.annotation.processing\f[R]. Processor on the search path. Such files should contain the names of any annotation processors to be used, listed one per line. @@ -1902,7 +1902,7 @@ command\-line tool. .RS .PP \f[B]Note\f[R]: This API should not be confused with the like\-named API -in the \f[B]\f[BC]javax.tools\f[B]\f[R] package. +in the \f[B]\f[BC]jdkx.tools\f[B]\f[R] package. .RE .TP .B The \f[CB]javac\f[R] \f[B]Legacy API\f[R] @@ -2120,8 +2120,8 @@ For example, the following is a simple annotation processor: .nf \f[CB] import\ java.util.*; -import\ javax.annotation.processing.*; -import\ javax.lang.model.*; +import\ jdkx.annotation.processing.*; +import\ jdkx.lang.model.*; import\ javaz.lang.model.element.*; \@SupportedAnnotationTypes("NotAnno") diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/javap/DisassemblerTool.java b/src/jdk.jdeps/share/classes/openjdk/tools/javap/DisassemblerTool.java index ecb4f17..93f4d59 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/javap/DisassemblerTool.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/javap/DisassemblerTool.java @@ -23,23 +23,23 @@ * questions. */ -package openjdk.tools.javap; //javax.tools; +package openjdk.tools.javap; //jdkx.tools; import java.io.Writer; import java.nio.charset.Charset; import java.util.Locale; import java.util.concurrent.Callable; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.OptionChecker; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; -import javax.tools.Tool; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.OptionChecker; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; +import jdkx.tools.Tool; /** - * This class is intended to be put in javax.tools. + * This class is intended to be put in jdkx.tools. * * @see DiagnosticListener * @see Diagnostic diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/javap/JavapFileManager.java b/src/jdk.jdeps/share/classes/openjdk/tools/javap/JavapFileManager.java index a4f85dd..44c6d8c 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/javap/JavapFileManager.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/javap/JavapFileManager.java @@ -27,8 +27,8 @@ import java.io.PrintWriter; import java.nio.charset.Charset; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileObject; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileObject; import openjdk.tools.javac.file.JavacFileManager; import openjdk.tools.javac.util.Context; diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/javap/JavapTask.java b/src/jdk.jdeps/share/classes/openjdk/tools/javap/JavapTask.java index 6758898..12849ec 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/javap/JavapTask.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/javap/JavapTask.java @@ -57,15 +57,15 @@ import java.util.ResourceBundle; import java.util.Set; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.NestingKind; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticListener; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.NestingKind; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; import openjdk.tools.classfile.*; diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/javap/SourceWriter.java b/src/jdk.jdeps/share/classes/openjdk/tools/javap/SourceWriter.java index fff117f..628e32b 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/javap/SourceWriter.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/javap/SourceWriter.java @@ -35,10 +35,10 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileManager.Location; -import javax.tools.JavaFileObject; -import javax.tools.StandardLocation; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileManager.Location; +import jdkx.tools.JavaFileObject; +import jdkx.tools.StandardLocation; import openjdk.tools.classfile.Attribute; import openjdk.tools.classfile.ClassFile; diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/DeprDB.java b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/DeprDB.java index 65e8856..ec2d560 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/DeprDB.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/DeprDB.java @@ -38,7 +38,7 @@ import java.util.Map; import java.util.Set; -import javax.lang.model.element.ElementKind; +import jdkx.lang.model.element.ElementKind; /** * A database of deprecations (APIs declared to be deprecated), diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/DeprData.java b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/DeprData.java index 9c5f589..ab240f8 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/DeprData.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/DeprData.java @@ -25,8 +25,8 @@ package openjdk.tools.jdeprscan; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.TypeElement; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.TypeElement; /** * A simple data class that contains language model data (TypeElement, etc.) diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/LoadProc.java b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/LoadProc.java index 710c1bc..6a8b5fc 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/LoadProc.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/LoadProc.java @@ -31,25 +31,25 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.Messager; -import javax.annotation.processing.ProcessingEnvironment; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedSourceVersion; - -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.type.ArrayType; -import javax.lang.model.type.DeclaredType; -import javax.lang.model.type.ExecutableType; -import javax.lang.model.type.TypeMirror; -import javax.lang.model.util.Elements; - -import javax.tools.Diagnostic; +import jdkx.annotation.processing.AbstractProcessor; +import jdkx.annotation.processing.Messager; +import jdkx.annotation.processing.ProcessingEnvironment; +import jdkx.annotation.processing.RoundEnvironment; +import jdkx.annotation.processing.SupportedAnnotationTypes; +import jdkx.annotation.processing.SupportedSourceVersion; + +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.ExecutableElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.type.ArrayType; +import jdkx.lang.model.type.DeclaredType; +import jdkx.lang.model.type.ExecutableType; +import jdkx.lang.model.type.TypeMirror; +import jdkx.lang.model.util.Elements; + +import jdkx.tools.Diagnostic; /** * Annotation processor for the Deprecation Scanner tool. diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/Main.java b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/Main.java index 84faf92..dd6fd66 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/Main.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/Main.java @@ -52,15 +52,15 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; -import javax.tools.Diagnostic; -import javax.tools.DiagnosticListener; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileManager; -import javax.tools.JavaFileObject; -import javax.tools.JavaFileObject.Kind; -import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; -import javax.tools.ToolProvider; +import jdkx.tools.Diagnostic; +import jdkx.tools.DiagnosticListener; +import jdkx.tools.JavaCompiler; +import jdkx.tools.JavaFileManager; +import jdkx.tools.JavaFileObject; +import jdkx.tools.JavaFileObject.Kind; +import jdkx.tools.StandardJavaFileManager; +import jdkx.tools.StandardLocation; +import jdkx.tools.ToolProvider; import com.itsaky.androidide.config.JavacConfigProvider; import openjdk.tools.javac.file.JavacFileManager; @@ -70,8 +70,8 @@ import static java.util.stream.Collectors.*; -import javax.lang.model.element.PackageElement; -import javax.lang.model.element.TypeElement; +import jdkx.lang.model.element.PackageElement; +import jdkx.lang.model.element.TypeElement; /** * Deprecation Scanner tool. Loads API deprecation information from the diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/TraverseProc.java b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/TraverseProc.java index ae2d332..0412f0a 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/TraverseProc.java +++ b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/TraverseProc.java @@ -34,22 +34,22 @@ import java.util.Map; import java.util.Set; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.Messager; -import javax.annotation.processing.ProcessingEnvironment; -import javax.annotation.processing.RoundEnvironment; -import javax.annotation.processing.SupportedAnnotationTypes; -import javax.annotation.processing.SupportedSourceVersion; - -import javax.lang.model.SourceVersion; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.ModuleElement; -import javax.lang.model.element.PackageElement; -import javax.lang.model.element.TypeElement; -import javax.lang.model.util.Elements; -import javax.tools.Diagnostic; +import jdkx.annotation.processing.AbstractProcessor; +import jdkx.annotation.processing.Messager; +import jdkx.annotation.processing.ProcessingEnvironment; +import jdkx.annotation.processing.RoundEnvironment; +import jdkx.annotation.processing.SupportedAnnotationTypes; +import jdkx.annotation.processing.SupportedSourceVersion; + +import jdkx.lang.model.SourceVersion; +import jdkx.lang.model.element.Element; +import jdkx.lang.model.element.ElementKind; +import jdkx.lang.model.element.Modifier; +import jdkx.lang.model.element.ModuleElement; +import jdkx.lang.model.element.PackageElement; +import jdkx.lang.model.element.TypeElement; +import jdkx.lang.model.util.Elements; +import jdkx.tools.Diagnostic; @SupportedAnnotationTypes("*") public class TraverseProc extends AbstractProcessor { diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/internals.md b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/internals.md index 022d66a..f01f2c2 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/internals.md +++ b/src/jdk.jdeps/share/classes/openjdk/tools/jdeprscan/internals.md @@ -67,7 +67,7 @@ JDeprScan Internals Loads deprecation data from the running JDK image by traversing the entire jrt: filesystem. This differs from -release 9, which traverses modules, packages, and classes by - starting from a set of root modules and using javax.lang.model + starting from a set of root modules and using jdkx.lang.model mechanisms (as opposed to filesystem mechanisms) for traversing contained elements recursively. @@ -154,7 +154,7 @@ Fields are defined as follows: * _kind_ - one of CONSTRUCTOR, FIELD, METHOD, ENUM\_CONSTANT, CLASS, INTERFACE, ENUM, or ANNOTATION\_TYPE. These correspond to - enumeration constants from the `javax.lang.model.element.ElementKind` + enumeration constants from the `jdkx.lang.model.element.ElementKind` enum. * _typeName_ - the fully qualified name of the type (if *kind* is diff --git a/src/jdk.jdeps/share/classes/openjdk/tools/jdeps/resources/jdkinternals.properties b/src/jdk.jdeps/share/classes/openjdk/tools/jdeps/resources/jdkinternals.properties index 6c69f12..d6103a3 100644 --- a/src/jdk.jdeps/share/classes/openjdk/tools/jdeps/resources/jdkinternals.properties +++ b/src/jdk.jdeps/share/classes/openjdk/tools/jdeps/resources/jdkinternals.properties @@ -28,12 +28,12 @@ openjdk.crypto.provider.SunJCE=Use java.security.Security.getProvider(provider-name) @since 1.3 openjdk.org.apache.xml.internal.security=Use java.xml.crypto @since 1.6 openjdk.org.apache.xml.internal.security.utils.Base64=Use java.util.Base64 @since 1.8 -openjdk.org.apache.xml.internal.resolver=Use javax.xml.catalog @since 9 -openjdk.net.ssl=Use javax.net.ssl @since 1.4 +openjdk.org.apache.xml.internal.resolver=Use jdkx.xml.catalog @since 9 +openjdk.net.ssl=Use jdkx.net.ssl @since 1.4 openjdk.net.ssl.internal.ssl.Provider=Use java.security.Security.getProvider(provider-name) @since 1.3 -openjdk.rowset=Use javax.sql.rowset.RowSetProvider @since 1.7 +openjdk.rowset=Use jdkx.sql.rowset.RowSetProvider @since 1.7 openjdk.tools.javac.tree=Use openjdk.source @since 1.6 -openjdk.tools.javac=Use javax.tools and javax.lang.model @since 1.6 +openjdk.tools.javac=Use jdkx.tools and jdkx.lang.model @since 1.6 java.awt.peer=Should not use. See https://bugs.openjdk.java.net/browse/JDK-8037739 java.awt.dnd.peer=Should not use. See https://bugs.openjdk.java.net/browse/JDK-8037739 jdk.internal.ref.Cleaner=Use java.lang.ref.PhantomReference @since 1.2 or java.lang.ref.Cleaner @since 9 @@ -48,16 +48,16 @@ sun.security.action=Use java.security.PrivilegedAction @since 1.1 sun.security.krb5=Use openjdk.security.jgss sun.security.provider.PolicyFile=Use java.security.Policy.getInstance("JavaPolicy", new URIParameter(uri)) @since 1.6 sun.security.provider.Sun=Use java.security.Security.getProvider(provider-name) @since 1.3 -sun.security.util.HostnameChecker=Use javax.net.ssl.SSLParameters.setEndpointIdentificationAlgorithm("HTTPS") @since 1.7\n\ -or javax.net.ssl.HttpsURLConnection.setHostnameVerifier() @since 1.4 +sun.security.util.HostnameChecker=Use jdkx.net.ssl.SSLParameters.setEndpointIdentificationAlgorithm("HTTPS") @since 1.7\n\ +or jdkx.net.ssl.HttpsURLConnection.setHostnameVerifier() @since 1.4 sun.security.util.SecurityConstants=Use appropriate java.security.Permission subclass @since 1.1 -sun.security.x509.X500Name=Use javax.security.auth.x500.X500Principal @since 1.4 +sun.security.x509.X500Name=Use jdkx.security.auth.x500.X500Principal @since 1.4 sun.tools.jar=Use java.util.jar or jar tool @since 1.2 # Internal APIs removed in JDK 9 com.apple.eawt=Use java.awt.Desktop and JEP 272 @since 9 com.apple.concurrent=Removed. See https://bugs.openjdk.java.net/browse/JDK-8148187 -openjdk.image.codec.jpeg=Use javax.imageio @since 1.4 -sun.awt.image.codec=Use javax.imageio @since 1.4 +openjdk.image.codec.jpeg=Use jdkx.imageio @since 1.4 +sun.awt.image.codec=Use jdkx.imageio @since 1.4 sun.misc.BASE64Encoder=Use java.util.Base64 @since 1.8 sun.misc.BASE64Decoder=Use java.util.Base64 @since 1.8 sun.misc.Cleaner=Use java.lang.ref.PhantomReference @since 1.2 or java.lang.ref.Cleaner @since 9 diff --git a/src/jdk.jdeps/share/man/javap.1 b/src/jdk.jdeps/share/man/javap.1 index e198239..7ca569f 100644 --- a/src/jdk.jdeps/share/man/javap.1 +++ b/src/jdk.jdeps/share/man/javap.1 @@ -197,8 +197,8 @@ Compile the following \f[CB]HelloWorldFrame\f[R] class: \f[CB] import\ java.awt.Graphics; -import\ javax.swing.JFrame; -import\ javax.swing.JPanel; +import\ jdkx.swing.JFrame; +import\ jdkx.swing.JPanel; public\ class\ HelloWorldFrame\ extends\ JFrame\ { @@ -229,7 +229,7 @@ the following: .nf \f[CB] Compiled\ from\ "HelloWorldFrame.java" -public\ class\ HelloWorldFrame\ extends\ javax.swing.JFrame\ { +public\ class\ HelloWorldFrame\ extends\ jdkx.swing.JFrame\ { \ \ java.lang.String\ message; \ \ public\ HelloWorldFrame(); \ \ public\ static\ void\ main(java.lang.String[]); @@ -243,13 +243,13 @@ yields the following: .nf \f[CB] Compiled\ from\ "HelloWorldFrame.java" -public\ class\ HelloWorldFrame\ extends\ javax.swing.JFrame\ { +public\ class\ HelloWorldFrame\ extends\ jdkx.swing.JFrame\ { \ \ java.lang.String\ message; \ \ public\ HelloWorldFrame(); \ \ \ \ Code: \ \ \ \ \ \ \ 0:\ aload_0 -\ \ \ \ \ \ \ 1:\ invokespecial\ #1\ \ \ \ \ \ \ \ //\ Method\ javax/swing/JFrame."":()V +\ \ \ \ \ \ \ 1:\ invokespecial\ #1\ \ \ \ \ \ \ \ //\ Method\ jdkx/swing/JFrame."":()V \ \ \ \ \ \ \ 4:\ aload_0 \ \ \ \ \ \ \ 5:\ ldc\ \ \ \ \ \ \ \ \ \ \ #2\ \ \ \ \ \ \ \ //\ String\ Hello\ World! \ \ \ \ \ \ \ 7:\ putfield\ \ \ \ \ \ #3\ \ \ \ \ \ \ \ //\ Field\ message:Ljava/lang/String; diff --git a/src/jdk.jdeps/share/man/jdeps.1 b/src/jdk.jdeps/share/man/jdeps.1 index 46056c7..d4f415d 100644 --- a/src/jdk.jdeps/share/man/jdeps.1 +++ b/src/jdk.jdeps/share/man/jdeps.1 @@ -354,12 +354,12 @@ Notepad.jar\ \->\ java.logging \ \ \ \ \ \ \->\ java.net \ \ \ \ \ \ \->\ java.util \ \ \ \ \ \ \->\ java.util.logging -\ \ \ \ \ \ \->\ javax.swing -\ \ \ \ \ \ \->\ javax.swing.border -\ \ \ \ \ \ \->\ javax.swing.event -\ \ \ \ \ \ \->\ javax.swing.text -\ \ \ \ \ \ \->\ javax.swing.tree -\ \ \ \ \ \ \->\ javax.swing.undo +\ \ \ \ \ \ \->\ jdkx.swing +\ \ \ \ \ \ \->\ jdkx.swing.border +\ \ \ \ \ \ \->\ jdkx.swing.event +\ \ \ \ \ \ \->\ jdkx.swing.text +\ \ \ \ \ \ \->\ jdkx.swing.tree +\ \ \ \ \ \ \->\ jdkx.swing.undo \f[R] .fi .PP @@ -380,12 +380,12 @@ Notepad.jar\ \->\ java.logging \ \ \ \ \ \ \->\ java.net \ \ \ \ \ \ \->\ java.util \ \ \ \ \ \ \->\ java.util.logging -\ \ \ \ \ \ \->\ javax.swing -\ \ \ \ \ \ \->\ javax.swing.border -\ \ \ \ \ \ \->\ javax.swing.event -\ \ \ \ \ \ \->\ javax.swing.text -\ \ \ \ \ \ \->\ javax.swing.tree -\ \ \ \ \ \ \->\ javax.swing.undo +\ \ \ \ \ \ \->\ jdkx.swing +\ \ \ \ \ \ \->\ jdkx.swing.border +\ \ \ \ \ \ \->\ jdkx.swing.event +\ \ \ \ \ \ \->\ jdkx.swing.text +\ \ \ \ \ \ \->\ jdkx.swing.tree +\ \ \ \ \ \ \->\ jdkx.swing.undo \f[R] .fi .SH EXAMPLE USING THE \-\-INVERSE OPTION