Wed, 07 Nov 2012 17:20:12 -0800
8003134: CheckResourceKeys issues
Reviewed-by: jjh, bpatel
1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Wed Nov 07 17:01:19 2012 -0800 1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties Wed Nov 07 17:20:12 2012 -0800 1.3 @@ -91,9 +91,7 @@ 1.4 doclet.Subinterfaces=All Known Subinterfaces: 1.5 doclet.Implementing_Classes=All Known Implementing Classes: 1.6 doclet.also=also 1.7 -doclet.FRAMES=FRAMES 1.8 doclet.Frames=Frames 1.9 -doclet.NO_FRAMES=NO FRAMES 1.10 doclet.No_Frames=No Frames 1.11 doclet.Package_Hierarchies=Package Hierarchies: 1.12 doclet.Hierarchy_For_Package=Hierarchy For Package {0}
2.1 --- a/test/tools/javac/diags/CheckResourceKeys.java Wed Nov 07 17:01:19 2012 -0800 2.2 +++ b/test/tools/javac/diags/CheckResourceKeys.java Wed Nov 07 17:20:12 2012 -0800 2.3 @@ -310,9 +310,8 @@ 2.4 pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) { 2.5 String name = fo.getName(); 2.6 // ignore resource files, and files which are not really part of javac 2.7 - if (name.matches(".*resources.[A-Za-z_0-9]+\\.class") 2.8 - || name.endsWith("Launcher.class") 2.9 - || name.endsWith("CreateSymbols.class")) 2.10 + if (name.matches(".*resources.[A-Za-z_0-9]+\\.class.*") 2.11 + || name.matches(".*CreateSymbols\\.class.*")) 2.12 continue; 2.13 scan(fo, results); 2.14 }
3.1 --- a/test/tools/javadoc/CheckResourceKeys.java Wed Nov 07 17:01:19 2012 -0800 3.2 +++ b/test/tools/javadoc/CheckResourceKeys.java Wed Nov 07 17:20:12 2012 -0800 3.3 @@ -151,7 +151,7 @@ 3.4 pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) { 3.5 String name = fo.getName(); 3.6 // ignore resource files 3.7 - if (name.matches(".*resources.[A-Za-z_0-9]+\\.class")) 3.8 + if (name.matches(".*resources.[A-Za-z_0-9]+\\.class.*")) 3.9 continue; 3.10 scan(fo, results); 3.11 }