make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotatedDependency.java

@@ -34,10 +34,11 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.Map;
 
 import com.sun.classanalyzer.Module.Reference;
+import com.sun.classanalyzer.ModuleInfo.Dependence;
 import java.util.LinkedList;
 import java.util.TreeMap;
 
 /**
  *

@@ -275,11 +276,11 @@
                 "META-INF" + File.separator + "services" + File.separator;
 
         static void readServiceConfiguration(String config, List<String> names) {
             BufferedReader br = null;
             try {
-                InputStream is = ClassPath.open(config);
+                InputStream is = ClassPaths.open(config);
                 if (is != null) {
                     // Properties doesn't perserve the order of the input file
                     br = new BufferedReader(new InputStreamReader(is, "utf-8"));
                     int lc = 1;
                     while ((lc = parseLine(br, lc, names)) >= 0);

@@ -569,21 +570,21 @@
             }
         }
         return result;
     }
 
-    static Set<Module.Dependency> getDependencies(Module m) {
+    static Set<Dependence> getDependencies(Module m) {
         // ensure it's initialized
         initDependencies();
 
-        Set<Module.Dependency> deps = new TreeSet<Module.Dependency>();
+        Set<Dependence> deps = new TreeSet<Dependence>();
         for (Reference ref : annotatedDepsMap.keySet()) {
             if (m.contains(ref.referrer())) {
                 Module other = m.getModuleDependence(ref.referree());
                 if (other != null) {
                     for (AnnotatedDependency ad : annotatedDepsMap.get(ref)) {
-                        Module.Dependency d = new Module.Dependency(other, ad.isOptional(), ad.isDynamic());
+                        Dependence d = new Dependence(other, ad.isOptional());
                         deps.add(d);
                     }
                 }
             }
         }