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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-25 03:15:22 +00:00
parent 54e76b7846
commit b8cb729795
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
View file

@ -367,12 +367,12 @@ public class BuildEntryStorage extends AbstractEntryStorage {
String paths[] = null; String paths[] = null;
int kind = getKind(); int kind = getKind();
switch (kind) { switch (kind) {
case ICSettingEntry.INCLUDE_PATH:{ case ICSettingEntry.INCLUDE_PATH: {
IEnvironmentVariableProvider provider = ManagedBuildManager.getEnvironmentVariableProvider(); IEnvironmentVariableProvider provider = ManagedBuildManager.getEnvironmentVariableProvider();
paths = provider.getBuildPaths(fLangData.getConfiguration(), IEnvVarBuildPath.BUILDPATH_INCLUDE); paths = provider.getBuildPaths(fLangData.getConfiguration(), IEnvVarBuildPath.BUILDPATH_INCLUDE);
} }
break; break;
case ICSettingEntry.LIBRARY_PATH:{ case ICSettingEntry.LIBRARY_PATH: {
IEnvironmentVariableProvider provider = ManagedBuildManager.getEnvironmentVariableProvider(); IEnvironmentVariableProvider provider = ManagedBuildManager.getEnvironmentVariableProvider();
paths = provider.getBuildPaths(fLangData.getConfiguration(), IEnvVarBuildPath.BUILDPATH_LIBRARY); paths = provider.getBuildPaths(fLangData.getConfiguration(), IEnvVarBuildPath.BUILDPATH_LIBRARY);
} }

14
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java
View file

@ -624,7 +624,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
resolvedInfoMap.put(cproject, rInfo); resolvedInfoMap.put(cproject, rInfo);
} }
} }
return new Object[]{resolvedEntries, rInfo}; return new Object[] { resolvedEntries, rInfo };
} }
public void setRawPathEntries(ICProject cproject, IPathEntry[] newEntries, IProgressMonitor monitor) throws CModelException { public void setRawPathEntries(ICProject cproject, IPathEntry[] newEntries, IProgressMonitor monitor) throws CModelException {
@ -639,8 +639,8 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
public IPathEntry[] getRawPathEntries(ICProject cproject) throws CModelException { public IPathEntry[] getRawPathEntries(ICProject cproject) throws CModelException {
IProject project = cproject.getProject(); IProject project = cproject.getProject();
// Check if the Project is accesible. // Check if the Project is accessible.
if (! (CoreModel.hasCNature(project) || CoreModel.hasCCNature(project))) { if (!CoreModel.hasCNature(project) && !CoreModel.hasCCNature(project)) {
throw new CModelException(new CModelStatus(ICModelStatusConstants.ELEMENT_DOES_NOT_EXIST)); throw new CModelException(new CModelStatus(ICModelStatusConstants.ELEMENT_DOES_NOT_EXIST));
} }
IPathEntry[] pathEntries; IPathEntry[] pathEntries;
@ -657,11 +657,13 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange
boolean foundSource = false; boolean foundSource = false;
boolean foundOutput = false; boolean foundOutput = false;
for (IPathEntry rawEntry : pathEntries) { for (IPathEntry rawEntry : pathEntries) {
if (rawEntry.getEntryKind() == IPathEntry.CDT_SOURCE) { switch (rawEntry.getEntryKind()) {
case IPathEntry.CDT_SOURCE:
foundSource = true; foundSource = true;
} break;
if (rawEntry.getEntryKind() == IPathEntry.CDT_OUTPUT) { case IPathEntry.CDT_OUTPUT:
foundOutput = true; foundOutput = true;
break;
} }
} }