|
Lines 1779-1785
Link Here
|
| 1779 |
return true; |
1779 |
return true; |
| 1780 |
} |
1780 |
} |
| 1781 |
|
1781 |
|
| 1782 |
private void parseFiles(URL root, final File classCache, boolean isInitialCompilation, Iterable<File> children, boolean clean, ProgressHandle handle, JavaFileFilterImplementation filter, Map<String,List<File>> resources, Set<File> compiledFiles, Set<File> toRecompile, Map<URI, List<String>> misplacedSource2FQNs) throws IOException { |
1782 |
private void parseFiles(URL root, final File classCache, boolean isInitialCompilation, Iterable<File> children, |
|
|
1783 |
boolean clean, ProgressHandle handle, JavaFileFilterImplementation filter, |
| 1784 |
Map<String,List<File>> resources, Set<File> compiledFiles, Set<File> toRecompile, |
| 1785 |
Map<URI, List<String>> misplacedSource2FQNs, boolean allowCancel) throws IOException { |
| 1786 |
assert !allowCancel || compiledFiles != null; |
| 1783 |
LOGGER.fine("parseFiles: " + root); |
1787 |
LOGGER.fine("parseFiles: " + root); |
| 1784 |
final FileObject rootFo = URLMapper.findFileObject(root); |
1788 |
final FileObject rootFo = URLMapper.findFileObject(root); |
| 1785 |
if (rootFo == null) { |
1789 |
if (rootFo == null) { |
|
Lines 1993-1999
Link Here
|
| 1993 |
handle.setDisplayName(message); |
1997 |
handle.setDisplayName(message); |
| 1994 |
} |
1998 |
} |
| 1995 |
errorBadgesToRefresh.addAll(batchCompile(toCompile, rootFo, cpInfo, sa, dirtyCrossFiles, |
1999 |
errorBadgesToRefresh.addAll(batchCompile(toCompile, rootFo, cpInfo, sa, dirtyCrossFiles, |
| 1996 |
compiledFiles, compiledFiles != null ? canceled : null, added, |
2000 |
compiledFiles, allowCancel ? canceled : null, added, |
| 1997 |
isInitialCompilation ? RepositoryUpdater.this.closed:null, toRecompile, misplacedSource2FQNs)); |
2001 |
isInitialCompilation ? RepositoryUpdater.this.closed:null, toRecompile, misplacedSource2FQNs)); |
| 1998 |
} |
2002 |
} |
| 1999 |
Set<ElementHandle<TypeElement>> _at = null; |
2003 |
Set<ElementHandle<TypeElement>> _at = null; |
|
Lines 2089-2095
Link Here
|
| 2089 |
Map <String,List<File>> resources = getAllClassFiles(classCache, FileObjects.getRelativePath(rootFile,folderFile),true); |
2093 |
Map <String,List<File>> resources = getAllClassFiles(classCache, FileObjects.getRelativePath(rootFile,folderFile),true); |
| 2090 |
final LazyFileList children = new LazyFileList(folderFile); |
2094 |
final LazyFileList children = new LazyFileList(folderFile); |
| 2091 |
Set<File> compiledFiles = new HashSet<File>(); |
2095 |
Set<File> compiledFiles = new HashSet<File>(); |
| 2092 |
parseFiles(root, classCache, isInitialCompilation, children, clean, handle, filter, resources, compiledFiles, null, misplacedSource2FQNs); |
2096 |
parseFiles(root, classCache, isInitialCompilation, children, clean, handle, filter, resources, compiledFiles, null, misplacedSource2FQNs, false); |
| 2093 |
|
2097 |
|
| 2094 |
if (!misplacedSource2FQNs.isEmpty()) { |
2098 |
if (!misplacedSource2FQNs.isEmpty()) { |
| 2095 |
if (LOGGER.isLoggable(Level.FINE)) { |
2099 |
if (LOGGER.isLoggable(Level.FINE)) { |
|
Lines 2101-2107
Link Here
|
| 2101 |
|
2105 |
|
| 2102 |
gatherResourceForParseFilesFromRoot(compiledFiles, rootFile, classCache, resources); |
2106 |
gatherResourceForParseFilesFromRoot(compiledFiles, rootFile, classCache, resources); |
| 2103 |
|
2107 |
|
| 2104 |
parseFiles(root, classCache, isInitialCompilation, compiledFiles, true, handle, filter, resources, null, null, misplacedSource2FQNs); |
2108 |
parseFiles(root, classCache, isInitialCompilation, compiledFiles, true, handle, filter, resources, null, null, misplacedSource2FQNs, false); |
| 2105 |
} |
2109 |
} |
| 2106 |
} catch (OutputFileManager.InvalidSourcePath e) { |
2110 |
} catch (OutputFileManager.InvalidSourcePath e) { |
| 2107 |
//Deleted project, ignore |
2111 |
//Deleted project, ignore |
|
Lines 2446-2452
Link Here
|
| 2446 |
} |
2450 |
} |
| 2447 |
} |
2451 |
} |
| 2448 |
|
2452 |
|
| 2449 |
private Map<URL, Collection<File>> compileFileFromRoots(Map<URL, Collection<File>> toRecompile, boolean cancellable, Map<URL, Collection<File>> depsToRecompile) throws IOException { |
2453 |
private Map<URL, Collection<File>> compileFileFromRoots(Map<URL, Collection<File>> toRecompile, final boolean cancellable, Map<URL, Collection<File>> depsToRecompile) throws IOException { |
| 2450 |
List<URL> handledRoots = new LinkedList<URL>(); |
2454 |
List<URL> handledRoots = new LinkedList<URL>(); |
| 2451 |
|
2455 |
|
| 2452 |
ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(RepositoryUpdater.class,"MSG_RefreshingWorkspace")); |
2456 |
ProgressHandle handle = ProgressHandleFactory.createHandle(NbBundle.getMessage(RepositoryUpdater.class,"MSG_RefreshingWorkspace")); |
|
Lines 2487-2493
Link Here
|
| 2487 |
|
2491 |
|
| 2488 |
final Map<URI, List<String>> misplacedSource2FQNs = new HashMap<URI, List<String>>(); |
2492 |
final Map<URI, List<String>> misplacedSource2FQNs = new HashMap<URI, List<String>>(); |
| 2489 |
|
2493 |
|
| 2490 |
parseFiles(root, cacheRoot, false, files, true, handle, filter, resources, compiledFiles, thisDepsToRecompile, misplacedSource2FQNs); |
2494 |
parseFiles(root, cacheRoot, false, files, true, handle, filter, resources, compiledFiles, thisDepsToRecompile, misplacedSource2FQNs, cancellable); |
| 2491 |
|
2495 |
|
| 2492 |
if (!misplacedSource2FQNs.isEmpty()) { |
2496 |
if (!misplacedSource2FQNs.isEmpty()) { |
| 2493 |
if (LOGGER.isLoggable(Level.FINE)) { |
2497 |
if (LOGGER.isLoggable(Level.FINE)) { |
|
Lines 2498-2504
Link Here
|
| 2498 |
resources.clear(); |
2502 |
resources.clear(); |
| 2499 |
gatherResourceForParseFilesFromRoot(files, rootFile, cacheRoot, resources); |
2503 |
gatherResourceForParseFilesFromRoot(files, rootFile, cacheRoot, resources); |
| 2500 |
|
2504 |
|
| 2501 |
parseFiles(root, cacheRoot, false, files, true, handle, filter, resources, compiledFiles, thisDepsToRecompile, misplacedSource2FQNs); |
2505 |
parseFiles(root, cacheRoot, false, files, true, handle, filter, resources, compiledFiles, thisDepsToRecompile, misplacedSource2FQNs, cancellable); |
| 2502 |
} |
2506 |
} |
| 2503 |
|
2507 |
|
| 2504 |
if (thisDepsToRecompile != null && !thisDepsToRecompile.isEmpty()) { |
2508 |
if (thisDepsToRecompile != null && !thisDepsToRecompile.isEmpty()) { |