mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-12 11:35:21 +02:00
Code Issues Wiki Activity

1. Initial fix for [Bug 198490] .project file rewriiten on every build

Browse source 
2. Initial fix for [Bug 193518] Project description modified needlessly
This commit is contained in:
Mikhail Sennikovsky 2007-09-10 13:20:56 +00:00
parent f08b682189
commit 2ad921c961
2 changed files with 6 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationSpecSettings.java
View file

@ -392,7 +392,7 @@ public class CConfigurationSpecSettings implements ICSettingsStorage{
return CfgExportSettingContainerFactory.getReferenceMap(fCfg); return CfgExportSettingContainerFactory.getReferenceMap(fCfg);
if(fRefMapCache == null) if(fRefMapCache == null)
fRefMapCache = CfgExportSettingContainerFactory.getReferenceMap(fCfg); fRefMapCache = CfgExportSettingContainerFactory.getReferenceMap(fCfg);
return fRefMapCache; return new HashMap(fRefMapCache);
// if(fRefInfoMap == null || fRefInfoMap.size() == 0) // if(fRefInfoMap == null || fRefInfoMap.size() == 0)
// return new HashMap(0); // return new HashMap(0);
// //

44
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
View file

@ -1186,7 +1186,7 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
Set curSet = new HashSet(Arrays.asList(natureIds)); Set curSet = new HashSet(Arrays.asList(natureIds));
// Set newSet = new HashSet(Arrays.asList(newNatures)); // Set newSet = new HashSet(Arrays.asList(newNatures));
// Set oldSet = new HashSet(Arrays.asList(oldNatures)); // Set oldSet = new HashSet(Arrays.asList(oldNatures));
Set newCurSet = new HashSet(curSet); HashSet newCurSet = new HashSet(curSet);
// newSet.removeAll(oldSet); // newSet.removeAll(oldSet);
// oldSet.removeAll(tmp); // oldSet.removeAll(tmp);
@ -1202,45 +1202,9 @@ public class CProjectDescriptionManager implements ICProjectDescriptionManager {
return false; return false;
//// List[] natureDiff = ListComparator.compare(newNatures, oldNatures);
//
//// String newBuilderIds[] = newDr.getBuilderIds();
//// String oldBuilderIds[] = oldDr.getBuilderIds();
//// List[] builderDiff = ListComparator.compare(newBuilderIds, oldBuilderIds);
//
// if(natureDiff != null /*|| builderDiff != null*/){
//// boolean applyDes = false;
//// if(des == null){
//// des = project.getDescription();
//// applyDes = true;
//// }
//
// String natureIds[] = des.getNatureIds();
// if(natureDiff[1] != null){
// List remaining = ListComparator.getAdded(natureIds, natureDiff[1].toArray());
// if(remaining != null){
// natureIds = (String[])remaining.toArray(new String[remaining.size()]);
// }
// }
//
// if(natureDiff[0] != null){
// Set set = new HashSet();
// set.addAll(Arrays.asList(natureIds));
// set.addAll(natureDiff[0]);
// natureIds = (String[])set.toArray(new String[set.size()]);
// }
//// if(builderDiff != null){
////
//// }
//
// if(natureDiff != null)
// des.setNatureIds(natureIds);
//
//// if(applyDes)
//// project.setDescription(des, monitor);
// return true;
// }
// return false;
} }
public void setProjectDescription(IProject project, ICProjectDescription des) throws CoreException { public void setProjectDescription(IProject project, ICProjectDescription des) throws CoreException {