From f50f3209a07707730cea2b3500db0c5dea7af13a Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 5 Aug 2009 18:27:52 +0000 Subject: [PATCH] compiler warnings - @Override annotations --- .../org/eclipse/cdt/make/internal/ui/ErrorParserBlock.java | 6 ++++++ .../src/org/eclipse/cdt/make/internal/ui/MakeStartup.java | 1 + .../src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java | 2 ++ .../cdt/make/internal/ui/MakeUIPreferenceInitializer.java | 1 + 4 files changed, 10 insertions(+) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/ErrorParserBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/ErrorParserBlock.java index 461216129e3..00bc9278d87 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/ErrorParserBlock.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/ErrorParserBlock.java @@ -38,6 +38,7 @@ public class ErrorParserBlock extends AbstractErrorParserBlock { * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { if (useBuildInfo == true && fBuildInfo == null) { @@ -55,6 +56,7 @@ public class ErrorParserBlock extends AbstractErrorParserBlock { * * @see org.eclipse.cdt.ui.dialogs.ErrorParserBlock#getErrorParserIDs(org.eclipse.core.resources.IProject) */ + @Override protected String[] getErrorParserIDs(IProject project) { if (getContainer().getProject() != null && fBuildInfo == null) { try { @@ -74,6 +76,7 @@ public class ErrorParserBlock extends AbstractErrorParserBlock { * @see org.eclipse.cdt.ui.dialogs.ErrorParserBlock#saveErrorParsers(org.eclipse.core.resources.IProject, * java.lang.String[]) */ + @Override public void saveErrorParsers(IProject project, String[] parserIDs) throws CoreException { if (getContainer().getProject() != null) { try { @@ -90,6 +93,7 @@ public class ErrorParserBlock extends AbstractErrorParserBlock { /* (non-Javadoc) * @see org.eclipse.cdt.ui.dialogs.AbstractErrorParserBlock#saveErrorParsers(java.lang.String[]) */ + @Override protected void saveErrorParsers(String[] parserIDs) throws CoreException { fBuildInfo = MakeCorePlugin.createBuildInfo(fPrefs, MakeBuilder.BUILDER_ID, false); fBuildInfo.setErrorParsers(parserIDs); @@ -98,11 +102,13 @@ public class ErrorParserBlock extends AbstractErrorParserBlock { /* (non-Javadoc) * @see org.eclipse.cdt.ui.dialogs.AbstractErrorParserBlock#getErrorParserIDs(boolean) */ + @Override protected String[] getErrorParserIDs(boolean defaults) { fBuildInfo = MakeCorePlugin.createBuildInfo(fPrefs, MakeBuilder.BUILDER_ID, defaults); return fBuildInfo.getErrorParsers(); } + @Override public void setContainer(ICOptionContainer container) { super.setContainer(container); if (getContainer().getProject() != null) { diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeStartup.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeStartup.java index 778c8a847e8..25ff75db889 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeStartup.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeStartup.java @@ -29,6 +29,7 @@ public class MakeStartup extends Job { setSystem(true); } + @Override protected IStatus run(IProgressMonitor monitor) { final IProject[] oldProject = UpdateMakeProjectAction.getOldProjects(); if (oldProject.length > 0) { diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java index f7d39c5e45c..55a610f9dfd 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java @@ -269,6 +269,7 @@ public class MakeUIPlugin extends AbstractUIPlugin { } + @Override public void start(BundleContext context) throws Exception { super.start(context); new MakeStartup().schedule(); @@ -277,6 +278,7 @@ public class MakeUIPlugin extends AbstractUIPlugin { /* (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { if (fWorkingCopyManager != null) { fWorkingCopyManager.shutdown(); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java index 06e4c23d74e..0a868e2811e 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPreferenceInitializer.java @@ -22,6 +22,7 @@ public class MakeUIPreferenceInitializer extends AbstractPreferenceInitializer { /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { IPreferenceStore store = MakeUIPlugin.getDefault().getPreferenceStore(); MakePreferencePage.initDefaults(store);