archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8003134: CheckResourceKeys issues

Browse source 
Reviewed-by: jjh, bpatel
This commit is contained in:
Jonathan Gibbons 2012-11-07 17:20:12 -08:00
parent eb055bba92
commit 18b3a4951e
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties
View file

@ -91,9 +91,7 @@ doclet.Subclasses=Direct Known Subclasses:
doclet.Subinterfaces=All Known Subinterfaces: doclet.Subinterfaces=All Known Subinterfaces:
doclet.Implementing_Classes=All Known Implementing Classes: doclet.Implementing_Classes=All Known Implementing Classes:
doclet.also=also doclet.also=also
doclet.FRAMES=FRAMES
doclet.Frames=Frames doclet.Frames=Frames
doclet.NO_FRAMES=NO FRAMES
doclet.No_Frames=No Frames doclet.No_Frames=No Frames
doclet.Package_Hierarchies=Package Hierarchies: doclet.Package_Hierarchies=Package Hierarchies:
doclet.Hierarchy_For_Package=Hierarchy For Package {0} doclet.Hierarchy_For_Package=Hierarchy For Package {0}

5
langtools/test/tools/javac/diags/CheckResourceKeys.java
View file

@ -310,9 +310,8 @@ public class CheckResourceKeys {
pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) { pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) {
String name = fo.getName(); String name = fo.getName();
// ignore resource files, and files which are not really part of javac // ignore resource files, and files which are not really part of javac
if (name.matches(".*resources.[A-Za-z_0-9]+\\.class") if (name.matches(".*resources.[A-Za-z_0-9]+\\.class.*")
|| name.endsWith("Launcher.class") || name.matches(".*CreateSymbols\\.class.*"))
|| name.endsWith("CreateSymbols.class"))
continue; continue;
scan(fo, results); scan(fo, results);
} }

2
langtools/test/tools/javadoc/CheckResourceKeys.java
View file

@ -151,7 +151,7 @@ public class CheckResourceKeys {
pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) { pkg, EnumSet.of(JavaFileObject.Kind.CLASS), true)) {
String name = fo.getName(); String name = fo.getName();
// ignore resource files // ignore resource files
if (name.matches(".*resources.[A-Za-z_0-9]+\\.class")) if (name.matches(".*resources.[A-Za-z_0-9]+\\.class.*"))
continue; continue;
scan(fo, results); scan(fo, results);
} }