OpenJDK / amber / amber
changeset 4550:af96bc3bdfb9
6910317: [classfile] typo and other issues in Dependency classes
Reviewed-by: ksrini
| author | jjg |
|---|---|
| date | Tue, 15 Dec 2009 13:26:06 -0800 |
| parents | 5288a060c75e |
| children | a986317586f6 |
| files | langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java langtools/src/share/classes/com/sun/tools/classfile/Dependency.java langtools/test/tools/javap/classfile/deps/GetDeps.java |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java Sat Dec 12 09:28:40 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Dependencies.java Tue Dec 15 13:26:06 2009 -0800 @@ -414,7 +414,7 @@ return pattern.matcher(dependency.getTarget().getClassName()).matches(); } - Pattern pattern; + private final Pattern pattern; } /** @@ -448,8 +448,8 @@ return false; } - Set<String> packageNames; - boolean matchSubpackages; + private final Set<String> packageNames; + private final boolean matchSubpackages; } @@ -543,8 +543,8 @@ class Visitor implements ConstantPool.Visitor<Void,Void>, Type.Visitor<Void, Void> { private ConstantPool constant_pool; - private Set<Dependency> deps; private Location origin; + Set<Dependency> deps; Visitor(ClassFile classFile) { try {
--- a/langtools/src/share/classes/com/sun/tools/classfile/Dependency.java Sat Dec 12 09:28:40 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/classfile/Dependency.java Tue Dec 15 13:26:06 2009 -0800 @@ -54,7 +54,7 @@ /** * Find the immediate dependencies of a given class file. * @param classfile the class file to be examined - * @return the set of dependencies located in the given class file. + * @return the dependencies located in the given class file. */ public Iterable<? extends Dependency> findDependencies(ClassFile classfile); }
--- a/langtools/test/tools/javap/classfile/deps/GetDeps.java Sat Dec 12 09:28:40 2009 -0800 +++ b/langtools/test/tools/javap/classfile/deps/GetDeps.java Tue Dec 15 13:26:06 2009 -0800 @@ -186,7 +186,7 @@ private Comparator<Dependency> originComparator = new Comparator<Dependency>() { public int compare(Dependency o1, Dependency o2) { - return o1.getTarget().toString().compareTo(o2.getOrigin().toString()); + return o1.getOrigin().toString().compareTo(o2.getOrigin().toString()); } };