From dbe5a12393fe97df53023a9093787a8037e2289b Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 14 Jul 2010 13:51:53 +0000 Subject: [PATCH] bug 319777: Missing @Override annotations patch from Petri Tuononen --- .../ui/editor/MakefileContentOutlinePage.java | 4 ++ .../MakefileEditorActionContributor.java | 3 ++ ...akefileEditorTogglePresentationAction.java | 2 + .../MakefileStorageDocumentProvider.java | 1 + .../ui/editor/OpenDeclarationAction.java | 1 + .../ui/part/SharedPartWithButtons.java | 2 + .../ui/part/StructuredViewerPart.java | 2 + .../ui/part/WizardCheckboxTablePart.java | 5 +++ .../ui/preferences/TabFolderLayout.java | 2 + .../ui/properties/PathAndSymbolPage.java | 1 + .../internal/ui/text/WordPartDetector.java | 1 + .../internal/ui/wizards/StatusWizardPage.java | 1 + .../core/tests/TestPathConverter4.java | 1 + .../core/tests/TestValueHandler.java | 1 + .../templateengine/tests/TestProcesses.java | 2 + .../tests/BackwardCompatiblityTests.java | 2 + .../tests/OptionStringListValueTests.java | 2 + .../core/scannerconfig/CfgInfoContext.java | 2 + .../PerFileSettingsCalculator.java | 5 +++ .../scannerconfig/jobs/CfgSCJobsUtil.java | 1 + .../core/OptionStringValue.java | 3 ++ .../core/ResourceChangeHandler2.java | 3 ++ .../buildmodel/BuildStateManager.java | 2 + .../internal/buildmodel/CommandBuilder.java | 37 +++++++++++-------- .../FileMacroExplicitSubstitutor.java | 1 + .../internal/buildmodel/ParallelBuilder.java | 2 + .../buildproperties/BuildProperties.java | 2 + .../buildproperties/PropertyBase.java | 3 ++ .../internal/core/BuildObject.java | 1 + .../internal/core/BuildObjectProperties.java | 3 ++ .../managedbuilder/internal/core/Builder.java | 4 ++ .../internal/core/Configuration.java | 4 ++ .../internal/core/ConfigurationV2.java | 1 + .../internal/core/OptionCategory.java | 3 ++ .../internal/core/OutputType.java | 4 ++ .../internal/core/ProjectType.java | 1 + .../internal/core/ResourceConfiguration.java | 17 +++++++++ .../internal/core/TargetPlatform.java | 3 ++ .../internal/core/ToolReference.java | 1 + .../internal/dataprovider/BuildBuildData.java | 10 +++++ .../dataprovider/BuildConfigurationData.java | 18 +++++++++ .../internal/dataprovider/BuildFileData.java | 7 ++++ .../dataprovider/BuildLanguageData.java | 12 ++++++ ...uildSystemSpecificVariableSubstitutor.java | 1 + .../dataprovider/BuildTargetPlatformData.java | 5 +++ .../BuildVariablesContributor.java | 2 + .../ExternalExtensionMacroSupplier.java | 3 ++ .../dataprovider/ProjectConverter.java | 1 + .../dataprovider/ResourcePropertyHolder.java | 1 + .../internal/enablement/NotExpression.java | 1 + .../StoredBuildPathEnvironmentContainer.java | 1 + .../internal/macros/BuildMacro.java | 2 + .../internal/macros/BuildMacroProvider.java | 1 + .../macros/BuildfileMacroSubstitutor.java | 2 + .../internal/macros/CoreMacrosSupplier.java | 4 ++ .../macros/ExplicitFileMacroCollector.java | 1 + .../macros/FileContextBuildMacroValues.java | 1 + .../internal/macros/MbsMacroSupplier.java | 3 ++ .../DefaultGnuWinScannerInfoCollector.java | 3 ++ ...gedBuildPathEntryContainerInitializer.java | 1 + .../ManagedGCCScannerInfoConsoleParser.java | 3 ++ .../tcmodification/CollectionMap.java | 5 +++ .../ConfigurationModification.java | 2 + .../tcmodification/FileInfoModification.java | 6 +++ .../FolderInfoModification.java | 7 ++++ .../internal/tcmodification/HashSetMap.java | 2 + .../tcmodification/LinkedHashSetMap.java | 2 + .../internal/tcmodification/ListMap.java | 5 +++ .../internal/tcmodification/ObjectSet.java | 1 + .../ObjectTypeBasedStorage.java | 1 + .../tcmodification/PathTreeSetMap.java | 2 + .../tcmodification/PerTypeMapStorage.java | 1 + .../tcmodification/PerTypeSetStorage.java | 1 + .../extension/ConflictDefinition.java | 1 + .../extension/MatchObjectElement.java | 6 +++ .../extension/RulesManager.java | 1 + .../UpdateManagedProject12.java | 1 + .../UpdateManagedProject20.java | 1 + .../UpdateManagedProject21.java | 1 + .../UpdateManagedProjectManager.java | 1 + .../CreateProjectProgressMonitor.java | 3 ++ .../AppendToMBSStringListOptionValues.java | 1 + .../AppendToMBSStringOptionValue.java | 1 + .../processes/CreateIncludeFolder.java | 1 + .../processes/ExcludeResources.java | 1 + .../GenerateMakefileWithBuildDescription.java | 1 + .../processes/NewManagedProject.java | 1 + .../processes/SetMBSBooleanOptionValue.java | 1 + .../SetMBSStringListOptionValues.java | 1 + .../processes/SetMBSStringOptionValue.java | 1 + .../cdt/newmake/core/MakeScannerProvider.java | 1 + .../templates/SimpleMakefileGenerator.java | 1 + .../ui/tests/TestCProjectPlatformPage.java | 2 + .../ui/tests/TestCustomPageManager.java | 1 + .../ui/tests/testplugin/TestsPlugin.java | 2 + .../ui/tests/util/TestToolchain.java | 9 +++++ .../wizardPages/AlwaysPresentWizardPage.java | 2 + .../tests/wizardPages/NatureAWizardPage.java | 1 + .../tests/wizardPages/NatureBWizardPage.java | 1 + .../wizardPages/ProjectTypeDWizardPage.java | 1 + .../wizardPages/ProjectTypeEWizardPage.java | 1 + .../wizardPages/ToolchainCWizardPage.java | 1 + .../wizardPages/ToolchainCv20WizardPage.java | 1 + .../wizardPages/ToolchainFWizardPage.java | 1 + .../internal/ui/actions/BuildFilesAction.java | 2 + .../preferences/PreferredToolchainsTab.java | 10 +++++ .../NewBuildConfigurationDialog.java | 7 ++++ .../ui/properties/NewCfgDialog.java | 12 ++++++ .../ui/properties/Page_ExpPathAndSymb.java | 1 + .../ui/wizards/AbstractCWizard.java | 1 + .../cdt/examples/pdavm/PDAVirtualMachine.java | 2 + .../cdt/examples/ant/tasks/PreProcessor.java | 1 + 112 files changed, 324 insertions(+), 15 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java index 3347faf2ba9..77b943976c3 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java @@ -176,6 +176,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { if (element instanceof ITargetRule) { return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE); @@ -198,6 +199,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { String name; if (element instanceof IRule) { @@ -233,6 +235,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC /* (non-Javadoc) * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); TreeViewer viewer = getTreeViewer(); @@ -322,6 +325,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC /* (non-Javadoc) * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars) */ + @Override public void setActionBars(IActionBars actionBars) { super.setActionBars(actionBars); IToolBarManager toolBarManager= actionBars.getToolBarManager(); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorActionContributor.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorActionContributor.java index 794144e3d57..2171a1024b1 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorActionContributor.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorActionContributor.java @@ -52,6 +52,7 @@ public class MakefileEditorActionContributor extends BasicTextEditorActionContri /** * @see org.eclipse.ui.IEditorActionBarContributor#setActiveEditor(IEditorPart) */ + @Override public void setActiveEditor(IEditorPart targetEditor) { super.setActiveEditor(targetEditor); doSetActiveEditor(targetEditor); @@ -78,6 +79,7 @@ public class MakefileEditorActionContributor extends BasicTextEditorActionContri /* * @see IEditorActionBarContributor#dispose() */ + @Override public void dispose() { doSetActiveEditor(null); super.dispose(); @@ -86,6 +88,7 @@ public class MakefileEditorActionContributor extends BasicTextEditorActionContri /** * @see org.eclipse.ui.part.EditorActionBarContributor#init(IActionBars) */ + @Override public void init(IActionBars bars) { super.init(bars); IMenuManager menuManager = bars.getMenuManager(); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorTogglePresentationAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorTogglePresentationAction.java index b6488e2afe6..b4cc0494fce 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorTogglePresentationAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditorTogglePresentationAction.java @@ -31,6 +31,7 @@ public class MakefileEditorTogglePresentationAction extends TextEditorAction { /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { ITextEditor editor= getTextEditor(); editor.resetHighlightRange(); @@ -42,6 +43,7 @@ public class MakefileEditorTogglePresentationAction extends TextEditorAction { /** * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { setChecked(getTextEditor() != null && getTextEditor().showsHighlightRangeOnly()); setEnabled(true); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileStorageDocumentProvider.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileStorageDocumentProvider.java index 1fe9ce7a2bc..e4b7b25c01e 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileStorageDocumentProvider.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileStorageDocumentProvider.java @@ -27,6 +27,7 @@ public class MakefileStorageDocumentProvider extends StorageDocumentProvider { * @see org.eclipse.ui.editors.text.StorageDocumentProvider#setupDocument(java.lang.Object, * org.eclipse.jface.text.IDocument) */ + @Override protected void setupDocument(Object element, IDocument document) { if (document != null) { IDocumentPartitioner partitioner= createDocumentPartitioner(); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/OpenDeclarationAction.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/OpenDeclarationAction.java index f9f78409ed3..3eec27aae9d 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/OpenDeclarationAction.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/OpenDeclarationAction.java @@ -37,6 +37,7 @@ public class OpenDeclarationAction extends TextEditorAction { * * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { ITextEditor editor = getTextEditor(); if (editor == null) { diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java index 93ee23b1172..e0b1a396114 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java @@ -59,6 +59,7 @@ public abstract class SharedPartWithButtons extends SharedPart { /* * @see SharedPart#createControl(Composite, FormWidgetFactory) */ + @Override public void createControl(Composite parent, int style, int span) { createMainLabel(parent, span); createMainControl(parent, style, span - 1); @@ -98,6 +99,7 @@ public abstract class SharedPartWithButtons extends SharedPart { return button; } + @Override protected void updateEnabledState() { for (int i = 0; i < controls.length; i++) { Control c = controls[i]; diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/StructuredViewerPart.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/StructuredViewerPart.java index a4a7f80f7a5..3ab15785bf7 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/StructuredViewerPart.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/StructuredViewerPart.java @@ -38,6 +38,7 @@ public abstract class StructuredViewerPart extends SharedPartWithButtons { /* * @see SharedPartWithButtons#createMainControl(Composite, int, FormWidgetFactory) */ + @Override protected void createMainControl(Composite parent, int style, int span) { viewer = createStructuredViewer(parent, style); Control control = viewer.getControl(); @@ -60,6 +61,7 @@ public abstract class StructuredViewerPart extends SharedPartWithButtons { } } + @Override protected void updateEnabledState() { getControl().setEnabled(isEnabled()); super.updateEnabledState(); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java index e695db647c0..a25c2120362 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/WizardCheckboxTablePart.java @@ -59,6 +59,7 @@ public class WizardCheckboxTablePart extends CheckboxTablePart { this.deselectAllIndex = index; } + @Override protected void buttonSelected(Button button, int index) { if (index == selectAllIndex) { handleSelectAll(true); @@ -88,16 +89,19 @@ public class WizardCheckboxTablePart extends CheckboxTablePart { updateCounter(0); } + @Override protected Button createButton(Composite parent, String label, int index) { Button button = super.createButton(parent, label, index); return button; } + @Override protected StructuredViewer createStructuredViewer(Composite parent, int style) { StructuredViewer viewer = super.createStructuredViewer(parent, style); return viewer; } + @Override protected void createMainLabel(Composite parent, int span) { if (tableName == null) return; @@ -144,6 +148,7 @@ public class WizardCheckboxTablePart extends CheckboxTablePart { } updateCounter(selected); } + @Override protected void elementChecked(Object element, boolean checked) { int count = getSelectionCount(); updateCounter(checked ? count + 1 : count - 1); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/TabFolderLayout.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/TabFolderLayout.java index 946428e9ec2..a74deefaa7d 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/TabFolderLayout.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/TabFolderLayout.java @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Layout; public class TabFolderLayout extends Layout { + @Override protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) { if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) return new Point(wHint, hHint); @@ -43,6 +44,7 @@ public class TabFolderLayout extends Layout { } + @Override protected void layout (Composite composite, boolean flushCache) { Rectangle rect= composite.getClientArea(); diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/PathAndSymbolPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/PathAndSymbolPage.java index 8c631fe3e27..931fa2fba5d 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/PathAndSymbolPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/PathAndSymbolPage.java @@ -14,6 +14,7 @@ import org.eclipse.cdt.ui.newui.AbstractPage; public class PathAndSymbolPage extends AbstractPage { + @Override protected boolean isSingle() { return false; } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java index e045ab44937..a757f2a835a 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/WordPartDetector.java @@ -85,6 +85,7 @@ public class WordPartDetector { /** * @return String */ + @Override public String toString() { return wordPart; } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java index a1985580d7c..49e4cea367c 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java @@ -35,6 +35,7 @@ public abstract class StatusWizardPage extends WizardPage { /* * @see WizardPage#becomesVisible */ + @Override public void setVisible(boolean visible) { super.setVisible(visible); fPageVisible= visible; diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestPathConverter4.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestPathConverter4.java index 3c4d16f60b9..b528d9f8560 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestPathConverter4.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestPathConverter4.java @@ -27,6 +27,7 @@ public class TestPathConverter4 extends TestPathConverter1 { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.core.tests.TestPathConverter1#convertToPlatformLocation(java.lang.String) */ + @Override public IPath convertToPlatformLocation(String toolSpecificPath, IOption option, ITool tool) { String convertedString = toolSpecificPath.substring("file://".length()); IPath path = new Path(convertedString); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestValueHandler.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestValueHandler.java index b4fba86655c..8c11a772588 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestValueHandler.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestValueHandler.java @@ -23,6 +23,7 @@ public class TestValueHandler extends ManagedOptionValueHandler implements /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler#handleValue(IConfiguration,IToolChain,IOption,String,int) */ + @Override public boolean handleValue(IBuildObject configuration, IHoldsOptions holder, IOption option, diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java index 4891e513591..aec1dde040c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java @@ -44,11 +44,13 @@ public class TestProcesses extends TestCase { String projectName; + @Override protected void setUp() throws Exception { TemplateEngineTestsHelper.turnOffAutoBuild(); projectName= "TemplateEngineTestsProject"+System.currentTimeMillis(); } + @Override protected void tearDown() throws Exception { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java index e25b5f538d6..72601336cec 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java @@ -76,10 +76,12 @@ public class BackwardCompatiblityTests extends TestCase { return ManagedBuildTestHelper.loadProject(name, TEST_3X_STD_MAKE_PROJECTS); } + @Override protected void setUp() throws Exception { super.setUp(); } + @Override protected void tearDown() throws Exception { for(Iterator iter = projList.iterator(); iter.hasNext();){ IProject proj = (IProject)iter.next(); diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java index b246b891687..d1e64b08b78 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java @@ -52,9 +52,11 @@ public class OptionStringListValueTests extends TestCase { return new TestSuite(OptionStringListValueTests.class); } + @Override protected void setUp() throws Exception { } + @Override protected void tearDown() throws Exception { } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/CfgInfoContext.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/CfgInfoContext.java index fab6d896eac..534b419d73f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/CfgInfoContext.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/CfgInfoContext.java @@ -183,6 +183,7 @@ public final class CfgInfoContext{ return null; } + @Override public boolean equals(Object obj) { if(this == obj) return true; @@ -206,6 +207,7 @@ public final class CfgInfoContext{ return true; } + @Override public int hashCode() { int code = getCode(fCfg); code += getCode(fRcInfo); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java index 70646f5f8a4..0d48acce97e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java @@ -236,6 +236,7 @@ public class PerFileSettingsCalculator { return fMaxMatchInfo; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -259,6 +260,7 @@ public class PerFileSettingsCalculator { return true; } + @Override public int hashCode() { int hash = fHash; if(hash == 0){ @@ -287,6 +289,7 @@ public class PerFileSettingsCalculator { fExts = exts == null || exts.length == 0 ? EMPTY_STRING_ARRAY : (String[])exts.clone(); } + @Override public boolean equals(Object obj) { if(this == obj) return true; @@ -311,6 +314,7 @@ public class PerFileSettingsCalculator { return (String[])fExts.clone(); } + @Override public int hashCode() { int hash = fHash; if(hash == 0){ @@ -329,6 +333,7 @@ public class PerFileSettingsCalculator { return fExtsSet; } + @Override public String toString() { if(fExts.length == 0) return ""; //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/jobs/CfgSCJobsUtil.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/jobs/CfgSCJobsUtil.java index ec82c97fb67..ca8309a9ca4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/jobs/CfgSCJobsUtil.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/jobs/CfgSCJobsUtil.java @@ -49,6 +49,7 @@ public class CfgSCJobsUtil { this.rc = rc; } + @Override public String toString() { return rc ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java index b5b93b06bc7..5185529e78f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java @@ -156,6 +156,7 @@ public final class OptionStringValue { return srcPrefixMapping; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -183,6 +184,7 @@ public final class OptionStringValue { return true; } + @Override public int hashCode() { return code(value); } @@ -191,6 +193,7 @@ public final class OptionStringValue { return str != null ? str.hashCode() : 0; } + @Override public String toString() { return new StringBuffer().append("ov:").append(value.toString()).toString(); //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ResourceChangeHandler2.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ResourceChangeHandler2.java index f9dd199c7dc..d0f117e9570 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ResourceChangeHandler2.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ResourceChangeHandler2.java @@ -82,6 +82,7 @@ class ResourceChangeHandler2 extends ResourceChangeHandlerBase{ } } + @Override protected IResourceMoveHandler createResourceMoveHandler( IResourceChangeEvent event) { return new RcMoveHandler(); @@ -166,6 +167,7 @@ class ResourceChangeHandler2 extends ResourceChangeHandlerBase{ return false; } + @Override public void resourceChanged(IResourceChangeEvent event) { super.resourceChanged(event); @@ -193,6 +195,7 @@ class ResourceChangeHandler2 extends ResourceChangeHandlerBase{ Job job = new Job(ManagedMakeMessages.getString("ResourceChangeHandler2.0")){ //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { for(Iterator iter = projSet.iterator(); iter.hasNext();){ IProject project = (IProject)iter.next(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java index 79146333159..1128ee57a77 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java @@ -63,6 +63,7 @@ public class BuildStateManager { private class EventListener extends ResourceChangeHandlerBase implements ICProjectDescriptionListener { + @Override public void resourceChanged(IResourceChangeEvent event) { super.resourceChanged(event); //TODO: may handle resource changes as well @@ -113,6 +114,7 @@ public class BuildStateManager { } } + @Override protected IResourceMoveHandler createResourceMoveHandler( IResourceChangeEvent event) { return new ResourceMoveHandler(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java index e29dce7f1f8..a538bd7f009 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java @@ -81,6 +81,7 @@ public class CommandBuilder implements IBuildModelBuilder { */ private class CommandSearchLauncher extends CommandLauncher{ + @Override protected String[] constructCommandArray(String command, String[] commandArgs) { String[] args = new String[1 + commandArgs.length]; if(!isWindows()){ @@ -97,6 +98,7 @@ public class CommandBuilder implements IBuildModelBuilder { } + @Override protected void printCommandLine(OutputStream os) { if (os != null) { String cmd = CommandBuilder.this.getCommandLine(); @@ -117,25 +119,30 @@ public class CommandBuilder implements IBuildModelBuilder { fOut = out; } - public void write(int b) throws IOException { - fOut.write(b); - } + @Override + public void write(int b) throws IOException { + fOut.write(b); + } - public void write(byte b[]) throws IOException { - fOut.write(b); - } + @Override + public void write(byte b[]) throws IOException { + fOut.write(b); + } - public void write(byte b[], int off, int len) throws IOException { - fOut.write(b, off, len); - } + @Override + public void write(byte b[], int off, int len) throws IOException { + fOut.write(b, off, len); + } - public void flush() throws IOException { - fOut.flush(); - } + @Override + public void flush() throws IOException { + fOut.flush(); + } + + @Override + public void close() throws IOException { + } - public void close() throws IOException { - } - } public CommandBuilder(IBuildCommand cmd, IResourceRebuildStateContainer cr){ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/FileMacroExplicitSubstitutor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/FileMacroExplicitSubstitutor.java index 9e856ccfe56..33641862397 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/FileMacroExplicitSubstitutor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/FileMacroExplicitSubstitutor.java @@ -38,6 +38,7 @@ public class FileMacroExplicitSubstitutor extends SupplierBasedCdtVariableSubsti /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.internal.macros.DefaultMacroSubstitutor#resolveMacro(org.eclipse.cdt.managedbuilder.macros.IBuildMacro) */ + @Override protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException{ if(macro instanceof MbsMacroSupplier.FileContextMacro){ MbsMacroSupplier.FileContextMacro fileMacro = (MbsMacroSupplier.FileContextMacro)macro; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ParallelBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ParallelBuilder.java index 54131325d08..a6056c4d88e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ParallelBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ParallelBuilder.java @@ -86,6 +86,7 @@ public class ParallelBuilder { level = _level; } + @Override public int hashCode() { return step.hashCode(); } @@ -115,6 +116,7 @@ public class ParallelBuilder { } else { return false; } } + @Override public String toString() { return"[BuildQueueElement] " + DbgUtil.stepName(step) + " @ " + level; //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildProperties.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildProperties.java index a21353e56b1..268a7eab7b4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildProperties.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildProperties.java @@ -96,6 +96,7 @@ public class BuildProperties implements IBuildProperties { fPropertiesMap.remove(property.getPropertyType().getId()); } + @Override public String toString(){ String props = toStringExistingProperties(); if(fInexistentProperties != null){ @@ -127,6 +128,7 @@ public class BuildProperties implements IBuildProperties { return buf.toString(); } + @Override public Object clone() { try { BuildProperties clone = (BuildProperties)super.clone(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/PropertyBase.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/PropertyBase.java index 2e320b07a47..0f9ea020290 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/PropertyBase.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/PropertyBase.java @@ -29,10 +29,12 @@ public abstract class PropertyBase { return fName; } + @Override public String toString(){ return getId(); } + @Override public boolean equals(Object o){ if(!o.getClass().equals(getClass())) return false; @@ -40,6 +42,7 @@ public abstract class PropertyBase { return fId.equals(((PropertyBase)o).getId()); } + @Override public int hashCode(){ return fId.hashCode(); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java index 4aeff2e1cc3..b4675fc7d72 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java @@ -55,6 +55,7 @@ public class BuildObject implements IBuildObject { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { return name; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObjectProperties.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObjectProperties.java index d41437ad1ac..34a105dbac3 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObjectProperties.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObjectProperties.java @@ -105,11 +105,13 @@ public class BuildObjectProperties extends BuildProperties implements // return false; } + @Override public void clear() { super.clear(); fListener.propertiesChanged(); } + @Override public IBuildProperty removeProperty(String id) { IBuildProperty property = super.removeProperty(id); if(property != null) @@ -121,6 +123,7 @@ public class BuildObjectProperties extends BuildProperties implements return super.setProperty(propertyId, propertyValue); } + @Override public IBuildProperty setProperty(String propertyId, String propertyValue) throws CoreException { // if(!supportsType(propertyId)) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java index 5087bfd495b..431a144e486 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java @@ -960,6 +960,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, /* (non-Javadoc) * @see org.eclipse.cdt.core.build.managed.IBuilder#getName() */ + @Override public String getName() { return (name == null && superClass != null) ? superClass.getName() : name; } @@ -2409,6 +2410,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, this.builder = builder; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -2418,6 +2420,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, return builder.performMatchComparison(other.builder); } + @Override public int hashCode() { String name = getName(); if(name == null) @@ -2719,6 +2722,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider, public boolean isExtensionBuildObject() { return isExtensionElement(); } + @Override public String toString() { return getUniqueRealName(); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java index 89ba65c5afb..a3f21251c15 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java @@ -1171,6 +1171,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild /* (non-Javadoc) * @see org.eclipse.cdt.core.build.managed.IConfiguration#getName() */ + @Override public String getName() { return (name == null && parent != null) ? parent.getName() : name; } @@ -1847,6 +1848,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild /** * @return Returns the version. */ + @Override public Version getVersion() { if ( version == null) { if ( rootFolderInfo.getToolChain() != null) { @@ -1856,6 +1858,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild return version; } + @Override public void setVersion(Version version) { // Do nothing } @@ -1881,6 +1884,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.internal.core.BuildObject#updateManagedBuildRevision(java.lang.String) */ + @Override public void updateManagedBuildRevision(String revision){ super.updateManagedBuildRevision(revision); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ConfigurationV2.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ConfigurationV2.java index 56a91b33bb5..78326a04bab 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ConfigurationV2.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ConfigurationV2.java @@ -358,6 +358,7 @@ public class ConfigurationV2 extends BuildObject implements IConfigurationV2 { /* (non-Javadoc) * @see org.eclipse.cdt.core.build.managed.IConfigurationV2#getName() */ + @Override public String getName() { return (name == null && parent != null) ? parent.getName() : name; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java index 3c01f0b3e65..7637a1595c6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java @@ -457,6 +457,7 @@ public class OptionCategory extends BuildObject implements IOptionCategory { /** * @return Returns the managedBuildRevision. */ + @Override public String getManagedBuildRevision() { if ( managedBuildRevision == null) { if ( getOptionHolder() != null) { @@ -469,6 +470,7 @@ public class OptionCategory extends BuildObject implements IOptionCategory { /** * @return Returns the version. */ + @Override public Version getVersion() { if ( version == null) { if ( getOptionHolder() != null) { @@ -478,6 +480,7 @@ public class OptionCategory extends BuildObject implements IOptionCategory { return version; } + @Override public void setVersion(Version version) { // Do nothing } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OutputType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OutputType.java index d9a697e978e..91762b6f423 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OutputType.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OutputType.java @@ -446,6 +446,7 @@ public class OutputType extends BuildObject implements IOutputType { /* (non-Javadoc) * @see org.eclipse.cdt.core.build.managed.IOutputType#getName() */ + @Override public String getName() { return (name == null && superClass != null) ? superClass.getName() : name; } @@ -863,6 +864,7 @@ public class OutputType extends BuildObject implements IOutputType { /** * @return Returns the managedBuildRevision. */ + @Override public String getManagedBuildRevision() { if ( managedBuildRevision == null) { if ( getParent() != null) { @@ -875,6 +877,7 @@ public class OutputType extends BuildObject implements IOutputType { /** * @return Returns the version. */ + @Override public Version getVersion() { if ( version == null) { if ( getParent() != null) { @@ -884,6 +887,7 @@ public class OutputType extends BuildObject implements IOutputType { return version; } + @Override public void setVersion(Version version) { // Do nothing } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java index 4284336eb5a..d18ac1a58ee 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java @@ -311,6 +311,7 @@ public class ProjectType extends BuildObject implements IProjectType, IBuildProp /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.core.IBuildObject#getName() */ + @Override public String getName() { String name = getNameAttribute(); if(name.length() == 0){ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java index cccef6254dc..73dc56a2143 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java @@ -404,6 +404,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { * @param doc * @param element */ + @Override public void serialize(ICStorageElement element) { super.serialize(element); if (toolsToInvoke != null) { @@ -729,6 +730,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#isDirty() */ + @Override public boolean isDirty() { // This shouldn't be called for an extension tool-chain if (isExtensionResourceConfig) return false; @@ -750,6 +752,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#setDirty(boolean) */ + @Override public void setDirty(boolean isDirty) { if (isExtensionResourceConfig) return; @@ -768,6 +771,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { /* (non-Javadoc) * Resolve the element IDs to interface references */ + @Override public void resolveReferences() { if (!resolved) { resolved = true; @@ -829,6 +833,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { /** * @return Returns the version. */ + @Override public Version getVersion() { if ( version == null) { if ( getParent() != null) { @@ -838,6 +843,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { return version; } + @Override public void setVersion(Version version) { // Do nothing } @@ -845,6 +851,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.internal.core.BuildObject#updateManagedBuildRevision(java.lang.String) */ + @Override public void updateManagedBuildRevision(String revision){ super.updateManagedBuildRevision(revision); @@ -856,6 +863,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#needsRebuild() */ + @Override public boolean needsRebuild() { if(super.needsRebuild()) return true; @@ -872,6 +880,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#setRebuildState(boolean) */ + @Override public void setRebuildState(boolean rebuild) { if(isExtensionResourceConfiguration() && rebuild) return; @@ -941,6 +950,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { return baseTc; } + @Override public boolean isExtensionElement() { return isExtensionResourceConfig; } @@ -955,18 +965,22 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { return true; } + @Override public Set contributeErrorParsers(Set set) { return contributeErrorParsers(getToolsToInvoke(), set); } + @Override public void resetErrorParsers() { resetErrorParsers(getToolsToInvoke()); } + @Override void removeErrorParsers(Set set) { removeErrorParsers(getToolsToInvoke(), set); } + @Override void resolveProjectReferences(boolean onLoad){ for(Iterator iter = getToolList().iterator(); iter.hasNext();){ Tool tool = (Tool)iter.next(); @@ -974,6 +988,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { } } + @Override public boolean hasCustomSettings() { IResourceInfo parentRc = getParentResourceInfo(); if(parentRc instanceof FolderInfo){ @@ -1011,10 +1026,12 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo { info.apply(); } + @Override public boolean isFolderInfo() { return false; } + @Override void applyToolsInternal(ITool[] resultingTools, ToolListModificationInfo info) { List list = getToolList(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/TargetPlatform.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/TargetPlatform.java index 9b261877c63..a4471cd2ef4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/TargetPlatform.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/TargetPlatform.java @@ -400,6 +400,7 @@ public class TargetPlatform extends BuildObject implements ITargetPlatform { /* (non-Javadoc) * @see org.eclipse.cdt.core.build.managed.ITargetPlatform#getName() */ + @Override public String getName() { return (name == null && superClass != null) ? superClass.getName() : name; } @@ -606,6 +607,7 @@ public class TargetPlatform extends BuildObject implements ITargetPlatform { /** * @return Returns the version. */ + @Override public Version getVersion() { if ( version == null) { if ( getParent() != null) { @@ -615,6 +617,7 @@ public class TargetPlatform extends BuildObject implements ITargetPlatform { return version; } + @Override public void setVersion(Version version) { // Do nothing } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java index a7545c57a4e..e2e6b9c94bb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java @@ -882,6 +882,7 @@ public class ToolReference implements IToolReference { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { String answer = new String(); if (parent != null) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java index 6f411df7700..43c96238929 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java @@ -30,6 +30,7 @@ public class BuildBuildData extends CBuildData { fCfg = (Configuration)fBuilder.getParent().getParent(); } + @Override public IPath getBuilderCWD() { return new Path(fBuilder.getBuildPath());//ManagedBuildManager.getBuildLocation(fCfg, fBuilder); } @@ -40,34 +41,42 @@ public class BuildBuildData extends CBuildData { return new Path(locationString); } + @Override public String[] getErrorParserIDs() { return fCfg.getErrorParserList(); } + @Override public ICOutputEntry[] getOutputDirectories() { return fBuilder.getOutputEntries(); } + @Override public void setBuilderCWD(IPath path) { fBuilder.setBuildPath(path.toString()); } + @Override public void setErrorParserIDs(String[] ids) { fCfg.setErrorParserList(ids); } + @Override public void setOutputDirectories(ICOutputEntry[] entries) { fBuilder.setOutputEntries(entries); } + @Override public String getId() { return fBuilder.getId(); } + @Override public String getName() { return fBuilder.getName(); } + @Override public boolean isValid() { return fBuilder != null; } @@ -76,6 +85,7 @@ public class BuildBuildData extends CBuildData { //TODO } + @Override public IEnvironmentContributor getBuildEnvironmentContributor() { // if(fEnvContibutor == null) // fEnvContibutor = new BuildEnvironmentContributor(this); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java index c3be9d83b16..2d9aa3da766 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java @@ -43,6 +43,7 @@ public class BuildConfigurationData extends CConfigurationData { return fCfg; } + @Override public CFileData createFileData(IPath path, CFileData base) throws CoreException { String id = ManagedBuildManager.calculateChildId(fCfg.getId(),null); @@ -50,6 +51,7 @@ public class BuildConfigurationData extends CConfigurationData { return info.getFileData(); } + @Override public CFileData createFileData(IPath path, CFolderData base, CLanguageData baseLangData) throws CoreException { String id = ManagedBuildManager.calculateChildId(fCfg.getId(),null); @@ -65,6 +67,7 @@ public class BuildConfigurationData extends CConfigurationData { + @Override public CFolderData createFolderData(IPath path, CFolderData base) throws CoreException { String id = ManagedBuildManager.calculateChildId(fCfg.getId(),null); @@ -72,10 +75,12 @@ public class BuildConfigurationData extends CConfigurationData { return folderInfo.getFolderData(); } + @Override public String getDescription() { return fCfg.getDescription(); } + @Override public CResourceData[] getResourceDatas() { IResourceInfo infos[] = fCfg.getResourceInfos(); CResourceData datas[] = new CResourceData[infos.length]; @@ -85,50 +90,62 @@ public class BuildConfigurationData extends CConfigurationData { return datas; } + @Override public CFolderData getRootFolderData() { return fCfg.getRootFolderInfo().getFolderData(); } + @Override public void removeResourceData(CResourceData data) throws CoreException { fCfg.removeResourceInfo(data.getPath()); } + @Override public void setDescription(String description) { fCfg.setDescription(description); } + @Override public String getId() { return fCfg.getId(); } + @Override public String getName() { return fCfg.getName(); } + @Override public void setName(String name) { fCfg.setName(name); } + @Override public boolean isValid() { return fCfg != null; } + @Override public CTargetPlatformData getTargetPlatformData() { return fCfg.getToolChain().getTargetPlatformData(); } + @Override public ICSourceEntry[] getSourceEntries() { return fCfg.getSourceEntries(); } + @Override public void setSourceEntries(ICSourceEntry[] entries) { fCfg.setSourceEntries(entries); } + @Override public CBuildData getBuildData() { return fCfg.getBuildData(); } + @Override public ICdtVariablesContributor getBuildVariablesContributor() { // if(fCdtVars == null) // fCdtVars = new BuildVariablesContributor(this); @@ -154,6 +171,7 @@ public class BuildConfigurationData extends CConfigurationData { } } + @Override public CConfigurationStatus getStatus() { int flags = 0; String msg = null; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildFileData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildFileData.java index f8210cd4534..fe823ce76c7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildFileData.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildFileData.java @@ -26,6 +26,7 @@ public class BuildFileData extends CFileData { return fFileInfo; } + @Override public IPath getPath() { return fFileInfo.getPath(); } @@ -38,14 +39,17 @@ public class BuildFileData extends CFileData { // fFileInfo.setExclude(excluded); // } + @Override public void setPath(IPath path) { fFileInfo.setPath(path); } + @Override public String getId() { return fFileInfo.getId(); } + @Override public String getName() { return fFileInfo.getName(); } @@ -54,10 +58,12 @@ public class BuildFileData extends CFileData { // fFileInfo.setN } + @Override public boolean isValid() { return fFileInfo.isValid(); } + @Override public CLanguageData getLanguageData() { CLanguageData datas[] = fFileInfo.getCLanguageDatas(); if(datas.length > 0) @@ -65,6 +71,7 @@ public class BuildFileData extends CFileData { return null; } + @Override public boolean hasCustomSettings() { return fFileInfo.hasCustomSettings(); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java index 6fef1484985..db71c961873 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java @@ -96,6 +96,7 @@ public class BuildLanguageData extends CLanguageData { } } + @Override public void setEntries(int kind, ICLanguageSettingEntry entries[]) { BuildEntryStorage storage = getEntryStorage(kind); if(storage != null) @@ -145,10 +146,12 @@ public class BuildLanguageData extends CLanguageData { } */ + @Override public String getLanguageId() { return fInputType != null ? fInputType.getLanguageId(fTool) : null; } + @Override public ICLanguageSettingEntry[] getEntries(int kinds) { List list = new ArrayList(); @@ -185,6 +188,7 @@ public class BuildLanguageData extends CLanguageData { fInputType = type; } + @Override public String[] getSourceContentTypeIds() { if(fInputType != null){ return fInputType.getSourceContentTypeIds(); @@ -192,6 +196,7 @@ public class BuildLanguageData extends CLanguageData { return null; } + @Override public String[] getSourceExtensions() { return fInputType != null ? fInputType.getSourceExtensions(fTool) : fTool.getPrimaryInputExtensions(); } @@ -306,6 +311,7 @@ public class BuildLanguageData extends CLanguageData { } */ + @Override public void setLanguageId(String id) { if(CDataUtil.objectsEqual(id, fInputType.getLanguageId(fTool))){ // fInputType = fTool.getEdtableInputType(fInputType); @@ -314,10 +320,12 @@ public class BuildLanguageData extends CLanguageData { } } + @Override public String getId() { return fId; } + @Override public String getName() { String name; if(fInputType == null){ @@ -336,6 +344,7 @@ public class BuildLanguageData extends CLanguageData { return name; } + @Override public boolean isValid() { // TODO Auto-generated method stub return true; @@ -377,6 +386,7 @@ public class BuildLanguageData extends CLanguageData { return fTool.getParentResourceInfo().getParent(); } + @Override public void setSourceContentTypeIds(String[] ids) { String[] headerIds = fInputType.getHeaderContentTypeIds(); @@ -413,6 +423,7 @@ public class BuildLanguageData extends CLanguageData { } + @Override public void setSourceExtensions(String[] exts) { // TODO Auto-generated method stub @@ -422,6 +433,7 @@ public class BuildLanguageData extends CLanguageData { fKindToEntryStore.clear(); } + @Override public boolean containsDiscoveredScannerInfo() { IResourceInfo rcInfo = fTool.getParentResourceInfo(); if(rcInfo instanceof FolderInfo){ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java index e44e42be7f3..45e36552a29 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java @@ -45,6 +45,7 @@ public class BuildSystemSpecificVariableSubstitutor extends SupplierBasedCdtVari super(contextInfo, inexistentMacroValue, listDelimiter); } + @Override protected ResolvedMacro resolveMacro(String macroName) throws CdtVariableException { if(fFileVarsSet.contains(macroName) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildTargetPlatformData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildTargetPlatformData.java index 92f5507c16a..43b03c10f53 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildTargetPlatformData.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildTargetPlatformData.java @@ -19,22 +19,27 @@ public class BuildTargetPlatformData extends CTargetPlatformData { public BuildTargetPlatformData(TargetPlatform targetPlatform){ fTargetPlatform = targetPlatform; } + @Override public String[] getBinaryParserIds() { return fTargetPlatform.getBinaryParserList(); } + @Override public void setBinaryParserIds(String[] ids) { fTargetPlatform.setBinaryParserList(ids); } + @Override public String getId() { return fTargetPlatform.getId(); } + @Override public String getName() { return fTargetPlatform.getName(); } + @Override public boolean isValid() { //TODO: return true; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildVariablesContributor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildVariablesContributor.java index d1393b4575f..81384b40bd2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildVariablesContributor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildVariablesContributor.java @@ -45,6 +45,7 @@ public class BuildVariablesContributor implements ICdtVariablesContributor { } + @Override protected ICdtVariableSupplier[] getSuppliers(int type, Object data) { switch(type){ case IBuildMacroProvider.CONTEXT_CONFIGURATION: @@ -66,6 +67,7 @@ public class BuildVariablesContributor implements ICdtVariablesContributor { } + @Override public IVariableContextInfo getNext() { switch(getContextType()){ case IBuildMacroProvider.CONTEXT_CONFIGURATION:{ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ExternalExtensionMacroSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ExternalExtensionMacroSupplier.java index e54442bebc3..278b3e55108 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ExternalExtensionMacroSupplier.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ExternalExtensionMacroSupplier.java @@ -59,6 +59,7 @@ public class ExternalExtensionMacroSupplier implements ICdtVariableSupplier{ /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getVariable(java.lang.String, java.lang.Object, boolean) */ + @Override public ICdtVariable getVariable(String macroName, int contextType, Object contextData, @@ -72,6 +73,7 @@ public class ExternalExtensionMacroSupplier implements ICdtVariableSupplier{ /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#getMacros(int, java.lang.Object, boolean) */ + @Override public ICdtVariable[] getVariables(int contextType,Object contextData, boolean includeParent) { // return filterVariables(super.getMacros(contextType, contextData, includeParent)); return filterVariables(fMngr.getVariables(fCfgDes)); @@ -80,6 +82,7 @@ public class ExternalExtensionMacroSupplier implements ICdtVariableSupplier{ /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.internal.envvar.EnvironmentVariableProvider#getContextInfo(java.lang.Object) */ + @Override public IMacroContextInfo getMacroContextInfo(int contextType,Object contextData){ IMacroContextInfo startInfo = getStartInfo(); if(contextType == fContextType && diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java index 15e327f6fd8..fb882ae3e7c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java @@ -534,6 +534,7 @@ public class ProjectConverter implements ICProjectConverter { CCorePlugin.getDefault().setProjectDescription(project, newDes); Job job = new Job(DataProviderMessages.getString("ProjectConverter.7")){ //$NON-NLS-1$ + @Override protected IStatus run(IProgressMonitor monitor) { try { ICProjectDescription des = CCorePlugin.getDefault().getProjectDescription(project); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ResourcePropertyHolder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ResourcePropertyHolder.java index cb7e207be2f..8821d591e14 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ResourcePropertyHolder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ResourcePropertyHolder.java @@ -57,6 +57,7 @@ class ResourcePropertyHolder extends ResourceChangeHandlerBase { return !fProjectOnly || rc.getType() == IResource.PROJECT; } + @Override protected IResourceMoveHandler createResourceMoveHandler( IResourceChangeEvent event) { return new ResourceMoveHandler(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/NotExpression.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/NotExpression.java index 03ace35f921..2c498f72353 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/NotExpression.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/NotExpression.java @@ -22,6 +22,7 @@ public class NotExpression extends AndExpression { super(element); } + @Override public boolean evaluate(IResourceInfo rcInfo, IHoldsOptions holder, IOption option) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java index 009ac342285..849d974d583 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java @@ -201,6 +201,7 @@ public class StoredBuildPathEnvironmentContainer extends /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.internal.envvar.StorableEnvironmentLoader#getSerializeInfo(java.lang.Object) */ + @Override protected ISerializeInfo getSerializeInfo(Object context) { ISerializeInfo serializeInfo = null; if(context instanceof IConfiguration){ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacro.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacro.java index a055f6046ca..caf1c324eeb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacro.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacro.java @@ -43,6 +43,7 @@ public class BuildMacro extends CdtVariable implements IBuildMacro { return getValueType(); } + @Override public String[] getStringListValue() throws BuildMacroException { // TODO Auto-generated method stub try { @@ -52,6 +53,7 @@ public class BuildMacro extends CdtVariable implements IBuildMacro { } } + @Override public String getStringValue() throws BuildMacroException { try { return super.getStringValue(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java index d6761f6a3ea..157de590891 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java @@ -302,6 +302,7 @@ public class BuildMacroProvider implements IBuildMacroProvider, IMacroContextInf final ICdtVariableManager mngr = CCorePlugin.getDefault().getCdtVariableManager(); IMacroContextInfo info = getMacroContextInfo(contextType,contextData); IVariableSubstitutor subst = new SupplierBasedCdtVariableSubstitutor(info,null,""){ //$NON-NLS-1$ + @Override protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException { IStringVariable var = mngr.toEclipseVariable(macro, null); if(var instanceof IDynamicVariable) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java index 567d31561b8..9262d2c81e2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java @@ -214,6 +214,7 @@ public class BuildfileMacroSubstitutor extends SupplierBasedCdtVariableSubstitut /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.internal.macros.DefaultMacroSubstitutor#resolveMacro(org.eclipse.cdt.managedbuilder.macros.IBuildMacro) */ + @Override protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException{ ResolvedMacro resolved = null; @@ -276,6 +277,7 @@ public class BuildfileMacroSubstitutor extends SupplierBasedCdtVariableSubstitut /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.internal.macros.DefaultMacroSubstitutor#setMacroContextInfo(org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo) */ + @Override public void setMacroContextInfo(IVariableContextInfo info) throws CdtVariableException{ super.setMacroContextInfo(info); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/CoreMacrosSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/CoreMacrosSupplier.java index a72ada614c0..9b126fa2feb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/CoreMacrosSupplier.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/CoreMacrosSupplier.java @@ -24,19 +24,23 @@ public class CoreMacrosSupplier extends BuildCdtVariablesSupplierBase { fMngr = CCorePlugin.getDefault().getCdtVariableManager(); } + @Override public IBuildMacro getMacro(String macroName, int contextType, Object contextData) { return BuildMacroProvider.wrap(getVariable(macroName, null)); } + @Override public IBuildMacro[] getMacros(int contextType, Object contextData) { return BuildMacroProvider.wrap(getVariables(null)); } + @Override public ICdtVariable getVariable(String macroName, IMacroContextInfo context) { return fMngr.getVariable(macroName, fCfgDes); } + @Override public ICdtVariable[] getVariables(IMacroContextInfo context) { return fMngr.getVariables(fCfgDes); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java index e14334a564e..59e6d833b67 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java @@ -53,6 +53,7 @@ public class ExplicitFileMacroCollector extends SupplierBasedCdtVariableSubstitu */ /* (non-Javadoc) */ + @Override protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException{ if(macro instanceof MbsMacroSupplier.FileContextMacro){ MbsMacroSupplier.FileContextMacro fileMacro = (MbsMacroSupplier.FileContextMacro)macro; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java index b51f57f51df..62fb2093c3d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java @@ -113,6 +113,7 @@ public class FileContextBuildMacroValues implements /* (non-Javadoc) * @see java.lang.Object#clone() */ + @Override public Object clone(){ FileContextBuildMacroValues cloned = null; try{ diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java index 3b39d4a0393..fec86947d3c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java @@ -215,6 +215,7 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringValue() */ + @Override public String getStringValue(){ // loadValue(); return fStringValue; @@ -333,6 +334,7 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object) */ + @Override public IBuildMacro getMacro(String macroName, int contextType, Object contextData) { IBuildMacro macro = null; @@ -679,6 +681,7 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase { /* (non-Javadoc) * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object) */ + @Override public IBuildMacro[] getMacros(int contextType, Object contextData) { String names[] = getMacroNames(contextType,false); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java index 777b3c7f44e..51d6fc010d2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java @@ -30,6 +30,7 @@ public class DefaultGnuWinScannerInfoCollector extends DefaultGCCScannerInfoColl /* (non-Javadoc) * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector#contributeToScannerConfig(java.lang.Object, java.util.Map) */ + @Override public void contributeToScannerConfig(Object resource, Map scannerInfo) { // check the resource // if (resource != null && resource instanceof IResource && @@ -64,11 +65,13 @@ public class DefaultGnuWinScannerInfoCollector extends DefaultGCCScannerInfoColl super.contributeToScannerConfig(resource, scannerInfo); } // } + @Override public void setProject(IProject project) { fProject = project; super.setProject(project); } + @Override public void setInfoContext(InfoContext context) { fProject = context.getProject(); super.setInfoContext(context); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildPathEntryContainerInitializer.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildPathEntryContainerInitializer.java index 017660f86ae..c0b36ddd0b0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildPathEntryContainerInitializer.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildPathEntryContainerInitializer.java @@ -36,6 +36,7 @@ public class ManagedBuildPathEntryContainerInitializer extends PathEntryContaine /* (non-Javadoc) * @see org.eclipse.cdt.core.model.PathEntryContainerInitializer#initialize(org.eclipse.core.runtime.IPath, org.eclipse.cdt.core.model.ICProject) */ + @Override public void initialize(IPath containerPath, ICProject project) throws CoreException { if (VERBOSE) { System.out.println(TRACE_HEADER + diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedGCCScannerInfoConsoleParser.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedGCCScannerInfoConsoleParser.java index 3aed749eeab..e32dafd1b24 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedGCCScannerInfoConsoleParser.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedGCCScannerInfoConsoleParser.java @@ -24,12 +24,14 @@ public class ManagedGCCScannerInfoConsoleParser extends GCCScannerInfoConsoleParser { Boolean fManagedBuildOnState; + @Override public boolean processLine(String line) { if(isManagedBuildOn()) return false; return super.processLine(line); } + @Override public void shutdown() { if(!isManagedBuildOn()){ super.shutdown(); @@ -37,6 +39,7 @@ public class ManagedGCCScannerInfoConsoleParser extends fManagedBuildOnState = null; } + @Override public void startup(IProject project, IScannerInfoCollector collector) { if(isManagedBuildOn()) return; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java index c794d4c0512..c8d32dd5d7f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java @@ -66,6 +66,7 @@ public class CollectionMap { return (Collection)fEntry.getValue(); } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -79,6 +80,7 @@ public class CollectionMap { return fEntry.equals(((CollectionEntry)obj).fEntry); } + @Override public int hashCode() { return fEntry.hashCode(); } @@ -111,10 +113,12 @@ public class CollectionMap { fMapEntrySet = fMap.entrySet(); } + @Override public Iterator iterator() { return new Iter(); } + @Override public int size() { return fMapEntrySet.size(); } @@ -263,6 +267,7 @@ public class CollectionMap { // return new ArrayList(1); // } + @Override public Object clone() { try { CollectionMap clone = (CollectionMap)super.clone(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java index 798c2a89b6b..ac048ea33c5 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java @@ -193,11 +193,13 @@ public class ConfigurationModification extends FolderInfoModification implements clearToolCompatibilityInfo(); } + @Override public void setToolChain(IToolChain tc, boolean force) { setBuilder(tc.getBuilder()); super.setToolChain(tc, force); } + @Override public void changeProjectTools(ITool removeTool, ITool addTool) { clearBuilderCompatibilityInfo(); super.changeProjectTools(removeTool, addTool); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java index 66a6092cddd..0e1b5ddb08f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java @@ -36,20 +36,24 @@ public class FileInfoModification extends super(rcInfo, base); } + @Override protected boolean canRemove(ITool realTool) { return true; } + @Override protected boolean canAdd(Tool tool) { String ext = getFileExtension(); return tool.buildsFileType(ext, getProject()); } + @Override protected boolean canReplace(Tool fromTool, Tool toTool) { String ext = getFileExtension(); return toTool.buildsFileType(ext, getProject()); } + @Override protected Set getToolApplicabilityPathSet(Tool realTool, boolean isProject) { if(fApplPathSet == null){ Set s = new HashSet(1); @@ -59,10 +63,12 @@ public class FileInfoModification extends return fApplPathSet; } + @Override protected Set getExtensionConflictToolSet(Tool tool, Tool[] toos) { return Collections.EMPTY_SET; } + @Override protected Tool[] filterTools(Tool[] tools) { return tools; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java index de3836bcb3d..780db85a907 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java @@ -223,6 +223,7 @@ public class FolderInfoModification extends ToolListModification implements IFol fCurrentCompatibilityInfo = null; } + @Override protected boolean canRemove(ITool realTool) { IToolChain extTc = ManagedBuildManager.getExtensionToolChain(fSelectedToolChain); ITool[] tools = extTc.getTools(); @@ -234,10 +235,12 @@ public class FolderInfoModification extends ToolListModification implements IFol return true; } + @Override protected boolean canAdd(Tool tool) { return !TcModificationUtil.containCommonEntries(getInputExtsSet(), tool.getPrimaryInputExtensions()); } + @Override protected boolean canReplace(Tool fromTool, Tool toTool) { String[] exts = toTool.getPrimaryInputExtensions(); Set curInputExts = null; @@ -255,6 +258,7 @@ public class FolderInfoModification extends ToolListModification implements IFol return false; } + @Override protected Set getExtensionConflictToolSet(Tool tool, Tool[] tools) { String exts[] = tool.getPrimaryInputExtensions(); Set extsSet = new HashSet(Arrays.asList(exts)); @@ -277,12 +281,14 @@ public class FolderInfoModification extends ToolListModification implements IFol return conflictsSet; } + @Override protected Set getToolApplicabilityPathSet(Tool realTool, boolean isProject) { if(isProject) return (Set)getToolChainApplicabilityPaths().fToolPathMap.get(realTool); return getToolChainApplicabilityPaths().fFolderInfoPaths; } + @Override protected Tool[] filterTools(Tool[] tools) { IResourceInfo rcInfo = getResourceInfo(); return (Tool[])((FolderInfo)rcInfo).filterTools(tools, rcInfo.getParent().getManagedProject()); @@ -327,6 +333,7 @@ public class FolderInfoModification extends ToolListModification implements IFol fTcApplicabilityPaths = tcApplicabilityPaths; } + @Override protected void clearToolInfo(ITool[] tools){ super.clearToolInfo(tools); fTcApplicabilityPaths = null; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/HashSetMap.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/HashSetMap.java index 5287c8447bc..ef879112928 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/HashSetMap.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/HashSetMap.java @@ -15,10 +15,12 @@ import java.util.HashSet; public class HashSetMap extends CollectionMap { + @Override protected Collection cloneCollection(Collection l) { return (Collection)((HashSet)l).clone(); } + @Override protected Collection newCollection(int size) { return new HashSet(); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/LinkedHashSetMap.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/LinkedHashSetMap.java index be0b600885d..46b4d3927b6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/LinkedHashSetMap.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/LinkedHashSetMap.java @@ -15,10 +15,12 @@ import java.util.LinkedHashSet; public class LinkedHashSetMap extends CollectionMap { + @Override protected Collection cloneCollection(Collection l) { return (Collection)((LinkedHashSet)l).clone(); } + @Override protected Collection newCollection(int size) { return new LinkedHashSet(); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ListMap.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ListMap.java index 1242b1b7ca0..8b6405fe67f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ListMap.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ListMap.java @@ -67,6 +67,7 @@ public class ListMap implements Cloneable { return (List)fEntry.getValue(); } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -80,6 +81,7 @@ public class ListMap implements Cloneable { return fEntry.equals(((CollectionEntry)obj).fEntry); } + @Override public int hashCode() { return fEntry.hashCode(); } @@ -112,10 +114,12 @@ public class ListMap implements Cloneable { fMapEntrySet = fMap.entrySet(); } + @Override public Iterator iterator() { return new Iter(); } + @Override public int size() { return fMapEntrySet.size(); } @@ -264,6 +268,7 @@ public class ListMap implements Cloneable { // return new ArrayList(1); // } + @Override public Object clone() { try { ListMap clone = (ListMap)super.clone(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java index ec2cc619c05..ede032e2615 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java @@ -56,6 +56,7 @@ public class ObjectSet implements IObjectSet { return fObjectSet.size(); } + @Override public String toString(){ StringBuffer buf = new StringBuffer(); buf.append(MatchObjectElement.TypeToStringAssociation.getAssociation(fObjectType).getString()); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java index 1a352228a23..54894a27e05 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java @@ -73,6 +73,7 @@ public final class ObjectTypeBasedStorage implements Cloneable { return oldValue; } + @Override public Object clone(){ try { ObjectTypeBasedStorage clone = (ObjectTypeBasedStorage)super.clone(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PathTreeSetMap.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PathTreeSetMap.java index 8125579f3d3..7d6726440dd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PathTreeSetMap.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PathTreeSetMap.java @@ -15,10 +15,12 @@ import java.util.TreeSet; public class PathTreeSetMap extends CollectionMap { + @Override protected Collection cloneCollection(Collection l) { return (Collection)((TreeSet)l).clone(); } + @Override protected Collection newCollection(int size) { return new TreeSet(PathComparator.INSTANCE); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java index d7098208a7f..d592460b24c 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java @@ -31,6 +31,7 @@ public class PerTypeMapStorage implements Cloneable { return (Map)((HashMap)map).clone(); } + @Override public Object clone(){ try { PerTypeMapStorage clone = (PerTypeMapStorage)super.clone(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeSetStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeSetStorage.java index a88aaf15e98..0f30a125bb0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeSetStorage.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeSetStorage.java @@ -31,6 +31,7 @@ public class PerTypeSetStorage implements Cloneable { return (Set)((LinkedHashSet)set).clone(); } + @Override public Object clone(){ try { PerTypeSetStorage clone = (PerTypeSetStorage)super.clone(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/ConflictDefinition.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/ConflictDefinition.java index 74f73e7b21e..3ce992ce859 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/ConflictDefinition.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/ConflictDefinition.java @@ -18,6 +18,7 @@ public class ConflictDefinition extends ObjectSetListBasedDefinition { super(list); } + @Override public final int getType() { return CONFLICT; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java index d9c2f734cc6..5d57c8b2600 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java @@ -76,6 +76,7 @@ public class MatchObjectElement { fType = el.getCompleteOredTypeValue(); } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -86,6 +87,7 @@ public class MatchObjectElement { return fType == ((PatternTypeKey)obj).fType; } + @Override public int hashCode() { return fType; } @@ -157,6 +159,7 @@ public class MatchObjectElement { return (String[])fIds.toArray(new String[fIds.size()]); } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -171,6 +174,7 @@ public class MatchObjectElement { return other.fIds.containsAll(fIds); } + @Override public int hashCode() { if(fHash == 0){ fHash = fIds.hashCode(); @@ -244,6 +248,7 @@ public class MatchObjectElement { return fObjectType; } + @Override public boolean equals(Object obj) { if(obj == this) return true; @@ -258,6 +263,7 @@ public class MatchObjectElement { return Arrays.equals(other.fPatterns, fPatterns); } + @Override public int hashCode() { if(fHash == 0){ int hash = fObjectType; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java index ab120a57e64..e6db53d1922 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java @@ -55,6 +55,7 @@ public class RulesManager { setSystem(true); } + @Override protected IStatus run(IProgressMonitor monitor) { try { loadExtensions(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java index a083c7966a3..d0adaa53e34 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java @@ -766,6 +766,7 @@ class UpdateManagedProject12 { //initiate the job in all cases // if (treeLock) { WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$ + @Override public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { ManagedBuildManager.saveBuildInfoLegacy(project, false); return Status.OK_STATUS; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java index 9105d9b850f..9365efc4e48 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java @@ -117,6 +117,7 @@ class UpdateManagedProject20 { //since the java synchronized mechanism is now used for the build info loadding, //initiate the job in all cases WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$ + @Override public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { ManagedBuildManager.saveBuildInfoLegacy(project, false); return Status.OK_STATUS; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java index 6c366ef3ed4..f6601f7b8bc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java @@ -85,6 +85,7 @@ class UpdateManagedProject21 { //initiate the job in all cases // if (treeLock) { WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$ + @Override public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { checkForCPPWithC(monitor, project); ManagedBuildManager.saveBuildInfoLegacy(project, true); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProjectManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProjectManager.java index 37e55595dc9..b0171fd7225 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProjectManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProjectManager.java @@ -390,6 +390,7 @@ public class UpdateManagedProjectManager { IWorkspace workspace = project.getWorkspace(); ISchedulingRule rule = workspace.getRuleFactory().refreshRule(project); WorkspaceJob job = new WorkspaceJob("Refresh Project") { //$NON-NLS-1$ + @Override public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { project.refreshLocal(IResource.DEPTH_ONE, null); return Status.OK_STATUS; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/CreateProjectProgressMonitor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/CreateProjectProgressMonitor.java index 6f96d196b08..2e3bff71d80 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/CreateProjectProgressMonitor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/CreateProjectProgressMonitor.java @@ -37,6 +37,7 @@ public class CreateProjectProgressMonitor extends NullProgressMonitor { * * @see IProgressMonitor#setTaskName(String) */ + @Override public void setTaskName(String name) { super.setTaskName(name); } @@ -47,6 +48,7 @@ public class CreateProjectProgressMonitor extends NullProgressMonitor { * @see IProgressMonitor#isCanceled() * @see IProgressMonitor#setCanceled(boolean) */ + @Override public void setCanceled(boolean cancelled) { super.setCanceled(cancelled); } @@ -58,6 +60,7 @@ public class CreateProjectProgressMonitor extends NullProgressMonitor { * @see IProgressMonitor#isCanceled() * @see IProgressMonitor#setCanceled(boolean) */ + @Override public boolean isCanceled() { return super.isCanceled(); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java index b27d7227ff6..5e0de487707 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java @@ -45,6 +45,7 @@ public class AppendToMBSStringListOptionValues extends ProcessRunner { /** * This method Appends contents to Managed Build System StringList Option Values. */ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringOptionValue.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringOptionValue.java index af59c79d8c4..2974643c3fc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringOptionValue.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringOptionValue.java @@ -43,6 +43,7 @@ public class AppendToMBSStringOptionValue extends ProcessRunner { /** * This method Appends contents to Managed Build System StringList Option Values. */ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/CreateIncludeFolder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/CreateIncludeFolder.java index 3d2c396059d..4908b24f3a9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/CreateIncludeFolder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/CreateIncludeFolder.java @@ -40,6 +40,7 @@ public class CreateIncludeFolder extends CreateSourceFolder { * This method Creates a include Folder to the project. * */ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); String targetPath = args[1].getSimpleValue(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/ExcludeResources.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/ExcludeResources.java index 7af1baec980..007ed027092 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/ExcludeResources.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/ExcludeResources.java @@ -55,6 +55,7 @@ import org.eclipse.core.runtime.IProgressMonitor; */ public class ExcludeResources extends ProcessRunner { + @Override public void process(TemplateCore template, final ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); String configIdPattern = args[1].getSimpleValue(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/GenerateMakefileWithBuildDescription.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/GenerateMakefileWithBuildDescription.java index 6e6dd021d01..9410d221d03 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/GenerateMakefileWithBuildDescription.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/GenerateMakefileWithBuildDescription.java @@ -38,6 +38,7 @@ public class GenerateMakefileWithBuildDescription extends ProcessRunner{ /** * */ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java index 25eaf1e005b..dec51abebbe 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java @@ -49,6 +49,7 @@ public class NewManagedProject extends ProcessRunner { pca = new ProjectCreatedActions(); } + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); String location = args[1].getSimpleValue(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSBooleanOptionValue.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSBooleanOptionValue.java index ac5f8917d0e..391615a8bb4 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSBooleanOptionValue.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSBooleanOptionValue.java @@ -40,6 +40,7 @@ import org.eclipse.core.runtime.IProgressMonitor; */ public class SetMBSBooleanOptionValue extends ProcessRunner { + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringListOptionValues.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringListOptionValues.java index 2047dc5c828..1e3eb023390 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringListOptionValues.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringListOptionValues.java @@ -40,6 +40,7 @@ import org.eclipse.core.runtime.IProgressMonitor; */ public class SetMBSStringListOptionValues extends ProcessRunner { + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringOptionValue.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringOptionValue.java index 2d7d8d1e50f..624caeb7a53 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringOptionValue.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringOptionValue.java @@ -40,6 +40,7 @@ import org.eclipse.core.runtime.IProgressMonitor; */ public class SetMBSStringOptionValue extends ProcessRunner { + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java index f00f12785aa..234e8a21d4f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java @@ -103,6 +103,7 @@ public class MakeScannerProvider extends ScannerProvider { * * @see org.eclipse.cdt.core.parser.IScannerInfoProvider#getScannerInformation(org.eclipse.core.resources.IResource) */ + @Override public IScannerInfo getScannerInformation(IResource resource) { try { getMakeScannerInfo(resource.getProject(), true); diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java index 626e5ae72f4..6dde9a9aab3 100644 --- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java +++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java @@ -51,6 +51,7 @@ import org.eclipse.core.runtime.Platform; public class SimpleMakefileGenerator extends ProcessRunner { private static final String MAKEFILE = "Makefile"; //$NON-NLS-1$ + @Override public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCProjectPlatformPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCProjectPlatformPage.java index aaf746a5eae..e6b3cfc2947 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCProjectPlatformPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCProjectPlatformPage.java @@ -38,6 +38,7 @@ public class TestCProjectPlatformPage extends TestCase implements IWizardItemsLi private TestPage page; private boolean currentState=false; + @Override protected void setUp() throws Exception { MBSCustomPageManager.init(); MBSCustomPageManager.loadExtensions(); @@ -46,6 +47,7 @@ public class TestCProjectPlatformPage extends TestCase implements IWizardItemsLi wizard.addPages(); } + @Override protected void tearDown() throws Exception { page.dispose(); page = null; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java index 55eeb2b92a3..7780d2b92b1 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java @@ -50,6 +50,7 @@ public class TestCustomPageManager extends TestCase public static boolean testFlag = false; + @Override public void setUp() throws Exception { MBSCustomPageManager.init(); diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java index b7db5905b13..759861f26c1 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java @@ -36,6 +36,7 @@ public class TestsPlugin extends AbstractUIPlugin { /** * This method is called upon plug-in activation */ + @Override public void start(BundleContext context) throws Exception { super.start(context); } @@ -43,6 +44,7 @@ public class TestsPlugin extends AbstractUIPlugin { /** * This method is called when the plug-in is stopped */ + @Override public void stop(BundleContext context) throws Exception { super.stop(context); plugin = null; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestToolchain.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestToolchain.java index 27e37de2f52..db56e9804b6 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestToolchain.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestToolchain.java @@ -33,16 +33,19 @@ public class TestToolchain extends HoldsOptions implements IToolChain { // TODO Auto-generated constructor stub } + @Override public String getManagedBuildRevision() { // TODO Auto-generated method stub return null; } + @Override public Version getVersion() { // TODO Auto-generated method stub return null; } + @Override public void setVersion(Version version) { // TODO Auto-generated method stub @@ -226,16 +229,19 @@ public class TestToolchain extends HoldsOptions implements IToolChain { } + @Override public boolean isDirty() { // TODO Auto-generated method stub return false; } + @Override public void setDirty(boolean isDirty) { // TODO Auto-generated method stub } + @Override public boolean isExtensionElement() { // TODO Auto-generated method stub return false; @@ -251,11 +257,13 @@ public class TestToolchain extends HoldsOptions implements IToolChain { return null; } + @Override public String getId() { return id; } + @Override public String getName() { // TODO Auto-generated method stub return null; @@ -276,6 +284,7 @@ public class TestToolchain extends HoldsOptions implements IToolChain { return null; } + @Override protected IResourceInfo getParentResourceInfo() { // TODO Auto-generated method stub return null; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/AlwaysPresentWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/AlwaysPresentWizardPage.java index ad449f8b1cd..e4f6b5f5089 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/AlwaysPresentWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/AlwaysPresentWizardPage.java @@ -32,6 +32,7 @@ public class AlwaysPresentWizardPage extends MBSCustomPage pageID = "org.eclipse.cdt.managedbuilder.ui.tests.wizardPages.AlwaysPresentWizardPage"; } + @Override public boolean canFlipToNextPage() { @@ -125,6 +126,7 @@ public class AlwaysPresentWizardPage extends MBSCustomPage } + @Override protected boolean isCustomPageComplete() { return true; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureAWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureAWizardPage.java index 627adac4fed..9c11c17ce6f 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureAWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureAWizardPage.java @@ -117,6 +117,7 @@ public class NatureAWizardPage extends MBSCustomPage } + @Override protected boolean isCustomPageComplete() { return true; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureBWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureBWizardPage.java index 614d0317b99..9282032babb 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureBWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureBWizardPage.java @@ -117,6 +117,7 @@ public class NatureBWizardPage extends MBSCustomPage } + @Override protected boolean isCustomPageComplete() { return true; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeDWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeDWizardPage.java index f1c69b5499e..2e5c0e26d82 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeDWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeDWizardPage.java @@ -117,6 +117,7 @@ public class ProjectTypeDWizardPage extends MBSCustomPage } + @Override protected boolean isCustomPageComplete() { return true; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeEWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeEWizardPage.java index 3aa7be64888..be06b5a1a46 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeEWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeEWizardPage.java @@ -117,6 +117,7 @@ public class ProjectTypeEWizardPage extends MBSCustomPage } + @Override protected boolean isCustomPageComplete() { return true; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainCWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainCWizardPage.java index efb45aac551..e71c36220c6 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainCWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainCWizardPage.java @@ -117,6 +117,7 @@ public class ToolchainCWizardPage extends MBSCustomPage } + @Override protected boolean isCustomPageComplete() { return true; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainCv20WizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainCv20WizardPage.java index ec9968b0026..8d4fc0aa3e2 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainCv20WizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainCv20WizardPage.java @@ -117,6 +117,7 @@ public class ToolchainCv20WizardPage extends MBSCustomPage } + @Override protected boolean isCustomPageComplete() { return true; diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainFWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainFWizardPage.java index 00ffc5455e6..3b7382c5c0b 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainFWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ToolchainFWizardPage.java @@ -117,6 +117,7 @@ public class ToolchainFWizardPage extends MBSCustomPage } + @Override protected boolean isCustomPageComplete() { return true; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildFilesAction.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildFilesAction.java index cd71d610c2c..02ab009f961 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildFilesAction.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildFilesAction.java @@ -200,6 +200,7 @@ public class BuildFilesAction extends ActionDelegate implements /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { Iterator iterator = files.iterator(); @@ -364,6 +365,7 @@ public class BuildFilesAction extends ActionDelegate implements * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, * org.eclipse.jface.viewers.ISelection) */ + @Override public void selectionChanged(IAction action, ISelection selection) { // update state update(); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java index 617f58dc64d..a0b1612ec3a 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PreferredToolchainsTab.java @@ -56,6 +56,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { private Label preferredTCsLabel; + @Override public void createControls(Composite parent) { super.createControls(parent); usercomp.setLayout(new GridLayout(1, false)); @@ -76,6 +77,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { tree = new Tree(c, SWT.SINGLE | SWT.BORDER); tree.setLayoutData(new GridData(GridData.FILL_BOTH)); tree.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { TreeItem[] tis = tree.getSelection(); if (tis == null || tis.length == 0) return; @@ -98,6 +100,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { pref1.setText(Messages.PreferredToolchainsTab_1); pref1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); pref1.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setPref(true); }} ); new Label(c,0).setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -105,6 +108,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { pref0.setText(Messages.PreferredToolchainsTab_2); pref0.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); pref0.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setPref(false); }} ); //bug 189220 - provide more information for accessibility @@ -123,6 +127,7 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { gd.horizontalSpan = 2; show_sup.setLayoutData(gd); show_sup.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (h_selected != null) h_selected.setSupportedOnly(show_sup.getSelection()); @@ -195,16 +200,21 @@ public class PreferredToolchainsTab extends AbstractCBuildPropertyTab { + @Override protected void performOK() { CDTPrefUtil.savePreferredTCs(); } + @Override protected void performApply(ICResourceDescription src, ICResourceDescription dst) { performOK();} + @Override protected void performDefaults() { CDTPrefUtil.cleanPreferredTCs(); h_selected.handleSelection(); } + @Override protected void updateData(ICResourceDescription cfg) {} + @Override protected void updateButtons() {} // Do nothing. No buttons to update. } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java index 450d255fd85..c73c5c53617 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewBuildConfigurationDialog.java @@ -107,6 +107,7 @@ public class NewBuildConfigurationDialog extends Dialog { * We don't have to worry that the index or name is wrong because we * enable the OK button IFF those conditions are met. */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == IDialogConstants.OK_ID) { String description = new String(); @@ -159,6 +160,7 @@ public class NewBuildConfigurationDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (title != null) @@ -168,6 +170,7 @@ public class NewBuildConfigurationDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); configName.setFocus(); @@ -177,6 +180,7 @@ public class NewBuildConfigurationDialog extends Dialog { validateState(); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, SWT.NULL); @@ -249,6 +253,7 @@ public class NewBuildConfigurationDialog extends Dialog { group.setLayoutData(gd); SelectionListener radioListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { clone = btnClone.getSelection(); updateComboState(); @@ -270,6 +275,7 @@ public class NewBuildConfigurationDialog extends Dialog { gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; copyConfigSelector.setLayoutData(gd); copyConfigSelector.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { validateState(); } @@ -294,6 +300,7 @@ public class NewBuildConfigurationDialog extends Dialog { gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH; cloneConfigSelector.setLayoutData(gd); cloneConfigSelector.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { validateState(); } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java index a3e8c105773..0c021ff4948 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewCfgDialog.java @@ -104,6 +104,7 @@ public class NewCfgDialog implements INewCfgDialog { * We don't have to worry that the index or name is wrong because we * enable the OK button IFF those conditions are met. */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == IDialogConstants.OK_ID) { newName = configName.getText().trim(); @@ -129,6 +130,7 @@ public class NewCfgDialog implements INewCfgDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (title != null) @@ -138,6 +140,7 @@ public class NewCfgDialog implements INewCfgDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); configName.setFocus(); @@ -147,6 +150,7 @@ public class NewCfgDialog implements INewCfgDialog { setButtons(); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, SWT.NULL); @@ -231,6 +235,7 @@ public class NewCfgDialog implements INewCfgDialog { b_clone.setLayoutData(gd); b_clone.setSelection(true); b_clone.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setButtons(); } @@ -244,6 +249,7 @@ public class NewCfgDialog implements INewCfgDialog { gd = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL); cloneConfigSelector.setLayoutData(gd); cloneConfigSelector.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setButtons(); } @@ -254,6 +260,7 @@ public class NewCfgDialog implements INewCfgDialog { gd = new GridData(GridData.BEGINNING); b_real.setLayoutData(gd); b_real.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setButtons(); } @@ -269,6 +276,7 @@ public class NewCfgDialog implements INewCfgDialog { realConfigSelector.setLayoutData(gd); realConfigSelector.setEnabled(false); realConfigSelector.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setButtons(); } @@ -283,6 +291,7 @@ public class NewCfgDialog implements INewCfgDialog { gd = new GridData(GridData.BEGINNING); b_import.setLayoutData(gd); b_import.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setButtons(); } @@ -296,6 +305,7 @@ public class NewCfgDialog implements INewCfgDialog { importSelector.setLayoutData(gd); importSelector.setEnabled(false); importSelector.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setButtons(); } @@ -307,6 +317,7 @@ public class NewCfgDialog implements INewCfgDialog { gd = new GridData(GridData.BEGINNING); b_importDef.setLayoutData(gd); b_importDef.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setButtons(); } @@ -320,6 +331,7 @@ public class NewCfgDialog implements INewCfgDialog { importDefSelector.setLayoutData(gd); importDefSelector.setEnabled(false); importDefSelector.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setButtons(); } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_ExpPathAndSymb.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_ExpPathAndSymb.java index f8c4a738530..880b75c7b29 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_ExpPathAndSymb.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/Page_ExpPathAndSymb.java @@ -22,6 +22,7 @@ import org.eclipse.cdt.ui.newui.AbstractPage; */ public class Page_ExpPathAndSymb extends AbstractPage { + @Override protected boolean isSingle() {return false; } } diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java index 5b20e6b0c2d..97ffb450b7e 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/AbstractCWizard.java @@ -32,6 +32,7 @@ public abstract class AbstractCWizard extends CNewWizard { protected Composite parent; protected IWizardItemsListListener listener; + @Override public void setDependentControl(Composite _parent, IWizardItemsListListener _listener) { parent = _parent; listener = _listener; diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/pdavm/src/org/eclipse/cdt/examples/pdavm/PDAVirtualMachine.java b/dsf/org.eclipse.cdt.examples.dsf.pda/pdavm/src/org/eclipse/cdt/examples/pdavm/PDAVirtualMachine.java index 949b439f6d7..cd39d29e879 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/pdavm/src/org/eclipse/cdt/examples/pdavm/PDAVirtualMachine.java +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/pdavm/src/org/eclipse/cdt/examples/pdavm/PDAVirtualMachine.java @@ -37,10 +37,12 @@ import java.util.regex.Pattern; public class PDAVirtualMachine { static class Stack extends LinkedList { + @Override public Object pop() { return isEmpty() ? 0 : remove(size() - 1); } + @Override public void push(Object value) { add(value); } diff --git a/dsf/org.eclipse.cdt.examples.dsf/src_ant/org/eclipse/cdt/examples/ant/tasks/PreProcessor.java b/dsf/org.eclipse.cdt.examples.dsf/src_ant/org/eclipse/cdt/examples/ant/tasks/PreProcessor.java index 07956b469a8..08369d19c16 100644 --- a/dsf/org.eclipse.cdt.examples.dsf/src_ant/org/eclipse/cdt/examples/ant/tasks/PreProcessor.java +++ b/dsf/org.eclipse.cdt.examples.dsf/src_ant/org/eclipse/cdt/examples/ant/tasks/PreProcessor.java @@ -104,6 +104,7 @@ public class PreProcessor extends Task { } } + @Override public void execute() throws BuildException { if (fSymbols.size() == 0) { throw new BuildException("No symbols specified for preprocessor");