6a6e3b27ddd4cdb74315af6d6291b10b2aec5223 - platform/libcore

commit	6a6e3b27ddd4cdb74315af6d6291b10b2aec5223	[log] [tgz]
author	Jan Lahoda <jlahoda@openjdk.org>	Mon Feb 13 09:37:26 2017 +0100
committer	Jan Lahoda <jlahoda@openjdk.org>	Mon Feb 13 09:37:26 2017 +0100
tree	96ff384cda36086a8136d88e6f98afc3e4360574
parent	8f177844a04e95bf429f5cadeee18da02a6a912d [diff]

8173777: Merge javac -Xmodule into javac--patch-module

Merging -Xmodule: functionality into --patch-module.

Reviewed-by: jjg, mchung, rfield

langtools/src/java.compiler/share/classes/javax/tools/StandardLocation.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java[diff]
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties[diff]
langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java[diff]
langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties[diff]
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java[diff]
langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties[diff]
langtools/src/jdk.jshell/share/classes/jdk/jshell/MemoryFileManager.java[diff]
langtools/test/tools/javac/6627362/T6627362.java[diff]
langtools/test/tools/javac/6627362/x/java/lang/Object.java[Renamed from langtools/test/tools/javac/6627362/x/Object.java - diff]
langtools/test/tools/javac/diags/Example.java[diff]
langtools/test/tools/javac/diags/examples.not-yet.txt[diff]
langtools/test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleClassoutput/ModuleInfoWithPatchedModuleClassoutput.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleClassoutput/additional/module-info.java[Renamed from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleClassoutput/patchmodule/java.compiler/javax/lang/model/element/Extra.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleSourcepath/ModuleInfoWithPatchedModule.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleSourcepath/patchmodule/java.compiler/javax/lang/model/element/Extra.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleSourcepath/patchmodule/java.compiler/module-info.java[Renamed from langtools/test/tools/javac/diags/examples/ModuleInfoWithXModuleSourcePath/module-info.java - diff]
langtools/test/tools/javac/diags/examples/ModuleInfoWithXModuleSourcePath/Extra.java[Deleted - diff]
langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/ModuleInfoWithXmoduleClasspath.java[Deleted - diff]
langtools/test/tools/javac/diags/examples/NoSuperclass/NoSuperclass.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/NoSuperclass/patchmodule/java.base/java/lang/Object.java[Renamed from langtools/test/tools/javac/diags/examples/NoSuperclass.java - diff]
langtools/test/tools/javac/diags/examples/TooManyPatchedModules/TooManyPatchedModules.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/java.compiler/p/C.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/jdk.compiler/p/C.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/diags/examples/XModuleWithModulePath/XModuleWithModulePath.java[Deleted - diff]
langtools/test/tools/javac/meth/BadPolySig.java[Deleted - diff]
langtools/test/tools/javac/meth/BadPolySig/BadPolySig.java[Copied from langtools/test/tools/javac/diags/examples/NoSuperclass.java - diff]
langtools/test/tools/javac/meth/BadPolySig/java.base/java/lang/invoke/MethodHandle.java[Copied from langtools/test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java - diff]
langtools/test/tools/javac/modules/AddLimitMods.java[diff]
langtools/test/tools/javac/modules/AddReadsTest.java[diff]
langtools/test/tools/javac/modules/CompileModulePatchTest.java[Added - diff]
langtools/test/tools/javac/modules/InheritRuntimeEnvironmentTest.java[diff]
langtools/test/tools/javac/modules/PatchModulesTest.java[diff]
langtools/test/tools/javac/modules/XModuleTest.java[Deleted - diff]
langtools/test/tools/javac/synthesize/Main.java[diff]
langtools/test/tools/jdeps/jdkinternals/RemovedJDKInternals.java[diff]

46 files changed

tree: 96ff384cda36086a8136d88e6f98afc3e4360574