OpenJDK / amber / amber
changeset 14452:f083d81c2b46
8003134: CheckResourceKeys issues
Reviewed-by: jjh, bpatel
| author | jjg |
|---|---|
| date | Wed, 07 Nov 2012 17:20:12 -0800 |
| parents | c18762e096ae |
| children | 0e685b019743 ad188879b6fe |
| files | langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties langtools/test/tools/javac/diags/CheckResourceKeys.java langtools/test/tools/javadoc/CheckResourceKeys.java |
| diffstat | 3 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Wed Nov 07 17:01:19 2012 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Wed Nov 07 17:20:12 2012 -0800 @@ -91,9 +91,7 @@ doclet.Subinterfaces=All Known Subinterfaces: doclet.Implementing_Classes=All Known Implementing Classes: doclet.also=also -doclet.FRAMES=FRAMES doclet.Frames=Frames -doclet.NO_FRAMES=NO FRAMES doclet.No_Frames=No Frames doclet.Package_Hierarchies=Package Hierarchies: doclet.Hierarchy_For_Package=Hierarchy For Package {0}
--- a/langtools/test/tools/javac/diags/CheckResourceKeys.java Wed Nov 07 17:01:19 2012 -0800 +++ b/langtools/test/tools/javac/diags/CheckResourceKeys.java Wed Nov 07 17:20:12 2012 -0800 @@ -310,9 +310,8 @@ pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) { String name = fo.getName(); // ignore resource files, and files which are not really part of javac - if (name.matches(".*resources.[A-Za-z_0-9]+\\.class") - || name.endsWith("Launcher.class") - || name.endsWith("CreateSymbols.class")) + if (name.matches(".*resources.[A-Za-z_0-9]+\\.class.*") + || name.matches(".*CreateSymbols\\.class.*")) continue; scan(fo, results); }
--- a/langtools/test/tools/javadoc/CheckResourceKeys.java Wed Nov 07 17:01:19 2012 -0800 +++ b/langtools/test/tools/javadoc/CheckResourceKeys.java Wed Nov 07 17:20:12 2012 -0800 @@ -151,7 +151,7 @@ pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) { String name = fo.getName(); // ignore resource files - if (name.matches(".*resources.[A-Za-z_0-9]+\\.class")) + if (name.matches(".*resources.[A-Za-z_0-9]+\\.class.*")) continue; scan(fo, results); }