From f558f2708dd987a0dd1eff0c6c73644e46e6d58e Mon Sep 17 00:00:00 2001 From: David Inglis Date: Thu, 10 Jun 2004 14:24:25 +0000 Subject: [PATCH] cleanup warnings --- .../org/eclipse/cdt/make/internal/core/ProjectTargets.java | 4 ++-- .../cdt/make/internal/core/makefile/gnu/GNUMakefileUtil.java | 4 +++- .../internal/core/scannerconfig/util/ScannerConfigUtil.java | 2 +- .../scannerconfig/util/ScannerInfoConsoleParserUtility.java | 2 +- .../cdt/make/internal/core/scannerconfig/util/TraceUtil.java | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java index d3817977d5a..38ccba44f41 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/ProjectTargets.java @@ -262,7 +262,7 @@ public class ProjectTargets { */ protected void translateDocumentToCDTProject(Document doc) throws CoreException, IOException { ICDescriptor descriptor; - descriptor = CCorePlugin.getDefault().getCProjectDescription(getProject()); + descriptor = CCorePlugin.getDefault().getCProjectDescription(getProject(), true); Element rootElement = descriptor.getProjectData(MAKE_TARGET_KEY); @@ -297,7 +297,7 @@ public class ProjectTargets { try { document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); ICDescriptor descriptor; - descriptor = CCorePlugin.getDefault().getCProjectDescription(getProject()); + descriptor = CCorePlugin.getDefault().getCProjectDescription(getProject(), true); rootElement = descriptor.getProjectData(MAKE_TARGET_KEY); } catch (ParserConfigurationException e) { diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileUtil.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileUtil.java index b2c21d5258f..2e04cea0a13 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileUtil.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileUtil.java @@ -87,7 +87,9 @@ public class GNUMakefileUtil extends PosixMakefileUtil { line = line.trim(); if (line.startsWith(GNUMakefileConstants.VARIABLE_OVERRIDE)) { int i = 8; - for (; i < line.length() && Character.isWhitespace(line.charAt(i)); i++); + while(i < line.length() && Character.isWhitespace(line.charAt(i))) { + i++; + } if (line.startsWith(GNUMakefileConstants.VARIABLE_DEFINE, i)) { return true; } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/ScannerConfigUtil.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/ScannerConfigUtil.java index a1555ce1432..aaf1f03aa9b 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/ScannerConfigUtil.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/ScannerConfigUtil.java @@ -299,7 +299,7 @@ public final class ScannerConfigUtil { public static IPath getDiscoveredScannerConfigStore(IProject project, boolean delete) { if (project != null) { try { - String fileName = (String) project.getPersistentProperty(discoveredScannerConfigFileNameProperty); + String fileName = project.getPersistentProperty(discoveredScannerConfigFileNameProperty); if (fileName == null) { fileName = String.valueOf(sRandom.nextLong()) + ".sc"; //$NON-NLS-1$ project.setPersistentProperty(discoveredScannerConfigFileNameProperty, fileName); diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/ScannerInfoConsoleParserUtility.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/ScannerInfoConsoleParserUtility.java index 3b7cd7c4882..d569598cc4d 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/ScannerInfoConsoleParserUtility.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/ScannerInfoConsoleParserUtility.java @@ -263,7 +263,7 @@ public class ScannerInfoConsoleParserUtility implements IScannerInfoConsoleParse pwd = dir.removeFirstSegments(fBaseDirectory.segmentCount()); } else { // check if it is a cygpath - if (dir.toString().startsWith("/cygdrive/")) { // $NON-NLS-1$ + if (dir.toString().startsWith("/cygdrive/")) { //$NON-NLS-1$ char driveLetter = dir.toString().charAt(10); StringBuffer buf = new StringBuffer(); buf.append(driveLetter); diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/TraceUtil.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/TraceUtil.java index 9d6f22f0ef3..789245d3b0b 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/TraceUtil.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/util/TraceUtil.java @@ -19,7 +19,7 @@ import java.util.List; * @author vhirsl */ public class TraceUtil { - public static final String EOL = System.getProperty("line.separator"); + public static final String EOL = System.getProperty("line.separator"); //$NON-NLS-1$ public static boolean SCANNER_CONFIG = false; public static boolean isTracing() {