Attachment #66665 for bug #142848

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 142848
Collapse All | Expand All




                            Map<ElementHandle, Collection<String>> members = RebuildOraculum.sortOut(jt.getElements(), types);
                            toRecompile.addAll(RebuildOraculum.get().findFilesToRebuild(rootFile, activeTuple.file.toURI().toURL(), cpInfo, members));
                        }
                        for (JavaFileObject generated : jt.generate(types)) {   //Analyzing genlist may be a bit faster
                        Iterable<? extends JavaFileObject> generatedFiles;
                        boolean clearJavac = false;

                        if (activeTuple.file != null && "package-info.java".equals(activeTuple.file.getName())) {
                            //XXX: "types" are empty for package-info. will generate everything and use new javac to process the rest of the files:
                            generatedFiles = jt.generate();
                            clearJavac = true;
                        } else {
                            generatedFiles = jt.generate(types);
                        }

                        for (JavaFileObject generated : generatedFiles) {   //Analyzing genlist may be a bit faster
                            if (generated instanceof OutputFileObject) {
                                if (addedFiles != null) {
                                    addedFiles.add(((OutputFileObject) generated).getFile());

                                //XXX: log (presumably should not happen)
                            }
                        }

                        if (clearJavac) {
                            if (jt != null) {
                                jt.finish();
                            }
                            jt = null;
                            listener.cleanDiagnostics();
                        }
                        
                        activeTuple = null;
                        state  = 0;
                    } catch (CouplingAbort a) {

Line 1 Link Here

(-)a/libs.javacimpl/external/javac-impl-nb-7.0-b07.jar (-1 / +1 lines)
1	<<<EXTERNAL 364D7C957FE35837E20DDBFC2C04CE82A3145DF2-javac-impl-nb-7.0-b07.jar>>>	1	<<<EXTERNAL E430FAF8368BE289F38C07641F4411BE6D740165-javac-impl-nb-7.0-b07.jar>>>

Return to bug 142848

Lines 3127-3145 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/usages/RepositoryUpdater.java (-22 / +1 lines)
3127	Map<ElementHandle, Collection<String>> members = RebuildOraculum.sortOut(jt.getElements(), types);	3127	Map<ElementHandle, Collection<String>> members = RebuildOraculum.sortOut(jt.getElements(), types);
3128	toRecompile.addAll(RebuildOraculum.get().findFilesToRebuild(rootFile, activeTuple.file.toURI().toURL(), cpInfo, members));	3128	toRecompile.addAll(RebuildOraculum.get().findFilesToRebuild(rootFile, activeTuple.file.toURI().toURL(), cpInfo, members));
3129	}	3129	}
3130		3130	for (JavaFileObject generated : jt.generate(types)) { //Analyzing genlist may be a bit faster
3131	Iterable<? extends JavaFileObject> generatedFiles;
3132	boolean clearJavac = false;
3133
3134	if (activeTuple.file != null && "package-info.java".equals(activeTuple.file.getName())) {
3135	//XXX: "types" are empty for package-info. will generate everything and use new javac to process the rest of the files:
3136	generatedFiles = jt.generate();
3137	clearJavac = true;
3138	} else {
3139	generatedFiles = jt.generate(types);
3140	}
3141
3142	for (JavaFileObject generated : generatedFiles) { //Analyzing genlist may be a bit faster
3143	if (generated instanceof OutputFileObject) {	3131	if (generated instanceof OutputFileObject) {
3144	if (addedFiles != null) {	3132	if (addedFiles != null) {
3145	addedFiles.add(((OutputFileObject) generated).getFile());	3133	addedFiles.add(((OutputFileObject) generated).getFile());
Lines 3148-3162 Link Here
3148	//XXX: log (presumably should not happen)	3136	//XXX: log (presumably should not happen)
3149	}	3137	}
3150	}	3138	}
3151
3152	if (clearJavac) {
3153	if (jt != null) {
3154	jt.finish();
3155	}
3156	jt = null;
3157	listener.cleanDiagnostics();
3158	}
3159
3160	activeTuple = null;	3139	activeTuple = null;
3161	state = 0;	3140	state = 0;
3162	} catch (CouplingAbort a) {	3141	} catch (CouplingAbort a) {