hg: jdk6/jdk6/langtools: 6962236: backport JavacFileManager fixes from 7 to 6-open; ...

[jonathan.gibbons at oracle.com]

Changeset: 5c2858bccb3f
Author:    jjg
Date:      2010-06-22 18:30 -0700
URL:       http://hg.openjdk.java.net/jdk6/jdk6/langtools/rev/5c2858bccb3f

6962236: backport JavacFileManager fixes from 7 to 6-open
6410637: Make decision on deprecated methods in DefaultFileManager and BaseFileObject.
6419701: DefaultFileManager clean up: URI.create
6483788: DefaultFileManager.ZipFileObject.toUri() fails to escape space characters
6501502: JSR 199: FileObject.toUri should return file:///c:/ or file:/c:/ not file://c:/
6508981: cleanup file separator handling in JavacFileManager
6625520: javac handles missing entries on classpath badly
6705935: javac reports path name of entry in ZipFileIndex incorectly
6705945: com.sun.tools.javac.zip files do not have valid copyright
6714364: refactor javac File handling code into new javac.file package
6714365: refactor JavacFileManager to move nested classes to top level
6743107: clean up use of static caches in file manager
6794582: javadoc should read files using a FileManager
6832154: refactor Paths to be just a utility class for JavacFileManager
6838467: JSR199 FileObjects don't obey general contract of equals.
6877206: JavaFileObject.toUri returns bogus URI (win)
6877223: tests @ignored because of issues with File.toURI on Windows
6885123: JavaFileObject getName issues
6907660: stupid typo in ZipFileIndex guarantees NPE
6930076: "null" can incorrectly appear in error message compiler.err.error.reading.file
Reviewed-by: darcy

! src/share/classes/com/sun/tools/apt/main/JavaCompiler.java
! src/share/classes/com/sun/tools/apt/main/Main.java
! src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java
! src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java
! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java
! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java
! src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java
! src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
! src/share/classes/com/sun/tools/javac/api/JavacTool.java
+ src/share/classes/com/sun/tools/javac/file/BaseFileObject.java
+ src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
+ src/share/classes/com/sun/tools/javac/file/FSInfo.java
+ src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
+ src/share/classes/com/sun/tools/javac/file/Paths.java
+ src/share/classes/com/sun/tools/javac/file/RegularFileObject.java
+ src/share/classes/com/sun/tools/javac/file/RelativePath.java
+ src/share/classes/com/sun/tools/javac/file/SymbolArchive.java
+ src/share/classes/com/sun/tools/javac/file/ZipArchive.java
+ src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
+ src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/share/classes/com/sun/tools/javac/main/Main.java
! src/share/classes/com/sun/tools/javac/parser/Scanner.java
! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+ src/share/classes/com/sun/tools/javac/util/BaseFileManager.java
- src/share/classes/com/sun/tools/javac/util/BaseFileObject.java
! src/share/classes/com/sun/tools/javac/util/DiagnosticFormatter.java
! src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
- src/share/classes/com/sun/tools/javac/util/JavacFileManager.java
! src/share/classes/com/sun/tools/javac/util/Log.java
- src/share/classes/com/sun/tools/javac/util/Old199.java
- src/share/classes/com/sun/tools/javac/util/Paths.java
- src/share/classes/com/sun/tools/javac/zip/ZipFileIndex.java
- src/share/classes/com/sun/tools/javac/zip/ZipFileIndexEntry.java
! src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java
! src/share/classes/com/sun/tools/javadoc/DocEnv.java
! src/share/classes/com/sun/tools/javadoc/DocImpl.java
! src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java
! src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java
! src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java
! src/share/classes/com/sun/tools/javadoc/JavadocTool.java
! src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java
! src/share/classes/com/sun/tools/javadoc/RootDocImpl.java
! src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java
! test/tools/javac/6304921/TestLog.java
+ test/tools/javac/6508981/TestInferBinaryName.java
+ test/tools/javac/6508981/p/A.java
! test/tools/javac/6589361/T6589361.java
! test/tools/javac/T6358024.java
! test/tools/javac/T6358166.java
! test/tools/javac/T6358168.java
+ test/tools/javac/T6625520.java
+ test/tools/javac/T6705935.java
! test/tools/javac/T6725036.java
! test/tools/javac/api/6411310/T6411310.java
+ test/tools/javac/api/6411310/Test.java
! test/tools/javac/api/6440333/T6440333.java
! test/tools/javac/api/6440528/T6440528.java
+ test/tools/javac/api/6733837/T6733837.java
! test/tools/javac/api/Sibling.java
! test/tools/javac/api/T6358786.java
+ test/tools/javac/api/T6483788.java
+ test/tools/javac/api/T6501502.java
+ test/tools/javac/api/T6838467.java
+ test/tools/javac/api/T6877206.java
! test/tools/javac/api/TestResolveIdent.java
! test/tools/javac/util/filemanager/TestName.java