1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-26 18:35:32 +02:00

Generics - corrected to more specific type

This commit is contained in:
Andrew Gvozdev 2010-10-05 21:56:09 +00:00
parent 91b7a9eecb
commit 1fff26625d

View file

@ -45,7 +45,7 @@ public class DescriptionScannerInfoProvider implements IScannerInfoProvider, ICP
private IProject fProject; private IProject fProject;
private ICProjectDescription fProjDes; private ICProjectDescription fProjDes;
private ICConfigurationDescription fCfgDes; private ICConfigurationDescription fCfgDes;
private Map<Object, IScannerInfo> fIdToLanguageSettingsMap = Collections.synchronizedMap(new HashMap<Object, IScannerInfo>()); private Map<String, IScannerInfo> fIdToLanguageSettingsMap = Collections.synchronizedMap(new HashMap<String, IScannerInfo>());
private String fCurrentFileDescriptionId; private String fCurrentFileDescriptionId;
private IScannerInfo fCurrentFileScannerInfo; private IScannerInfo fCurrentFileScannerInfo;
private static final ScannerInfo INEXISTENT_SCANNER_INFO = new ScannerInfo(); private static final ScannerInfo INEXISTENT_SCANNER_INFO = new ScannerInfo();
@ -103,7 +103,7 @@ public class DescriptionScannerInfoProvider implements IScannerInfoProvider, ICP
} }
private IScannerInfo getScannerInfo(ICResourceDescription rcDes, ICLanguageSetting ls){ private IScannerInfo getScannerInfo(ICResourceDescription rcDes, ICLanguageSetting ls){
Object mapKey = ls != null ? ls.getId() : null; String 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; boolean useMap = rcDes == null || rcDes.getType() == ICSettingBase.SETTING_FOLDER;