Mercurial > hg > openjdk > icedtea > jdk7 > langtools
changeset 1183:a22181f71ac3
Merge
author | michaelm |
---|---|
date | Mon, 16 Jan 2012 14:26:52 +0000 |
parents | f05c7e7ceea6 (current diff) 13ee9a9a3abb (diff) |
children | 05bb743c223d |
files | |
diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Thu Jan 12 14:23:20 2012 -0800 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Mon Jan 16 14:26:52 2012 +0000 @@ -216,6 +216,7 @@ doclet.Same_package_name_used=Package name format used twice: {0} doclet.Serialization.Excluded_Class=Non-transient field {1} uses excluded class {0}. doclet.Serialization.Nonexcluded_Class=Non-transient field {1} uses hidden, non-included class {0}. +doclet.exception_encountered=Exception encountered while processing {1}\n{0} doclet.usage=Provided by Standard doclet:\n\ -d <directory> Destination directory for output files\n\ -use Create class and package usage pages\n\
--- a/test/tools/javac/api/T6397104.java Thu Jan 12 14:23:20 2012 -0800 +++ b/test/tools/javac/api/T6397104.java Mon Jan 16 14:26:52 2012 +0000 @@ -26,10 +26,10 @@ * @bug 6397104 * @summary JSR 199: JavaFileManager.getFileForOutput should have sibling argument * @author Peter von der Ah\u00e9 - * @ignore this test should be rewritten when fixing 6473901 */ import java.io.File; +import java.net.URI; import java.util.Arrays; import javax.tools.*; import javax.tools.JavaFileManager.Location; @@ -52,10 +52,14 @@ : fm.getJavaFileObjectsFromFiles(Arrays.asList(siblingFile)).iterator().next(); FileObject fileObject = fm.getFileForOutput(location, "java.lang", relName, sibling); - if (!fileObject.toUri().getPath().equals(expectedPath)) - throw new AssertionError("Expected " + expectedPath + - ", got " + fileObject.toUri().getPath()); - System.out.format("OK: (%s, %s) => %s%n", siblingFile, relName, fileObject.toUri()); + + File expectedFile = new File(expectedPath).getCanonicalFile(); + File fileObjectFile = new File(fileObject.toUri()).getCanonicalFile(); + + if (!fileObjectFile.equals(expectedFile)) + throw new AssertionError("Expected " + expectedFile + + ", got " + fileObjectFile); + System.out.format("OK: (%s, %s) => %s%n", siblingFile, relName, fileObjectFile); } void test(boolean hasLocation, File siblingFile, String relName, String expectedPath)