From 666d9577c6411bfe1f23adf189a7990be303c5e5 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Tue, 31 Jan 2012 17:38:45 -0500 Subject: [PATCH] renamed a bunch of local vars --- .../ConfigurationDataProvider.java | 128 ++++++------- .../model/util/PathEntryTranslator.java | 169 +++++++++--------- 2 files changed, 148 insertions(+), 149 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java index 72657a9471a..2899672906b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java @@ -109,17 +109,17 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem } } - static BuildConfigurationData writeConfiguration(ICConfigurationDescription des, + static BuildConfigurationData writeConfiguration(ICConfigurationDescription cfgDescription, BuildConfigurationData base) throws CoreException { BuildConfigurationData appliedCfg = base; - ICStorageElement rootElement = des.getStorage(BUILD_SYSTEM_DATA_MODULE_NAME, true); + ICStorageElement rootElement = cfgDescription.getStorage(BUILD_SYSTEM_DATA_MODULE_NAME, true); rootElement.clear(); rootElement.setAttribute(VERSION_ATTRIBUTE, ManagedBuildManager.getVersion().toString()); ICStorageElement cfgElemen = rootElement.createChild(IConfiguration.CONFIGURATION_ELEMENT_NAME); Configuration cfg = (Configuration)appliedCfg.getConfiguration(); Builder b = (Builder)cfg.getEditableBuilder(); // Need to ensure that build macro supplier can get the description for this configuration during the write... - cfg.setConfigurationDescription(des); + cfg.setConfigurationDescription(cfgDescription); if(b != null && b.isManagedBuildOn() && b.getBuildPathAttribute(false) == null){ String bPath = b.getDefaultBuildPath(); b.setBuildPathAttribute(bPath); @@ -132,9 +132,9 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem } protected CConfigurationData applyPreferences( - ICConfigurationDescription des, CConfigurationData base) throws CoreException{ + ICConfigurationDescription cfgDescription, CConfigurationData base) throws CoreException{ - BuildConfigurationData appliedCfg = writeConfiguration(des, (BuildConfigurationData)base); + BuildConfigurationData appliedCfg = writeConfiguration(cfgDescription, (BuildConfigurationData)base); IConfiguration cfg = ((BuildConfigurationData)base).getConfiguration(); try { @@ -148,14 +148,14 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem @Override public CConfigurationData applyConfiguration( - ICConfigurationDescription des, - ICConfigurationDescription baseDescription, + ICConfigurationDescription cfgDescription, + ICConfigurationDescription baseCfgDescription, CConfigurationData base, IModificationContext context, IProgressMonitor monitor) throws CoreException { - if(des.isPreferenceConfiguration()) - return applyPreferences(des, base); + if(cfgDescription.isPreferenceConfiguration()) + return applyPreferences(cfgDescription, base); BuildConfigurationData baseCfgData = (BuildConfigurationData)base; IConfiguration baseCfg = baseCfgData.getConfiguration(); @@ -164,26 +164,26 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem appliedCfg = baseCfgData; context.setConfigurationSettingsFlags(IModificationContext.CFG_DATA_STORAGE_UNMODIFIED | IModificationContext.CFG_DATA_SETTINGS_UNMODIFIED); } else { - appliedCfg = writeConfiguration(des, baseCfgData); + appliedCfg = writeConfiguration(cfgDescription, baseCfgData); - IManagedBuildInfo info = getBuildInfo(des); + IManagedBuildInfo info = getBuildInfo(cfgDescription); ManagedProject mProj = (ManagedProject)info.getManagedProject(); mProj.applyConfiguration((Configuration)appliedCfg.getConfiguration()); - writeManagedProjectInfo(des.getProjectDescription(), mProj); + writeManagedProjectInfo(cfgDescription.getProjectDescription(), mProj); try { - CfgScannerConfigInfoFactory2.save(appliedCfg, des.getProjectDescription(), baseDescription.getProjectDescription(), !isPersistedCfg(des)); + CfgScannerConfigInfoFactory2.save(appliedCfg, cfgDescription.getProjectDescription(), baseCfgDescription.getProjectDescription(), !isPersistedCfg(cfgDescription)); } catch (CoreException e){ ManagedBuilderCorePlugin.log(e); } info.setValid(true); // Update the ManagedBuildInfo in the ManagedBuildManager map. Doing this creates a barrier for subsequent // ManagedBuildManager#getBuildInfo(...) see Bug 305146 for more - ManagedBuildManager.setLoaddedBuildInfo(des.getProjectDescription().getProject(), info); + ManagedBuildManager.setLoaddedBuildInfo(cfgDescription.getProjectDescription().getProject(), info); - setPersistedFlag(des); - cacheNaturesIdsUsedOnCache(des); + setPersistedFlag(cfgDescription); + cacheNaturesIdsUsedOnCache(cfgDescription); - if(des.isActive()){ + if(cfgDescription.isActive()){ IConfiguration cfg = appliedCfg.getConfiguration(); IBuilder builder = cfg.getEditableBuilder(); IProject project = context.getProject(); @@ -202,8 +202,8 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem return appliedCfg; } - private void setPersistedFlag(ICConfigurationDescription cfg){ - cfg.setSessionProperty(CFG_PERSISTED_PROPERTY, Boolean.TRUE); + private void setPersistedFlag(ICConfigurationDescription cfgDescription){ + cfgDescription.setSessionProperty(CFG_PERSISTED_PROPERTY, Boolean.TRUE); } private static void writeManagedProjectInfo(ICProjectDescription des, @@ -217,12 +217,12 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem protected CConfigurationData createPreferences( - ICConfigurationDescription des, CConfigurationData base) + ICConfigurationDescription cfgDescription, CConfigurationData base) throws CoreException { Configuration cfg = (Configuration)((BuildConfigurationData)base).getConfiguration(); - Configuration newCfg = new Configuration((ManagedProject)cfg.getManagedProject(), cfg, des.getId(), true, true, true); - newCfg.setConfigurationDescription(des); - newCfg.setName(des.getName()); + Configuration newCfg = new Configuration((ManagedProject)cfg.getManagedProject(), cfg, cfgDescription.getId(), true, true, true); + newCfg.setConfigurationDescription(cfgDescription); + newCfg.setName(cfgDescription.getName()); // if(!newCfg.getId().equals(cfg.getId())){ // newCfg.exportArtifactInfo(); // } @@ -233,16 +233,16 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem @Override public CConfigurationData createConfiguration( - ICConfigurationDescription des, - ICConfigurationDescription baseDescription, + ICConfigurationDescription cfgDescription, + ICConfigurationDescription baseCfgDescription, CConfigurationData base, boolean clone, IProgressMonitor monitor) throws CoreException { - if(des.isPreferenceConfiguration()) - return createPreferences(des, base); + if(cfgDescription.isPreferenceConfiguration()) + return createPreferences(cfgDescription, base); Configuration cfg = (Configuration)((BuildConfigurationData)base).getConfiguration(); - Configuration newCfg = copyCfg(cfg, des); + Configuration newCfg = copyCfg(cfg, cfgDescription); if(!newCfg.getId().equals(cfg.getId()) && newCfg.canExportedArtifactInfo()){ // Bug 335001: Remove existing exported settings as they point at this configuration @@ -252,20 +252,20 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem newCfg.exportArtifactInfo(); } - setPersistedFlag(des); + setPersistedFlag(cfgDescription); return newCfg.getConfigurationData(); } - public static Configuration copyCfg(Configuration cfg, ICConfigurationDescription des){ - IManagedBuildInfo info = getBuildInfo(des); + public static Configuration copyCfg(Configuration cfg, ICConfigurationDescription cfgDescription){ + IManagedBuildInfo info = getBuildInfo(cfgDescription); ManagedProject mProj = (ManagedProject)info.getManagedProject(); - Configuration newCfg = new Configuration(mProj, cfg, des.getId(), true, true, false); - newCfg.setConfigurationDescription(des); - newCfg.setName(des.getName()); + Configuration newCfg = new Configuration(mProj, cfg, cfgDescription.getId(), true, true, false); + newCfg.setConfigurationDescription(cfgDescription); + newCfg.setName(cfgDescription.getName()); - des.setConfigurationData(ManagedBuildManager.CFG_DATA_PROVIDER_ID, newCfg.getConfigurationData()); + cfgDescription.setConfigurationData(ManagedBuildManager.CFG_DATA_PROVIDER_ID, newCfg.getConfigurationData()); ManagedBuildManager.performValueHandlerEvent(newCfg, IManagedOptionValueHandler.EVENT_OPEN); @@ -276,8 +276,8 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem return newCfg; } - private static IManagedBuildInfo getBuildInfo(ICConfigurationDescription des){ - ICProjectDescription projDes = des.getProjectDescription(); + private static IManagedBuildInfo getBuildInfo(ICConfigurationDescription cfgDescription){ + ICProjectDescription projDes = cfgDescription.getProjectDescription(); IProject project = projDes.getProject(); IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project, false); if(info == null) @@ -285,7 +285,7 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem setLoaddedBuildInfo(projDes, info); - getManagedProject(des, info); + getManagedProject(cfgDescription, info); return info; } @@ -298,10 +298,10 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem return (ManagedBuildInfo)des.getSessionProperty(BUILD_INFO_PROPERTY); } - private static IManagedProject getManagedProject(ICConfigurationDescription des, IManagedBuildInfo info){ + private static IManagedProject getManagedProject(ICConfigurationDescription cfgDescription, IManagedBuildInfo info){ IManagedProject mProj = info.getManagedProject(); if(mProj == null){ - mProj = createManagedProject(info, des.getProjectDescription()); + mProj = createManagedProject(info, cfgDescription.getProjectDescription()); } return mProj; } @@ -333,35 +333,35 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem } public static String[] getNaturesIdsUsedOnCache(IConfiguration cfg){ - ICConfigurationDescription cfgDes = ManagedBuildManager.getDescriptionForConfiguration(cfg); - if(cfgDes != null) - return getNaturesIdsUsedOnCache(cfgDes); + ICConfigurationDescription cfgDescription = ManagedBuildManager.getDescriptionForConfiguration(cfg); + if(cfgDescription != null) + return getNaturesIdsUsedOnCache(cfgDescription); return null; } - public static String[] getNaturesIdsUsedOnCache(ICConfigurationDescription cfg){ - String[] strs = (String[])cfg.getSessionProperty(NATURES_USED_ON_CACHE_PROPERTY); + public static String[] getNaturesIdsUsedOnCache(ICConfigurationDescription cfgDescription){ + String[] strs = (String[])cfgDescription.getSessionProperty(NATURES_USED_ON_CACHE_PROPERTY); return strs != null && strs.length != 0 ? (String[])strs.clone() : strs; } - public static void cacheNaturesIdsUsedOnCache(ICConfigurationDescription des){ - IProject project = des.getProjectDescription().getProject(); + public static void cacheNaturesIdsUsedOnCache(ICConfigurationDescription cfgDescription){ + IProject project = cfgDescription.getProjectDescription().getProject(); try { IProjectDescription eDes = project.getDescription(); String[] natures = eDes.getNatureIds(); - setNaturesIdsUsedOnCache(des, natures); + setNaturesIdsUsedOnCache(cfgDescription, natures); } catch (CoreException e) { ManagedBuilderCorePlugin.log(e); } } - private static void setNaturesIdsUsedOnCache(ICConfigurationDescription cfg, String ids[]){ + private static void setNaturesIdsUsedOnCache(ICConfigurationDescription cfgDescription, String ids[]){ ids = ids != null && ids.length != 0 ? (String[])ids.clone() : ids; - cfg.setSessionProperty(NATURES_USED_ON_CACHE_PROPERTY, ids); + cfgDescription.setSessionProperty(NATURES_USED_ON_CACHE_PROPERTY, ids); } - private Configuration load(ICConfigurationDescription des, ManagedProject mProj, boolean isPreference) throws CoreException{ - ICStorageElement rootElement = des.getStorage(BUILD_SYSTEM_DATA_MODULE_NAME, true); + private Configuration load(ICConfigurationDescription cfgDescription, ManagedProject mProj, boolean isPreference) throws CoreException{ + ICStorageElement rootElement = cfgDescription.getStorage(BUILD_SYSTEM_DATA_MODULE_NAME, true); ICStorageElement children[] = rootElement.getChildren(); String version = rootElement.getAttribute(VERSION_ATTRIBUTE); Configuration cfg = null; @@ -376,14 +376,14 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem return cfg; } - protected CConfigurationData loadPreferences(ICConfigurationDescription des) + protected CConfigurationData loadPreferences(ICConfigurationDescription cfgDescription) throws CoreException { - Configuration cfg = load(des, null, true); + Configuration cfg = load(cfgDescription, null, true); - cfg = updatePreferenceOnLoad(cfg, des); + cfg = updatePreferenceOnLoad(cfg, cfgDescription); - cfg.setConfigurationDescription(des); + cfg.setConfigurationDescription(cfgDescription); return cfg.getConfigurationData(); } @@ -396,9 +396,9 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem return cfg; } - private static Configuration updatePreferenceOnLoad(Configuration cfg, ICConfigurationDescription des){ + private static Configuration updatePreferenceOnLoad(Configuration cfg, ICConfigurationDescription cfgDescription){ if(cfg == null) - cfg = createEmptyPrefConfiguration(des.getId(), des.getName()); + cfg = createEmptyPrefConfiguration(cfgDescription.getId(), cfgDescription.getName()); cfg = adjustPreferenceConfig(cfg); @@ -604,8 +604,8 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem } - private boolean isPersistedCfg(ICConfigurationDescription cfgDes){ - return cfgDes.getSessionProperty(CFG_PERSISTED_PROPERTY) != null; + private boolean isPersistedCfg(ICConfigurationDescription cfgDescription){ + return cfgDescription.getSessionProperty(CFG_PERSISTED_PROPERTY) != null; } @Override @@ -624,22 +624,22 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem } @Override - public void removeConfiguration(ICConfigurationDescription des, + public void removeConfiguration(ICConfigurationDescription cfgDescription, CConfigurationData data, IProgressMonitor monitor) { IConfiguration cfg = ((BuildConfigurationData)data).getConfiguration(); ManagedBuildManager.performValueHandlerEvent(cfg, IManagedOptionValueHandler.EVENT_CLOSE); - IManagedBuildInfo info = getBuildInfo(des); + IManagedBuildInfo info = getBuildInfo(cfgDescription); IManagedProject mProj = info.getManagedProject(); mProj.removeConfiguration(cfg.getId()); } @Override - public void dataCached(ICConfigurationDescription cfgDes, + public void dataCached(ICConfigurationDescription cfgDescription, CConfigurationData data, IProgressMonitor monitor) { BuildConfigurationData cfgData = (BuildConfigurationData)data; - ((Configuration)cfgData.getConfiguration()).setConfigurationDescription(cfgDes); + ((Configuration)cfgData.getConfiguration()).setConfigurationDescription(cfgDescription); cfgData.clearCachedData(); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java index 16a38264deb..16b9a000c95 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/PathEntryTranslator.java @@ -126,9 +126,9 @@ public class PathEntryTranslator { ICConfigurationDescription fCfg; ICdtVariableManager fMngr = CCorePlugin.getDefault().getCdtVariableManager(); - public VarSubstitutor(ICConfigurationDescription cfg) { - super(new DefaultVariableContextInfo(ICoreVariableContextInfo.CONTEXT_CONFIGURATION, cfg), "", " "); //$NON-NLS-1$ //$NON-NLS-2$ - fCfg = cfg; + public VarSubstitutor(ICConfigurationDescription cfgDescription) { + super(new DefaultVariableContextInfo(ICoreVariableContextInfo.CONTEXT_CONFIGURATION, cfgDescription), "", " "); //$NON-NLS-1$ //$NON-NLS-2$ + fCfg = cfgDescription; } @Override @@ -144,9 +144,9 @@ public class PathEntryTranslator { private IPath[] fRefProjPaths; private ICExternalSetting[] fExtSettings; - public ReferenceSettingsInfo(ICConfigurationDescription des) { - fExtSettings = des.getExternalSettings(); - Map map = des.getReferenceInfo(); + public ReferenceSettingsInfo(ICConfigurationDescription cfgDescription) { + fExtSettings = cfgDescription.getExternalSettings(); + Map map = cfgDescription.getReferenceInfo(); fRefProjPaths = new IPath[map.size()]; int num = 0; for (String proj : map.keySet()) { @@ -605,7 +605,7 @@ public class PathEntryTranslator { private boolean fIsExported; private IProject fProject; - PathEntryComposer(IPath path, IProject project/*, ICConfigurationDescription cfg*/) { + PathEntryComposer(IPath path, IProject project/*, ICConfigurationDescription cfgDescription*/) { fPath = toProjectPath(path); fProject = project; } @@ -617,7 +617,7 @@ public class PathEntryTranslator { return path.makeAbsolute(); } - PathEntryComposer(ICExclusionPatternPathEntry entry, IProject project/*, ICConfigurationDescription cfg*/) { + PathEntryComposer(ICExclusionPatternPathEntry entry, IProject project/*, ICConfigurationDescription cfgDescription*/) { fPath = new Path(entry.getValue()); fLangEntry = entry; fProject = project; @@ -628,7 +628,7 @@ public class PathEntryTranslator { } } - PathEntryComposer(IPath path, ICLanguageSettingEntry entry, boolean exported, IProject project/*, ICConfigurationDescription cfg*/) { + PathEntryComposer(IPath path, ICLanguageSettingEntry entry, boolean exported, IProject project/*, ICConfigurationDescription cfgDescription*/) { fPath = path; fLangEntry = entry; fIsExported = exported; @@ -656,15 +656,15 @@ public class PathEntryTranslator { return new IPath[0]; } - private IPath[][] getEntryPath(ICSettingEntry entry, ICConfigurationDescription cfg) { - return valueToEntryPath(entry.getName(), (entry.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0, cfg); + private IPath[][] getEntryPath(ICSettingEntry entry, ICConfigurationDescription cfgDescription) { + return valueToEntryPath(entry.getName(), (entry.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0, cfgDescription); } - private IPath[][] valueToEntryPath(String value, boolean isWsp, ICConfigurationDescription cfg) { - String[] pathVarValues = resolveKeepingPathEntryFars(value, cfg); + private IPath[][] valueToEntryPath(String value, boolean isWsp, ICConfigurationDescription cfgDescription) { + String[] pathVarValues = resolveKeepingPathEntryFars(value, cfgDescription); IPath result[][] = new IPath[2][pathVarValues.length]; for (int i = 0; i < pathVarValues.length; i++) { - String resolvedValue = resolveAll(value, cfg); + String resolvedValue = resolveAll(value, cfgDescription); IPath resolvedPath = new Path(resolvedValue); IPath pathVarPath = new Path(pathVarValues[i]); if (isWsp) { @@ -704,20 +704,20 @@ public class PathEntryTranslator { return result; } - public IPathEntry[] toPathEntry(ICConfigurationDescription cfg, boolean keepPathInfo) { + public IPathEntry[] toPathEntry(ICConfigurationDescription cfgDescription, boolean keepPathInfo) { IPath path = keepPathInfo ? fPath : fProject.getFullPath(); IPathEntry[] result = new IPathEntry[0]; if (fLangEntry != null) { switch (fLangEntry.getKind()) { case ICSettingEntry.INCLUDE_FILE:{ - IPath paths[][] = getEntryPath(fLangEntry, cfg); + IPath paths[][] = getEntryPath(fLangEntry, cfgDescription); result = new IPathEntry[paths[0].length]; for (int i = 0; i < result.length; i++) result[i] = CoreModel.newIncludeFileEntry(path, null, paths[0][i], paths[1][i], getExclusionPatterns(), fIsExported); return result; } case ICSettingEntry.INCLUDE_PATH:{ - IPath paths[][] = getEntryPath(fLangEntry, cfg); + IPath paths[][] = getEntryPath(fLangEntry, cfgDescription); ICIncludePathEntry ipe = (ICIncludePathEntry)fLangEntry; result = new IPathEntry[paths[0].length]; @@ -730,7 +730,7 @@ public class PathEntryTranslator { result[0] = CoreModel.newMacroEntry(path, fLangEntry.getName(), fLangEntry.getValue(), getExclusionPatterns(), fIsExported); return result; case ICSettingEntry.MACRO_FILE:{ - IPath paths[][] = getEntryPath(fLangEntry, cfg); + IPath paths[][] = getEntryPath(fLangEntry, cfgDescription); result = new IPathEntry[paths[0].length]; for (int i = 0; i < result.length; i++) result[i] = CoreModel.newMacroFileEntry(path, paths[0][i], null, paths[1][i], getExclusionPatterns(), fIsExported); @@ -742,7 +742,7 @@ public class PathEntryTranslator { // aren't currently resolved return null; // case ICSettingEntry.LIBRARY_FILE:{ -// IPath paths[][] = getEntryPath(fLangEntry, cfg); +// IPath paths[][] = getEntryPath(fLangEntry, cfgDescription); // result = new IPathEntry[paths[0].length]; // for (int i = 0; i < result.length; i++) // result[i] = CoreModel.newLibraryEntry(path, paths[0][i], paths[1][i], null, null, null, fIsExported); @@ -768,19 +768,19 @@ public class PathEntryTranslator { } } - private static String resolveAll(String value, ICConfigurationDescription cfg) { + private static String resolveAll(String value, ICConfigurationDescription cfgDescription) { try { - return CCorePlugin.getDefault().getCdtVariableManager().resolveValue(value, "", " ", cfg); //$NON-NLS-1$ //$NON-NLS-2$ + return CCorePlugin.getDefault().getCdtVariableManager().resolveValue(value, "", " ", cfgDescription); //$NON-NLS-1$ //$NON-NLS-2$ } catch (CdtVariableException e) { CCorePlugin.log(e); } return value; } - private static String[] resolveKeepingPathEntryFars(String value, ICConfigurationDescription cfg) { + private static String[] resolveKeepingPathEntryFars(String value, ICConfigurationDescription cfgDescription) { String[] result = new String[] { value }; // default value; try { - VarSubstitutor substitutor = new VarSubstitutor(cfg); + VarSubstitutor substitutor = new VarSubstitutor(cfgDescription); result = CdtVariableResolver.resolveToStringList(value, substitutor); if (result == null || result.length == 0) @@ -798,7 +798,7 @@ public class PathEntryTranslator { private LinkedHashMap fRefProjMap; private IProject fProject; - private PathEntryCollector(IProject project/*, ICConfigurationDescription cfg*/) { + private PathEntryCollector(IProject project/*, ICConfigurationDescription cfgDescription*/) { fStorage = PathSettingsContainer.createRootContainer(); fStorage.setValue(this); fStore = new KindBasedStore>(false); @@ -806,7 +806,7 @@ public class PathEntryTranslator { fProject = project; } - private PathEntryCollector(PathSettingsContainer container, KindBasedStore> store, IProject project/*, ICConfigurationDescription cfg*/) { + private PathEntryCollector(PathSettingsContainer container, KindBasedStore> store, IProject project/*, ICConfigurationDescription cfgDescription*/) { fStorage = container; fStore = store; fNameKeyMapStore = new KindBasedStore>(false); @@ -993,7 +993,7 @@ public class PathEntryTranslator { } } - public List getEntries(int peKind, List list, int flags, ICConfigurationDescription cfg) { + public List getEntries(int peKind, List list, int flags, ICConfigurationDescription cfgDescription) { if (list == null) { list = new ArrayList(); } @@ -1021,7 +1021,7 @@ public class PathEntryTranslator { store.put(peKind, map); } if (!map.containsKey(name)) { - pe = cs.toPathEntry(cfg, false); + pe = cs.toPathEntry(cfgDescription, false); if (pe != null) { if (pe.length > 1) { System.out.println(); @@ -1030,7 +1030,7 @@ public class PathEntryTranslator { } } } else { - pe = cs.toPathEntry(cfg, true); + pe = cs.toPathEntry(cfgDescription, true); } if (pe != null) list.addAll(Arrays.asList(pe)); @@ -1057,19 +1057,19 @@ public class PathEntryTranslator { return entry != null && (entry.isBuiltIn() || entry.isReadOnly()); } - public List getEntries(List list, int flags, ICConfigurationDescription cfg) { + public List getEntries(List list, int flags, ICConfigurationDescription cfgDescription) { if (list == null) list = new ArrayList(); int peKinds[] = PathEntryKyndStore.getSupportedKinds(); for (int peKind : peKinds) { - getEntries(peKind, list, flags, cfg); + getEntries(peKind, list, flags, cfgDescription); } return list; } - public IPathEntry[] getEntries(int flags, ICConfigurationDescription cfg) { - List list = getEntries(null, flags,cfg); + public IPathEntry[] getEntries(int flags, ICConfigurationDescription cfgDescription) { + List list = getEntries(null, flags,cfgDescription); IPathEntry[] entries = list.toArray(new IPathEntry[list.size()]); return entries; } @@ -1123,16 +1123,16 @@ public class PathEntryTranslator { return new IPath[0]; } - public PathEntryTranslator(IProject project, CConfigurationData data) { + public PathEntryTranslator(IProject project, CConfigurationData cfgData) { fProject = project; - fCfgData = data; - fRcDataHolder = createRcDataHolder(data); + fCfgData = cfgData; + fRcDataHolder = createRcDataHolder(cfgData); fTranslatedFilters = PathSettingsContainer.createRootContainer(); fTranslatedFilters.setValue(new ResourceInfo[]{new ResourceInfo(fRoot, true)}); } - private static PathSettingsContainer createRcDataHolder(CConfigurationData data) { - return CDataUtil.createRcDataHolder(data); + private static PathSettingsContainer createRcDataHolder(CConfigurationData cfgData) { + return CDataUtil.createRcDataHolder(cfgData); } public ReferenceSettingsInfo applyPathEntries(PathEntryResolveInfo info, int op) { @@ -1437,10 +1437,10 @@ public class PathEntryTranslator { return null; } - private void applyEntries(CResourceData data, RcDesInfo info, int op) { - CLanguageData lDatas[] = data.getType() == ICSettingBase.SETTING_FILE ? - new CLanguageData[] { ((CFileData)data).getLanguageData() } : - ((CFolderData) data).getLanguageDatas(); + private void applyEntries(CResourceData rcData, RcDesInfo info, int op) { + CLanguageData lDatas[] = rcData.getType() == ICSettingBase.SETTING_FILE ? + new CLanguageData[] { ((CFileData)rcData).getLanguageData() } : + ((CFolderData) rcData).getLanguageDatas(); for (CLanguageData lData : lDatas) { if (lData == null) @@ -1967,13 +1967,13 @@ public class PathEntryTranslator { } } - private static CConfigurationData getCfgData(ICConfigurationDescription cfgDes) { - return cfgDes instanceof CConfigurationDescriptionCache ? - (CConfigurationData)cfgDes : ((IInternalCCfgInfo)cfgDes).getConfigurationData(false); + private static CConfigurationData getCfgData(ICConfigurationDescription cfgDescription) { + return cfgDescription instanceof CConfigurationDescriptionCache ? + (CConfigurationData)cfgDescription : ((IInternalCCfgInfo)cfgDescription).getConfigurationData(false); } - private static void addOutputEntries(PathEntryCollector cr, CConfigurationData data) { - CBuildData bData = data.getBuildData(); + private static void addOutputEntries(PathEntryCollector cr, CConfigurationData cfgData) { + CBuildData bData = cfgData.getBuildData(); if (bData != null) { ICOutputEntry oEntries[] = bData.getOutputDirectories(); if (oEntries != null && oEntries.length != 0) { @@ -1982,30 +1982,30 @@ public class PathEntryTranslator { } } - public static PathEntryCollector collectEntries(IProject project, final ICConfigurationDescription des) { - CConfigurationData data = getCfgData(des); + public static PathEntryCollector collectEntries(IProject project, final ICConfigurationDescription cfgDescription) { + CConfigurationData cfgData = getCfgData(cfgDescription); - ReferenceSettingsInfo refInfo = new ReferenceSettingsInfo(des); - ICConfigurationDescription[] allCfgs = des.isPreferenceConfiguration() ? - new ICConfigurationDescription[] { des } : - des.getProjectDescription().getConfigurations(); + ReferenceSettingsInfo refInfo = new ReferenceSettingsInfo(cfgDescription); + ICConfigurationDescription[] allCfgDescriptions = cfgDescription.isPreferenceConfiguration() ? + new ICConfigurationDescription[] { cfgDescription } : + cfgDescription.getProjectDescription().getConfigurations(); - CConfigurationData[] allDatas = new CConfigurationData[allCfgs.length]; - for (int i = 0; i < allCfgs.length; i++) { - allDatas[i] = getCfgData(allCfgs[i]); + CConfigurationData[] allDatas = new CConfigurationData[allCfgDescriptions.length]; + for (int i = 0; i < allCfgDescriptions.length; i++) { + allDatas[i] = getCfgData(allCfgDescriptions[i]); } - final PathEntryCollector cr = new PathEntryCollector(project/*, des*/); - PathSettingsContainer rcDatas = createRcDataHolder(data); - ICSourceEntry sEntries[] = data.getSourceEntries(); + final PathEntryCollector collector = new PathEntryCollector(project/*, cfgDescription*/); + PathSettingsContainer rcDatas = createRcDataHolder(cfgData); + ICSourceEntry sEntries[] = cfgData.getSourceEntries(); if (sEntries != null && sEntries.length != 0) { - cr.setSourceOutputEntries(ICSettingEntry.SOURCE_PATH, sEntries); + collector.setSourceOutputEntries(ICSettingEntry.SOURCE_PATH, sEntries); } for (CConfigurationData allData : allDatas) { - addOutputEntries(cr, allData); + addOutputEntries(collector, allData); } final HashSet exportedSettings = new HashSet(); - cr.setRefProjects(refInfo.getReferencedProjectsPaths()); + collector.setRefProjects(refInfo.getReferencedProjectsPaths()); ICExternalSetting[] settings = refInfo.getExternalSettings(); for (ICExternalSetting setting : settings) { exportedSettings.addAll(Arrays.asList(setting.getEntries())); @@ -2015,15 +2015,15 @@ public class PathEntryTranslator { rcDatas.accept(new IPathSettingsContainerVisitor() { @Override public boolean visit(PathSettingsContainer container) { - CResourceData data = (CResourceData)container.getValue(); - if (data != null) { + CResourceData rcData = (CResourceData)container.getValue(); + if (rcData != null) { // AG FIXME - temporary log to remove before CDT Juno release - temporaryLog(des, kinds, data); + temporaryLog(cfgDescription, kinds, rcData); - PathEntryCollector child = cr.createChild(container.getPath()); + PathEntryCollector child = collector.createChild(container.getPath()); for (int kind : kinds) { List list = new ArrayList(); - if (collectResourceDataEntries(des, kind, data, list)) { + if (collectResourceDataEntries(cfgDescription, kind, rcData, list)) { ICLanguageSettingEntry[] entries = list.toArray(new ICLanguageSettingEntry[list.size()]); child.setEntries(kind, entries, exportedSettings); } @@ -2034,7 +2034,7 @@ public class PathEntryTranslator { // AG FIXME - temporary log to remove before CDT Juno release @Deprecated - private void temporaryLog(final ICConfigurationDescription des, final int[] kinds, CResourceData data) { + private void temporaryLog(final ICConfigurationDescription cfgDescription, final int[] kinds, CResourceData rcData) { String kindsStr=""; for (int kind : kinds) { String kstr = LanguageSettingEntriesSerializer.kindToString(kind); @@ -2044,25 +2044,25 @@ public class PathEntryTranslator { kindsStr += "|" + kstr; } } - final IProject prj = des.getProjectDescription().getProject(); - String log_msg = "path="+prj+"/"+data.getPath()+", kind=["+kindsStr+"]"+" (PathEntryTranslator.collectEntries())"; + final IProject prj = cfgDescription.getProjectDescription().getProject(); + String log_msg = "path="+prj+"/"+rcData.getPath()+", kind=["+kindsStr+"]"+" (PathEntryTranslator.collectEntries())"; LanguageSettingsLogger.logInfo(log_msg); } }); - return cr; + return collector; } - private static boolean collectResourceDataEntries(ICConfigurationDescription des, int kind, CResourceData data, List list) { + private static boolean collectResourceDataEntries(ICConfigurationDescription cfgDescription, int kind, CResourceData rcData, List list) { CLanguageData[] lDatas = null; - if (data instanceof CFolderData) { - lDatas = ((CFolderData)data).getLanguageDatas(); - } else if (data instanceof CFileData) { - CLanguageData lData = ((CFileData)data).getLanguageData(); + if (rcData instanceof CFolderData) { + lDatas = ((CFolderData)rcData).getLanguageDatas(); + } else if (rcData instanceof CFileData) { + CLanguageData lData = ((CFileData)rcData).getLanguageData(); if (lData != null) lDatas = new CLanguageData[] {lData}; } else { - Exception e = new Exception(UtilMessages.getString("PathEntryTranslator.1") + data.getClass().getName()); //$NON-NLS-1$ + Exception e = new Exception(UtilMessages.getString("PathEntryTranslator.1") + rcData.getClass().getName()); //$NON-NLS-1$ IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, e.getMessage(), e); CCorePlugin.log(status); } @@ -2070,12 +2070,11 @@ public class PathEntryTranslator { return false; } - - IProject project = des.getProjectDescription().getProject(); + IProject project = cfgDescription.getProjectDescription().getProject(); if (ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(project)) { - IResource rc = getResource(project, data.getPath()); + IResource rc = findResourceInWorkspace(project, rcData.getPath()); for (CLanguageData lData : lDatas) { - list.addAll(LanguageSettingsProvidersSerializer.getSettingEntriesByKind(des, rc, lData.getLanguageId(), kind)); + list.addAll(LanguageSettingsProvidersSerializer.getSettingEntriesByKind(cfgDescription, rc, lData.getLanguageId(), kind)); } return list.size()>0; @@ -2101,14 +2100,14 @@ public class PathEntryTranslator { return false; } - public static IPathEntry[] getPathEntries(IProject project, ICConfigurationDescription cfg, int flags) { - PathEntryCollector cr = collectEntries(project, cfg); - return cr.getEntries(flags, cfg); + public static IPathEntry[] getPathEntries(IProject project, ICConfigurationDescription cfgDescription, int flags) { + PathEntryCollector cr = collectEntries(project, cfgDescription); + return cr.getEntries(flags, cfgDescription); } - private static IResource getResource(IProject project, IPath workspacePath) { + private static IResource findResourceInWorkspace(IProject project, IPath workspacePath) { IResource rc; - if (project!=null) { + if (project != null) { rc = project.findMember(workspacePath); } else { rc = ResourcesPlugin.getWorkspace().getRoot().findMember(workspacePath);