src/jdk.compiler/share/classes/com/sun/tools/sjavac/Module.java

rev 2819 : imported patch my-classpath-deps-00

*** 26,39 ****
  package com.sun.tools.sjavac;
  
  import java.io.File;
  import java.net.URI;
  import java.util.HashMap;
- import java.util.List;
  import java.util.Map;
  import java.util.Set;
  
  /**
   * The module is the root of a set of packages/sources/artifacts.
   * At the moment there is only one module in use, the empty/no-name/default module.
   *
   *  <p><b>This is NOT part of any supported API.
--- 26,40 ----
  package com.sun.tools.sjavac;
  
  import java.io.File;
  import java.net.URI;
  import java.util.HashMap;
  import java.util.Map;
  import java.util.Set;
  
+ import com.sun.tools.sjavac.pubapi.PubApi;
+ 
  /**
   * The module is the root of a set of packages/sources/artifacts.
   * At the moment there is only one module in use, the empty/no-name/default module.
   *
   *  <p><b>This is NOT part of any supported API.
*** 84,105 ****
          if (cp == -1) return null;
          String name = l.substring(2,cp);
          return new Module(name, "");
      }
  
!     public static void saveModules(Map<String,Module> ms, StringBuilder b)
!     {
          for (Module m : ms.values()) {
              m.save(b);
          }
      }
  
      public void addPackage(Package p) {
          packages.put(p.name(), p);
      }
  
      public Package lookupPackage(String pkg) {
          Package p = packages.get(pkg);
          if (p == null) {
              p = new Package(this, pkg);
              packages.put(pkg, p);
          }
--- 85,106 ----
          if (cp == -1) return null;
          String name = l.substring(2,cp);
          return new Module(name, "");
      }
  
!     public static void saveModules(Map<String,Module> ms, StringBuilder b) {
          for (Module m : ms.values()) {
              m.save(b);
          }
      }
  
      public void addPackage(Package p) {
          packages.put(p.name(), p);
      }
  
      public Package lookupPackage(String pkg) {
+         // See JDK-8071904
          Package p = packages.get(pkg);
          if (p == null) {
              p = new Package(this, pkg);
              packages.put(pkg, p);
          }
*** 122,141 ****
          for (URI u : as) {
              p.addArtifact(new File(u));
          }
      }
  
!     public void setDependencies(String pkg, Set<String> deps) {
!         Package p = lookupPackage(pkg);
!         p.setDependencies(deps);
      }
  
!     public void setPubapi(String pkg, List<String> ps) {
          Package p = lookupPackage(pkg);
          p.setPubapi(ps);
      }
  
!     public boolean hasPubapiChanged(String pkg, List<String> ps) {
          Package p = lookupPackage(pkg);
!         return p.hasPubapiChanged(ps);
      }
  }
--- 123,141 ----
          for (URI u : as) {
              p.addArtifact(new File(u));
          }
      }
  
!     public void setDependencies(String pkg, Map<String, Set<String>> deps, boolean cp) {
!         lookupPackage(pkg).setDependencies(deps, cp);
      }
  
!     public void setPubapi(String pkg, PubApi ps) {
          Package p = lookupPackage(pkg);
          p.setPubapi(ps);
      }
  
!     public boolean hasPubapiChanged(String pkg, PubApi newPubApi) {
          Package p = lookupPackage(pkg);
!         return p.hasPubApiChanged(newPubApi);
      }
  }