equal
deleted
inserted
replaced
69 { |
69 { |
70 Path mdir = mpath.resolve(modulename); |
70 Path mdir = mpath.resolve(modulename); |
71 if (Files.exists(mdir) && Files.isDirectory(mdir)) { |
71 if (Files.exists(mdir) && Files.isDirectory(mdir)) { |
72 return ClassFileReader.newInstance(mdir); |
72 return ClassFileReader.newInstance(mdir); |
73 } else { |
73 } else { |
74 // aggregator module or os-specific module in modules.xml |
74 // aggregator module or os-specific module in jdeps-modules.xml |
75 // mdir not exist |
75 // mdir not exist |
76 return defaultReader; |
76 return defaultReader; |
77 } |
77 } |
78 } |
78 } |
79 class NonExistModuleReader extends ClassFileReader { |
79 class NonExistModuleReader extends ClassFileReader { |
122 private static final String INCLUDE = "include"; |
122 private static final String INCLUDE = "include"; |
123 private static final QName REEXPORTS = new QName("re-exports"); |
123 private static final QName REEXPORTS = new QName("re-exports"); |
124 public Set<Module> load(InputStream in) throws XMLStreamException, IOException { |
124 public Set<Module> load(InputStream in) throws XMLStreamException, IOException { |
125 Set<Module> modules = new HashSet<>(); |
125 Set<Module> modules = new HashSet<>(); |
126 if (in == null) { |
126 if (in == null) { |
127 System.err.println("WARNING: modules.xml doesn't exist"); |
127 throw new RuntimeException("jdeps-modules.xml doesn't exist"); |
128 return modules; |
|
129 } |
128 } |
130 XMLInputFactory factory = XMLInputFactory.newInstance(); |
129 XMLInputFactory factory = XMLInputFactory.newInstance(); |
131 XMLEventReader reader = factory.createXMLEventReader(in, "UTF-8"); |
130 XMLEventReader reader = factory.createXMLEventReader(in, "UTF-8"); |
132 Module.Builder mb = null; |
131 Module.Builder mb = null; |
133 String modulename = null; |
132 String modulename = null; |