From 76703a1ba4881db35e2c12c6a2fdf5cea340589d Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Wed, 16 Feb 2011 13:57:43 +0000 Subject: [PATCH] Compiler warnings. --- .../internal/core/cdtvariables/CdtMacroSupplier.java | 2 +- .../internal/ui/buildconsole/BuildConsoleManager.java | 11 ++++------- .../cdt/utils/ui/controls/FileListControl.java | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java index 8969a13fad6..94b82c151ba 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java @@ -436,7 +436,7 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase { macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,version); } else if("CDTVersion".equals(macroName)){ //$NON-NLS-1$ - String version = (String) CCorePlugin.getDefault().getBundle().getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION); + String version = CCorePlugin.getDefault().getBundle().getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION); macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,version); } /* else if("MBSVersion".equals(macroName)){ //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java index 45938326d33..a1c848f5e59 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java @@ -13,16 +13,13 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.buildconsole; -import java.net.URI; import java.util.HashMap; import java.util.Map; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -134,8 +131,8 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang protected void startConsoleActivity(IProject project) { Object[] list = listeners.getListeners(); if (list.length > 0) { - for (int i = 0; i < list.length; i++) { - IBuildConsoleListener listener = (IBuildConsoleListener)list[i]; + for (Object element : list) { + IBuildConsoleListener listener = (IBuildConsoleListener)element; ConsoleEvent event = new ConsoleEvent(BuildConsoleManager.this, project, IBuildConsoleEvent.CONSOLE_START); listener.consoleChange(event); } @@ -203,8 +200,8 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang partioner.disconnect(); Object[] list = listeners.getListeners(); if (list.length > 0) { - for (int i = 0; i < list.length; i++) { - IBuildConsoleListener listener = (IBuildConsoleListener)list[i]; + for (Object element : list) { + IBuildConsoleListener listener = (IBuildConsoleListener)element; ConsoleEvent consoleEvent = new ConsoleEvent(this, (IProject)resource, IBuildConsoleEvent.CONSOLE_CLOSE); listener.consoleChange(consoleEvent); } diff --git a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java index 0e93d0054d5..7e8eeb49b5c 100644 --- a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java +++ b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java @@ -78,7 +78,6 @@ import org.eclipse.ui.views.navigator.ResourceComparator; import org.eclipse.cdt.core.cdtvariables.CdtVariableException; import org.eclipse.cdt.core.cdtvariables.ICdtVariable; import org.eclipse.cdt.ui.CDTSharedImages; -import org.eclipse.cdt.ui.CDTSharedImages; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.newui.CDTStatusInfo; import org.eclipse.cdt.ui.newui.TypedCDTViewerFilter;