From b8cb7297958fc4fce77894caea1ddd114f6fc6c5 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Wed, 25 May 2011 03:15:22 +0000 Subject: [PATCH] Cosmetics. --- .../internal/dataprovider/BuildEntryStorage.java | 4 ++-- .../cdt/internal/core/model/PathEntryManager.java | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java index d4a9958f5e5..f9508b1e42d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java @@ -367,12 +367,12 @@ public class BuildEntryStorage extends AbstractEntryStorage { String paths[] = null; int kind = getKind(); switch (kind) { - case ICSettingEntry.INCLUDE_PATH:{ + case ICSettingEntry.INCLUDE_PATH: { IEnvironmentVariableProvider provider = ManagedBuildManager.getEnvironmentVariableProvider(); paths = provider.getBuildPaths(fLangData.getConfiguration(), IEnvVarBuildPath.BUILDPATH_INCLUDE); } break; - case ICSettingEntry.LIBRARY_PATH:{ + case ICSettingEntry.LIBRARY_PATH: { IEnvironmentVariableProvider provider = ManagedBuildManager.getEnvironmentVariableProvider(); paths = provider.getBuildPaths(fLangData.getConfiguration(), IEnvVarBuildPath.BUILDPATH_LIBRARY); } diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java index 38ac423e1d1..68e2035a743 100644 --- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java +++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/PathEntryManager.java @@ -624,7 +624,7 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange 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 { @@ -639,8 +639,8 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange public IPathEntry[] getRawPathEntries(ICProject cproject) throws CModelException { IProject project = cproject.getProject(); - // Check if the Project is accesible. - if (! (CoreModel.hasCNature(project) || CoreModel.hasCCNature(project))) { + // Check if the Project is accessible. + if (!CoreModel.hasCNature(project) && !CoreModel.hasCCNature(project)) { throw new CModelException(new CModelStatus(ICModelStatusConstants.ELEMENT_DOES_NOT_EXIST)); } IPathEntry[] pathEntries; @@ -657,11 +657,13 @@ public class PathEntryManager implements IPathEntryStoreListener, IElementChange boolean foundSource = false; boolean foundOutput = false; for (IPathEntry rawEntry : pathEntries) { - if (rawEntry.getEntryKind() == IPathEntry.CDT_SOURCE) { + switch (rawEntry.getEntryKind()) { + case IPathEntry.CDT_SOURCE: foundSource = true; - } - if (rawEntry.getEntryKind() == IPathEntry.CDT_OUTPUT) { + break; + case IPathEntry.CDT_OUTPUT: foundOutput = true; + break; } }