Tue, 15 Dec 2009 13:26:06 -0800
6910317: [classfile] typo and other issues in Dependency classes
Reviewed-by: ksrini
1.1 --- a/src/share/classes/com/sun/tools/classfile/Dependencies.java Sat Dec 12 09:28:40 2009 -0800 1.2 +++ b/src/share/classes/com/sun/tools/classfile/Dependencies.java Tue Dec 15 13:26:06 2009 -0800 1.3 @@ -414,7 +414,7 @@ 1.4 return pattern.matcher(dependency.getTarget().getClassName()).matches(); 1.5 } 1.6 1.7 - Pattern pattern; 1.8 + private final Pattern pattern; 1.9 } 1.10 1.11 /** 1.12 @@ -448,8 +448,8 @@ 1.13 return false; 1.14 } 1.15 1.16 - Set<String> packageNames; 1.17 - boolean matchSubpackages; 1.18 + private final Set<String> packageNames; 1.19 + private final boolean matchSubpackages; 1.20 } 1.21 1.22 1.23 @@ -543,8 +543,8 @@ 1.24 1.25 class Visitor implements ConstantPool.Visitor<Void,Void>, Type.Visitor<Void, Void> { 1.26 private ConstantPool constant_pool; 1.27 - private Set<Dependency> deps; 1.28 private Location origin; 1.29 + Set<Dependency> deps; 1.30 1.31 Visitor(ClassFile classFile) { 1.32 try {
2.1 --- a/src/share/classes/com/sun/tools/classfile/Dependency.java Sat Dec 12 09:28:40 2009 -0800 2.2 +++ b/src/share/classes/com/sun/tools/classfile/Dependency.java Tue Dec 15 13:26:06 2009 -0800 2.3 @@ -54,7 +54,7 @@ 2.4 /** 2.5 * Find the immediate dependencies of a given class file. 2.6 * @param classfile the class file to be examined 2.7 - * @return the set of dependencies located in the given class file. 2.8 + * @return the dependencies located in the given class file. 2.9 */ 2.10 public Iterable<? extends Dependency> findDependencies(ClassFile classfile); 2.11 }
3.1 --- a/test/tools/javap/classfile/deps/GetDeps.java Sat Dec 12 09:28:40 2009 -0800 3.2 +++ b/test/tools/javap/classfile/deps/GetDeps.java Tue Dec 15 13:26:06 2009 -0800 3.3 @@ -186,7 +186,7 @@ 3.4 3.5 private Comparator<Dependency> originComparator = new Comparator<Dependency>() { 3.6 public int compare(Dependency o1, Dependency o2) { 3.7 - return o1.getTarget().toString().compareTo(o2.getOrigin().toString()); 3.8 + return o1.getOrigin().toString().compareTo(o2.getOrigin().toString()); 3.9 } 3.10 }; 3.11