mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 08:55:25 +02:00
Code Issues Wiki Activity

Fix for [Bug 178960] New source folder wizard dont updates / overwrites source locations and [Bug 178970] new source folder wizard creates extra includes paths

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-03-23 15:33:28 +00:00
parent fc81dd18e0
commit 5d85dce38e
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java
View file

@ -45,6 +45,7 @@ import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.views.navigator.ResourceComparator;
import org.eclipse.cdt.core.CCProjectNature;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.CProjectNature;
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel;
@ -55,6 +56,11 @@ import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.core.model.ISourceEntry;
import org.eclipse.cdt.core.model.ISourceRoot;
import org.eclipse.cdt.core.settings.model.CSourceEntry;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.core.settings.model.ICSourceEntry;
import org.eclipse.cdt.core.settings.model.WriteAccessException;
import org.eclipse.cdt.ui.CElementLabelProvider;
import org.eclipse.cdt.ui.CUIPlugin;
@ -429,7 +435,14 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
throw new InterruptedException();
}
fCurrCProject.setRawPathEntries(fNewEntries, new SubProgressMonitor(monitor, 2));
if(CCorePlugin.getDefault().isNewStyleProject(fCurrCProject.getProject())){
ICSourceEntry newEntry = new CSourceEntry(folder, null, 0);
ICProjectDescription des = CCorePlugin.getDefault().getProjectDescription(fCurrCProject.getProject(), true);
addEntryToAllCfgs(des, newEntry, fIsProjectAsSourceFolder);
CCorePlugin.getDefault().setProjectDescription(fCurrCProject.getProject(), des, false, new SubProgressMonitor(monitor, 2));
} else {
fCurrCProject.setRawPathEntries(fNewEntries, new SubProgressMonitor(monitor, 2));
}
fCreatedRoot= fCurrCProject.findSourceRoot(folder);
} finally {
@ -437,6 +450,28 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage {
}
}
private void addEntryToAllCfgs(ICProjectDescription des, ICSourceEntry entry, boolean removeProj) throws WriteAccessException, CoreException{
ICConfigurationDescription cfgs[] = des.getConfigurations();
for(int i = 0; i < cfgs.length; i++){
ICConfigurationDescription cfg = cfgs[i];
ICSourceEntry[] entries = cfg.getSourceEntries();
entries = addEntry(entries, entry, removeProj);
cfg.setSourceEntries(entries);
}
}
private ICSourceEntry[] addEntry(ICSourceEntry[] entries, ICSourceEntry entry, boolean removeProj){
Set set = new HashSet();
for(int i = 0; i < entries.length; i++){
if(removeProj && new Path(entries[i].getValue()).segmentCount() == 0)
continue;
set.add(entries[i]);
}
set.add(entry);
return (ICSourceEntry[])set.toArray(new ICSourceEntry[set.size()]);
}
// ------------- choose dialogs
private IFolder chooseFolder(String title, String message, IPath initialPath) {