Attachment #127488 for bug #221835

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 221835
Collapse All | Expand All




            return;
        }

        boolean toolColectionChanged = false;
        // Check compiler collection. Fire if different (IZ 131825)
        if (!oldMConf.getCompilerSet().getName().equals(newMConf.getCompilerSet().getName())
                || !oldMConf.getDevelopmentHost().getExecutionEnvironment().equals(newMConf.getDevelopmentHost().getExecutionEnvironment())) {
            fireFilesPropertiesChanged(); // firePropertiesChanged(getAllFiles(), true);
            MakeLogicalViewProvider.checkForChangedViewItemNodes(proj, null, null);
            if (!oldMConf.getDevelopmentHost().getExecutionEnvironment().equals(newMConf.getDevelopmentHost().getExecutionEnvironment())) {
                MakeLogicalViewProvider.checkForChangedName(proj);
            }
            toolColectionChanged = true;
        }
        
        if (toolColectionChanged && newConf.getName().equals(oldConf.getName())) {
            fireFilesPropertiesChanged();
            return;
        }


                    added.add(items[i]);
                }
                MakeLogicalViewProvider.checkForChangedViewItemNodes(proj, null, items[i]);
            }

            if (newItemConf.getExcluded().getValue()) {
                continue;
            }


                    list.add(items[i]);
                    continue;
                }
            } else if (newItemConf.getTool() == PredefinedToolKind.CCCompiler) {
            if (newItemConf.getTool() == PredefinedToolKind.CCCompiler) {
                if (oldItemConf.getTool() != PredefinedToolKind.CCCompiler) {
                    list.add(items[i]);
                    continue;

        fireFilesRemoved(deleted);
        fireFilesAdded(added);
        if (!list.isEmpty()) {
            fireFilesPropertiesChanged(list);
        }
        if (toolColectionChanged) {
            fireFilesPropertiesChanged();
        }
    }


Lines 312-317 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/MakeCustomizerProvider.java (+3 lines)
312	List<String> oldTestRoots = ((MakeConfigurationDescriptor) projectDescriptor).getTestRoots();	312	List<String> oldTestRoots = ((MakeConfigurationDescriptor) projectDescriptor).getTestRoots();
313	List<String> newTestRoots = ((MakeConfigurationDescriptor) clonedProjectdescriptor).getTestRoots();	313	List<String> newTestRoots = ((MakeConfigurationDescriptor) clonedProjectdescriptor).getTestRoots();
314	Configuration oldActive = projectDescriptor.getConfs().getActive();	314	Configuration oldActive = projectDescriptor.getConfs().getActive();
		315	if (oldActive != null) {
		316	oldActive = oldActive.cloneConf();
		317	}
315	Configuration newActive = clonedProjectdescriptor.getConfs().getActive();	318	Configuration newActive = clonedProjectdescriptor.getConfs().getActive();
316		319
317	projectDescriptor.assign(clonedProjectdescriptor);	320	projectDescriptor.assign(clonedProjectdescriptor);

Return to bug 221835

Lines 456-469 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/NativeProjectProvider.java (-7 / +11 lines)
456	return;	456	return;
457	}	457	}
458		458
		459	boolean toolColectionChanged = false;
459	// Check compiler collection. Fire if different (IZ 131825)	460	// Check compiler collection. Fire if different (IZ 131825)
460	if (!oldMConf.getCompilerSet().getName().equals(newMConf.getCompilerSet().getName())	461	if (!oldMConf.getCompilerSet().getName().equals(newMConf.getCompilerSet().getName())
461	\|\| !oldMConf.getDevelopmentHost().getExecutionEnvironment().equals(newMConf.getDevelopmentHost().getExecutionEnvironment())) {	462	\|\| !oldMConf.getDevelopmentHost().getExecutionEnvironment().equals(newMConf.getDevelopmentHost().getExecutionEnvironment())) {
462	fireFilesPropertiesChanged(); // firePropertiesChanged(getAllFiles(), true);
463	MakeLogicalViewProvider.checkForChangedViewItemNodes(proj, null, null);	463	MakeLogicalViewProvider.checkForChangedViewItemNodes(proj, null, null);
464	if (!oldMConf.getDevelopmentHost().getExecutionEnvironment().equals(newMConf.getDevelopmentHost().getExecutionEnvironment())) {	464	if (!oldMConf.getDevelopmentHost().getExecutionEnvironment().equals(newMConf.getDevelopmentHost().getExecutionEnvironment())) {
465	MakeLogicalViewProvider.checkForChangedName(proj);	465	MakeLogicalViewProvider.checkForChangedName(proj);
466	}	466	}
		467	toolColectionChanged = true;
		468	}
		469
		470	if (toolColectionChanged && newConf.getName().equals(oldConf.getName())) {
		471	fireFilesPropertiesChanged();
467	return;	472	return;
468	}	473	}
469		474
Lines 490-498 Link Here
490	added.add(items[i]);	495	added.add(items[i]);
491	}	496	}
492	MakeLogicalViewProvider.checkForChangedViewItemNodes(proj, null, items[i]);	497	MakeLogicalViewProvider.checkForChangedViewItemNodes(proj, null, items[i]);
493	}
494
495	if (newItemConf.getExcluded().getValue()) {
496	continue;	498	continue;
497	}	499	}
498		500
Lines 515-522 Link Here
515	list.add(items[i]);	517	list.add(items[i]);
516	continue;	518	continue;
517	}	519	}
518	}	520	} else if (newItemConf.getTool() == PredefinedToolKind.CCCompiler) {
519	if (newItemConf.getTool() == PredefinedToolKind.CCCompiler) {
520	if (oldItemConf.getTool() != PredefinedToolKind.CCCompiler) {	521	if (oldItemConf.getTool() != PredefinedToolKind.CCCompiler) {
521	list.add(items[i]);	522	list.add(items[i]);
522	continue;	523	continue;
Lines 540-546 Link Here
540	fireFilesRemoved(deleted);	541	fireFilesRemoved(deleted);
541	fireFilesAdded(added);	542	fireFilesAdded(added);
542	if (!list.isEmpty()) {	543	if (!list.isEmpty()) {
543	this.fireFilesPropertiesChanged(list);	544	fireFilesPropertiesChanged(list);
		545	}
		546	if (toolColectionChanged) {
		547	fireFilesPropertiesChanged();
544	}	548	}
545	}	549	}
546		550