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

Minor updates to the DescriptionScannerInfoProvider logic

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-03-30 07:45:36 +00:00
parent cdcd208521
commit df98c2f9cf
2 changed files with 32 additions and 9 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/core/model/CoreModel.java
View file

@ -20,8 +20,6 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICLanguageSetting; import org.eclipse.cdt.core.settings.model.ICLanguageSetting;
import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.core.settings.model.ICResourceDescription;
import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.core.settings.model.WriteAccessException; import org.eclipse.cdt.core.settings.model.WriteAccessException;
import org.eclipse.cdt.internal.core.model.APathEntry; import org.eclipse.cdt.internal.core.model.APathEntry;
import org.eclipse.cdt.internal.core.model.BatchOperation; import org.eclipse.cdt.internal.core.model.BatchOperation;

35
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/DescriptionScannerInfoProvider.java
View file

@ -13,7 +13,6 @@ package org.eclipse.cdt.internal.core.settings.model;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Map; import java.util.Map;
@ -44,6 +43,8 @@ public class DescriptionScannerInfoProvider implements IScannerInfoProvider, ICP
private ICProjectDescription fProjDes; private ICProjectDescription fProjDes;
private ICConfigurationDescription fCfgDes; private ICConfigurationDescription fCfgDes;
private Map fIdToLanguageSettingsMap = Collections.synchronizedMap(new HashMap()); private Map fIdToLanguageSettingsMap = Collections.synchronizedMap(new HashMap());
private String fCurrentFileDescriptionId;
private IScannerInfo fCurrentFileScannerInfo;
private static final ScannerInfo INEXISTENT_SCANNER_INFO = new ScannerInfo(); private static final ScannerInfo INEXISTENT_SCANNER_INFO = new ScannerInfo();
private boolean fInited; private boolean fInited;
@ -61,6 +62,8 @@ public class DescriptionScannerInfoProvider implements IScannerInfoProvider, ICP
} }
fIdToLanguageSettingsMap.clear(); fIdToLanguageSettingsMap.clear();
fCurrentFileDescriptionId = null;
fCurrentFileScannerInfo = null;
} }
public IProject getProject(){ public IProject getProject(){
@ -75,9 +78,10 @@ public class DescriptionScannerInfoProvider implements IScannerInfoProvider, ICP
return INEXISTENT_SCANNER_INFO; return INEXISTENT_SCANNER_INFO;
ICLanguageSetting setting = null; ICLanguageSetting setting = null;
ICResourceDescription rcDes = null;
if(resource.getType() != IResource.PROJECT){ if(resource.getType() != IResource.PROJECT){
IPath rcPath = resource.getProjectRelativePath(); IPath rcPath = resource.getProjectRelativePath();
ICResourceDescription rcDes = fCfgDes.getResourceDescription(rcPath, false); rcDes = fCfgDes.getResourceDescription(rcPath, false);
if(rcDes.getType() == ICSettingBase.SETTING_FILE){ if(rcDes.getType() == ICSettingBase.SETTING_FILE){
setting = ((ICFileDescription)rcDes).getLanguageSetting(); setting = ((ICFileDescription)rcDes).getLanguageSetting();
@ -92,18 +96,39 @@ public class DescriptionScannerInfoProvider implements IScannerInfoProvider, ICP
} }
} }
} }
return getScannerInfo(setting); return getScannerInfo(rcDes, setting);
} }
private IScannerInfo getScannerInfo(ICLanguageSetting ls){ private IScannerInfo getScannerInfo(ICResourceDescription rcDes, ICLanguageSetting ls){
Object mapKey = ls != null ? ls.getId() : null; Object mapKey = ls != null ? ls.getId() : null;
// if(ls == null) // if(ls == null)
// return INEXISTENT_SCANNER_INFO; // return INEXISTENT_SCANNER_INFO;
boolean useMap = rcDes == null || rcDes.getType() == ICSettingBase.SETTING_FOLDER;
IScannerInfo info = (IScannerInfo)fIdToLanguageSettingsMap.get(mapKey); IScannerInfo info;
if(useMap)
info = (IScannerInfo)fIdToLanguageSettingsMap.get(mapKey);
else {
if(fCurrentFileScannerInfo != null){
if(rcDes.getId().equals(fCurrentFileDescriptionId))
info = fCurrentFileScannerInfo;
else {
info = null;
fCurrentFileScannerInfo = null;
fCurrentFileDescriptionId = null;
}
} else {
info = null;
}
}
if(info == null){ if(info == null){
info = createScannerInfo(ls); info = createScannerInfo(ls);
if(useMap)
fIdToLanguageSettingsMap.put(mapKey, info); fIdToLanguageSettingsMap.put(mapKey, info);
else {
fCurrentFileScannerInfo = info;
fCurrentFileDescriptionId = rcDes.getId();
}
} }
return info; return info;
} }