< prev index next >

test/tools/javac/diags/Example.java

Print this page
rev 3947 : imported patch xmodule-to-patch-module

*** 61,70 **** --- 61,71 ---- declaredKeys = new TreeSet<String>(); srcFiles = new ArrayList<File>(); procFiles = new ArrayList<File>(); srcPathFiles = new ArrayList<File>(); moduleSourcePathFiles = new ArrayList<File>(); + patchModulePathFiles = new ArrayList<File>(); modulePathFiles = new ArrayList<File>(); classPathFiles = new ArrayList<File>(); additionalFiles = new ArrayList<File>(); nonEmptySrcFiles = new ArrayList<File>();
*** 86,95 **** --- 87,99 ---- srcPathDir = c; findFiles(c, srcPathFiles); } else if (files == srcFiles && c.getName().equals("modulesourcepath")) { moduleSourcePathDir = c; findFiles(c, moduleSourcePathFiles); + } else if (files == srcFiles && c.getName().equals("patchmodule")) { + patchModulePathDir = c; + findFiles(c, patchModulePathFiles); } else if (files == srcFiles && c.getName().equals("additional")) { additionalFilesDir = c; findFiles(c, additionalFiles); } else if (files == srcFiles && c.getName().equals("modulepath")) { findFiles(c, modulePathFiles);
*** 270,279 **** --- 274,293 ---- files = new ArrayList<>(); files.addAll(moduleSourcePathFiles); files.addAll(nonEmptySrcFiles); // srcFiles containing declarations } + if (patchModulePathDir != null) { + for (File mod : patchModulePathDir.listFiles()) { + opts.add("--patch-module"); + opts.add(mod.getName() + "=" + mod.getPath()); + } + files = new ArrayList<>(); + files.addAll(patchModulePathFiles); + files.addAll(nonEmptySrcFiles); // srcFiles containing declarations + } + if (additionalFiles.size() > 0) { List<String> sOpts = Arrays.asList("-d", classesDir.getPath()); new Jsr199Compiler(verbose).run(null, null, false, sOpts, additionalFiles); }
*** 341,353 **** --- 355,369 ---- File file; List<File> srcFiles; List<File> procFiles; File srcPathDir; File moduleSourcePathDir; + File patchModulePathDir; File additionalFilesDir; List<File> srcPathFiles; List<File> moduleSourcePathFiles; + List<File> patchModulePathFiles; List<File> modulePathFiles; List<File> classPathFiles; List<File> additionalFiles; List<File> nonEmptySrcFiles; File infoFile;
< prev index next >