From a14a63c06081e95010c4c7b56ee169279c6465e9 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Wed, 9 Apr 2008 11:24:27 +0000 Subject: [PATCH] Increased warning levels for ui-plugin, fixed warnings. --- .../.settings/org.eclipse.jdt.core.prefs | 24 +-- .../ui/browser/opentype/OpenTypeDialog.java | 1 + .../AddIncludesOperation.java | 6 +- .../corext/codemanipulation/StubUtility.java | 3 +- .../internal/corext/template/c/CContext.java | 3 + .../corext/template/c/CContextType.java | 2 + .../corext/template/c/CFormatter.java | 2 +- .../template/c/CodeTemplateContextType.java | 3 + .../corext/template/c/CommentContext.java | 3 + .../corext/template/c/CommentContextType.java | 2 + .../template/c/FileTemplateContext.java | 4 +- .../template/c/FileTemplateContextType.java | 6 +- .../template/c/TranslationUnitContext.java | 2 + .../c/TranslationUnitContextType.java | 8 +- .../corext/util/CodeFormatterUtil.java | 6 +- .../ui/BaseCElementContentProvider.java | 33 ++-- .../cdt/internal/ui/BinaryPropertySource.java | 13 +- .../internal/ui/CElementAdapterFactory.java | 5 +- .../internal/ui/CProjectAdapterFactory.java | 5 +- .../cdt/internal/ui/DocumentInputStream.java | 3 +- .../internal/ui/LineBackgroundPainter.java | 75 ++++----- .../internal/ui/ResourceAdapterFactory.java | 7 +- .../actions/AbstractToggleLinkingAction.java | 1 + .../ui/actions/AbstractUpdateIndexAction.java | 8 +- .../ui/actions/AddBlockCommentAction.java | 10 +- .../ui/actions/BlockCommentAction.java | 9 +- .../ui/actions/CompositeActionGroup.java | 5 + .../ui/actions/CreateParserLogAction.java | 2 +- .../internal/ui/actions/FindWordAction.java | 1 + .../ui/actions/FoldingActionGroup.java | 3 + .../ui/actions/FreshenIndexAction.java | 1 + .../actions/GoToNextPreviousMemberAction.java | 4 +- .../ui/actions/GotoNextBookmarkAction.java | 8 +- .../cdt/internal/ui/actions/IndentAction.java | 14 +- .../internal/ui/actions/OpenActionUtil.java | 25 ++- .../ui/actions/RebuildIndexAction.java | 2 +- .../ui/actions/RemoveBlockCommentAction.java | 4 +- .../internal/ui/actions/SelectAllAction.java | 1 + .../ui/actions/SelectionConverter.java | 4 +- .../UpdateIndexWithModifiedFilesAction.java | 1 + .../ui/actions/WorkbenchRunnableAdapter.java | 2 + .../ui/buildconsole/BuildConsoleManager.java | 6 +- .../ui/buildconsole/BuildConsolePage.java | 42 ++--- .../buildconsole/BuildConsolePartition.java | 2 + .../buildconsole/BuildConsolePartitioner.java | 37 +++-- .../ui/buildconsole/BuildConsoleViewer.java | 1 + .../ui/buildconsole/ScrollLockAction.java | 1 + .../ui/callhierarchy/CHContentProvider.java | 4 +- .../callhierarchy/CHDropTargetListener.java | 2 +- .../ui/callhierarchy/CHHistoryAction.java | 1 + .../CHHistoryDropDownAction.java | 2 + .../ui/callhierarchy/CHHistoryListAction.java | 2 +- .../ui/callhierarchy/CHMultiDefChildNode.java | 4 + .../ui/callhierarchy/CHMultiDefNode.java | 4 + .../internal/ui/callhierarchy/CHViewPart.java | 2 +- .../ui/callhierarchy/CallHierarchyUI.java | 12 +- .../OpenCallHierarchyAction.java | 5 + .../ui/compare/AbstractMergeViewer.java | 5 + .../internal/ui/compare/AsmMergeViewer.java | 3 + .../cdt/internal/ui/compare/CMergeViewer.java | 3 + .../ui/compare/CStructureCreator.java | 3 + .../ui/compare/CStructureCreatorVisitor.java | 11 +- .../cdt/internal/ui/cview/BuildGroup.java | 2 +- .../eclipse/cdt/internal/ui/cview/CView.java | 13 +- .../internal/ui/cview/CViewActionGroup.java | 3 + .../ui/cview/CViewContentProvider.java | 22 ++- .../internal/ui/cview/CViewFrameSource.java | 6 +- .../internal/ui/cview/CViewLabelProvider.java | 2 + .../internal/ui/cview/CViewMoveAction.java | 4 +- .../internal/ui/cview/CollapseAllAction.java | 1 + .../cdt/internal/ui/cview/CopyAction.java | 15 +- .../cdt/internal/ui/cview/DefaultAction.java | 1 + .../internal/ui/cview/GotoActionGroup.java | 4 + .../ui/cview/IncludeRefContainer.java | 16 +- .../ui/cview/IncludeReferenceProxy.java | 5 + .../ui/cview/LibraryRefContainer.java | 20 ++- .../cdt/internal/ui/cview/OpenFileGroup.java | 9 +- .../internal/ui/cview/OpenProjectGroup.java | 2 +- .../cdt/internal/ui/cview/PasteAction.java | 17 +- .../cview/SelectionTransferDragAdapter.java | 11 +- .../cview/SelectionTransferDropAdapter.java | 40 +++-- .../ui/cview/ToggleLinkingAction.java | 1 + .../AbstractElementListSelectionDialog.java | 18 +- .../dialogs/ElementListSelectionDialog.java | 16 +- .../ui/dialogs/OptionalMessageDialog.java | 2 + .../internal/ui/dialogs/SelectionList.java | 15 +- .../ui/dialogs/SelectionStatusDialog.java | 14 +- .../cdt/internal/ui/dialogs/StatusDialog.java | 4 + .../cdt/internal/ui/dialogs/StatusInfo.java | 1 + .../TypedElementSelectionValidator.java | 12 +- .../ui/dialogs/TypedViewerFilter.java | 7 +- .../cpaths/AbstractPathOptionBlock.java | 3 + .../ui/dialogs/cpaths/ArchiveFileFilter.java | 1 + .../internal/ui/dialogs/cpaths/CPElement.java | 3 + .../ui/dialogs/cpaths/CPElementFilter.java | 1 + .../ui/dialogs/cpaths/CPElementGroup.java | 2 + .../cpaths/CPElementLabelProvider.java | 3 + .../ui/dialogs/cpaths/CPElementSorter.java | 2 + .../dialogs/cpaths/CPListImageDescriptor.java | 4 + .../cpaths/CPathContainerDescriptor.java | 1 + .../cpaths/CPathContainerEntryPage.java | 7 + .../cpaths/CPathContainerSelectionPage.java | 5 + .../dialogs/cpaths/CPathContainerWizard.java | 4 + .../ui/dialogs/cpaths/CPathFilterPage.java | 1 + .../dialogs/cpaths/CPathFilterPathPage.java | 1 + .../cpaths/CPathIncludeSymbolEntryPage.java | 12 ++ .../CPathIncludeSymbolEntryPerFilePage.java | 39 +++-- .../dialogs/cpaths/CPathLibraryEntryPage.java | 7 + .../dialogs/cpaths/CPathOrderExportPage.java | 7 + .../dialogs/cpaths/CPathOutputEntryPage.java | 7 + .../cpaths/CPathProjectsEntryPage.java | 7 + .../ui/dialogs/cpaths/CPathPropertyPage.java | 4 + .../dialogs/cpaths/CPathSourceEntryPage.java | 7 + .../ui/dialogs/cpaths/CPathTabBlock.java | 6 + .../cpaths/ExclusionPatternDialog.java | 4 + .../cpaths/ExclusionPatternEntryDialog.java | 2 + .../dialogs/cpaths/FolderSelectionDialog.java | 2 + .../cpaths/IncludesSymbolsPropertyPage.java | 5 + .../cpaths/MultipleFolderSelectionDialog.java | 5 + .../cpaths/NewIncludesSymbolsTabBlock.java | 7 + .../dialogs/cpaths/NewSourceFolderDialog.java | 2 + .../dialogs/cpaths/ProjectContainerPage.java | 1 + .../dialogs/cpaths/SourceAttachmentBlock.java | 1 + .../cpaths/SourceAttachmentDialog.java | 3 + .../BasicSelectionTransferDragAdapter.java | 3 + .../internal/ui/dnd/CDTViewerDragAdapter.java | 1 + .../ui/dnd/DelegatingDragAdapter.java | 8 +- .../ui/dnd/FileTransferDragAdapter.java | 21 ++- .../ui/dnd/FileTransferDropAdapter.java | 2 + .../ui/dnd/ResourceTransferDragAdapter.java | 4 +- .../ui/dnd/ResourceTransferDropAdapter.java | 11 +- .../ui/dnd/TextEditorDropAdapter.java | 17 +- .../ui/dnd/TextViewerDragAdapter.java | 14 +- .../cdt/internal/ui/editor/ASTProvider.java | 1 + .../editor/AddIncludeOnSelectionAction.java | 24 ++- .../ui/editor/CContentOutlinerProvider.java | 4 + .../internal/ui/editor/CDocumentProvider.java | 14 ++ .../cdt/internal/ui/editor/CSourceViewer.java | 19 ++- .../CSourceViewerDecorationSupport.java | 5 + .../ui/editor/CStorageDocumentProvider.java | 1 + .../ui/editor/DefaultBinaryFileEditor.java | 4 + .../editor/ExternalSearchAnnotationModel.java | 2 + .../ExternalSearchDocumentProvider.java | 1 + .../ui/editor/GotoAnnotationAction.java | 3 + .../ui/editor/GotoMatchingBracketAction.java | 1 + .../ui/editor/InactiveCodeHighlighting.java | 1 + .../cdt/internal/ui/editor/IndentUtil.java | 2 - .../ui/editor/LexicalSortingAction.java | 2 + .../internal/ui/editor/OpenIncludeAction.java | 2 + .../editor/SemanticHighlightingManager.java | 6 + .../ui/editor/SemanticHighlightings.java | 156 ++++++++++++++++++ .../editor/SpecificContentAssistAction.java | 1 + .../ui/editor/ToggleCommentAction.java | 3 + .../editor/ToggleMarkOccurrencesAction.java | 3 + .../ui/editor/TogglePresentationAction.java | 3 + .../editor/ToggleSourceAndHeaderAction.java | 3 + .../TranslationUnitAnnotationModelEvent.java | 4 + .../asm/ASMEditorActionContributor.java | 3 + .../ui/editor/asm/AsmContentOutlinePage.java | 2 + .../asm/AsmSourceViewerConfiguration.java | 6 + .../internal/ui/editor/asm/AsmTextEditor.java | 9 + .../internal/ui/filters/ArchiveFilter.java | 1 + .../ui/filters/ClosedProjectFilter.java | 1 + .../ui/filters/CustomFiltersDialog.java | 9 + .../internal/ui/filters/ExecutableFilter.java | 1 + .../internal/ui/filters/FilterDescriptor.java | 2 + .../ui/filters/MacroDirectiveFilter.java | 1 + .../ui/filters/NamePatternFilter.java | 1 + .../ui/filters/NonCElementFilter.java | 1 + .../ui/filters/NonCProjectsFilter.java | 1 + .../cdt/internal/ui/filters/ObjectFilter.java | 1 + .../cdt/internal/ui/filters/SharedFilter.java | 1 + .../ui/filters/UsingDirectiveFilter.java | 1 + .../internal/ui/help/CFunctionSummary.java | 2 + .../cdt/internal/ui/help/CHelpBook.java | 1 + .../cdt/internal/ui/help/CHelpEntry.java | 1 + .../cdt/internal/ui/help/CHelpTopic.java | 1 + .../internal/ui/includebrowser/IBFile.java | 2 + .../ui/includebrowser/IBHistoryAction.java | 1 + .../IBHistoryDropDownAction.java | 2 + .../ui/includebrowser/IBSetInputJob.java | 1 + .../ui/includebrowser/IBWorkingSetFilter.java | 3 +- .../OpenIncludeBrowserAction.java | 4 + .../ui/indexview/CountNodeAction.java | 2 + .../indexview/DiscardExternalDefsAction.java | 2 + .../ui/indexview/FindDeclarationsAction.java | 2 + .../ui/indexview/FindReferencesAction.java | 2 + .../ui/indexview/IndexLabelProvider.java | 2 + .../cdt/internal/ui/indexview/IndexNode.java | 2 + .../ui/indexview/IndexViewSearchQuery.java | 2 + .../ui/indexview/OpenDefinitionAction.java | 2 + .../ui/indexview/ToggleLinkingAction.java | 1 + .../ui/language/ContentTypeMappingDialog.java | 2 + .../FileLanguageMappingPropertyPage.java | 5 + .../ui/language/LanguageMappingWidget.java | 1 + .../ProjectContentTypeMappingDialog.java | 2 + .../ProjectLanguageMappingPropertyPage.java | 4 + .../ProjectLanguageMappingWidget.java | 3 + .../WorkspaceContentTypeMappingDialog.java | 2 + ...orkspaceLanguageMappingPreferencePage.java | 3 + .../WorkspaceLanguageMappingWidget.java | 3 + .../AbstractCNavigatorActionGroup.java | 3 + .../navigator/CNavigatorBuildActionGroup.java | 4 + .../CNavigatorBuildActionProvider.java | 5 + .../navigator/CNavigatorContentProvider.java | 11 ++ .../CNavigatorDragAdapterAssistant.java | 2 + .../CNavigatorDropAdapterAssistant.java | 3 + .../navigator/CNavigatorEditActionGroup.java | 4 + .../CNavigatorEditActionProvider.java | 6 + .../CNavigatorOpenActionProvider.java | 5 + .../CNavigatorOpenEditorActionGroup.java | 8 +- .../CNavigatorOpenViewActionProvider.java | 6 + .../CNavigatorProblemsLabelDecorator.java | 1 + .../CNavigatorRefactorActionGroup.java | 3 + .../CNavigatorSearchActionProvider.java | 6 + .../ui/navigator/OpenCElementAction.java | 2 + .../AbstractConfigurationBlock.java | 1 + ...tractConfigurationBlockPreferencePage.java | 5 + .../preferences/AbstractPreferencePage.java | 3 + .../preferences/AppearancePreferencePage.java | 4 + .../BuildConsolePreferencePage.java | 1 + .../CEditorColoringConfigurationBlock.java | 6 + .../CEditorColoringPreferencePage.java | 5 + .../CEditorHoverPreferencePage.java | 5 + .../ui/preferences/CEditorPreferencePage.java | 8 + .../ui/preferences/CFileTypeAssociation.java | 2 + .../ui/preferences/CFileTypeDialog.java | 4 + .../CFileTypesPreferenceBlock.java | 1 + .../preferences/CFileTypesPreferencePage.java | 3 + .../preferences/CFileTypesPropertyPage.java | 6 + .../ui/preferences/CParserPreferencePage.java | 4 + .../ui/preferences/CPluginPreferencePage.java | 6 +- .../preferences/CTemplatePreferencePage.java | 8 + .../CodeAssistAdvancedConfigurationBlock.java | 14 +- .../CodeAssistAdvancedPreferencePage.java | 9 + .../preferences/CodeAssistPreferencePage.java | 4 + .../CodeFormatterPreferencePage.java | 11 ++ .../ui/preferences/CodeTemplateBlock.java | 8 + .../CodeTemplatePreferencePage.java | 11 ++ ...CodeTemplateSourceViewerConfiguration.java | 3 + .../ui/preferences/EditTemplateDialog.java | 7 + .../FoldingConfigurationBlock.java | 2 + .../ui/preferences/FoldingPreferencePage.java | 5 + .../ui/preferences/IndexerPreferencePage.java | 3 + .../ui/preferences/IndexerStrategyBlock.java | 8 +- .../MarkOccurrencesConfigurationBlock.java | 1 + .../MarkOccurrencesPreferencePage.java | 5 + .../OptionsConfigurationBlock.java | 2 + .../preferences/PathEntryVariableDialog.java | 5 + .../PathEntryVariablePreferencePage.java | 3 + .../preferences/PathEntryVariablesGroup.java | 4 + .../ui/preferences/PreferencesAccess.java | 4 + .../ui/preferences/PreviewSourceViewer.java | 3 + .../preferences/ProjectSelectionDialog.java | 3 + .../PropertyAndPreferencePage.java | 6 +- .../ui/preferences/ScrolledPageContent.java | 1 + .../SmartTypingConfigurationBlock.java | 1 + .../SmartTypingPreferencePage.java | 5 + .../SpellingConfigurationBlock.java | 10 ++ .../TodoTaskConfigurationBlock.java | 6 + .../ui/preferences/TodoTaskInputDialog.java | 2 + .../preferences/TodoTaskPreferencePage.java | 11 ++ .../WorkInProgressPreferencePage.java | 5 + .../formatter/AlreadyExistsDialog.java | 3 + .../preferences/formatter/BracesTabPage.java | 6 +- .../CodeFormatterConfigurationBlock.java | 10 +- .../formatter/ControlStatementsTabPage.java | 8 +- .../formatter/CreateProfileDialog.java | 3 + .../formatter/CustomCodeFormatterBlock.java | 1 + .../formatter/FormatterModifyDialog.java | 1 + .../formatter/FormatterProfileManager.java | 4 +- .../formatter/FormatterProfileStore.java | 1 + .../formatter/FormatterTabPage.java | 3 + .../formatter/IndentationTabPage.java | 8 +- .../formatter/LineWrappingTabPage.java | 11 +- .../preferences/formatter/ModifyDialog.java | 14 +- .../formatter/ModifyDialogTabPage.java | 11 ++ .../preferences/formatter/ProfileManager.java | 22 ++- .../preferences/formatter/ProfileStore.java | 2 + .../preferences/formatter/SnippetPreview.java | 3 +- .../formatter/TranslationUnitPreview.java | 3 +- .../formatter/WhiteSpaceOptions.java | 21 ++- .../formatter/WhiteSpaceTabPage.java | 11 +- .../ui/refactoring/rename/ASTManager.java | 2 +- .../rename/ASTSpecificNameVisitor.java | 3 +- .../ui/search/CountLabelProvider.java | 3 + .../ui/search/IOccurrencesFinder.java | 1 + .../ui/search/PDOMSearchElementQuery.java | 2 + .../internal/ui/search/PDOMSearchPage.java | 4 + .../actions/DeclarationsSearchGroup.java | 2 + .../actions/FindDeclarationsAction.java | 3 + .../FindDeclarationsInWorkingSetAction.java | 1 + .../FindDeclarationsProjectAction.java | 3 + .../actions/FindInWorkingSetAction.java | 3 + .../ui/search/actions/FindRefsAction.java | 3 + .../actions/FindRefsInWorkingSetAction.java | 1 + .../search/actions/FindRefsProjectAction.java | 3 + .../search/actions/ReferencesSearchGroup.java | 2 + .../search/actions/SelectionSearchGroup.java | 2 + .../search/actions/WorkingSetFindAction.java | 4 + .../internal/ui/text/AbstractCScanner.java | 1 + ...stractCompareViewerInformationControl.java | 7 + .../ui/text/AbstractInformationControl.java | 8 + ...bstractSourceViewerInformationControl.java | 10 ++ .../internal/ui/text/CAutoIndentStrategy.java | 3 +- .../cdt/internal/ui/text/CBraceRule.java | 3 +- .../cdt/internal/ui/text/CBreakIterator.java | 21 +++ .../cdt/internal/ui/text/CCodeReader.java | 2 + .../text/CCompositeReconcilingStrategy.java | 3 + .../internal/ui/text/CFormattingStrategy.java | 3 + .../internal/ui/text/CHeuristicScanner.java | 8 + .../cdt/internal/ui/text/COperatorRule.java | 3 +- .../ui/text/COutlineInformationControl.java | 10 +- .../cdt/internal/ui/text/CPairMatcher.java | 1 + .../cdt/internal/ui/text/CReconciler.java | 9 + .../ui/text/CSourceViewerConfiguration.java | 22 ++- .../ui/text/CStringAutoIndentStrategy.java | 1 + .../ui/text/CStringDoubleClickSelector.java | 1 + .../cdt/internal/ui/text/CWordIterator.java | 11 ++ .../ui/text/DocumentCharacterIterator.java | 1 + .../internal/ui/text/FastCPartitioner.java | 1 + .../cdt/internal/ui/text/HTML2TextReader.java | 2 + .../internal/ui/text/HTMLAnnotationHover.java | 2 + .../internal/ui/text/PreprocessorRule.java | 2 + .../ui/text/SequenceCharacterIterator.java | 1 + .../SimpleCSourceViewerConfiguration.java | 11 ++ .../internal/ui/text/SingleCharReader.java | 5 +- .../internal/ui/text/SingleTokenCScanner.java | 3 + .../ui/text/SubstitutionTextReader.java | 6 +- .../text/c/hover/AbstractAnnotationHover.java | 2 + .../ui/text/c/hover/BestMatchHover.java | 4 + .../internal/ui/text/c/hover/CDocHover.java | 2 + .../c/hover/CEditorTextHoverDescriptor.java | 2 + .../text/c/hover/CEditorTextHoverProxy.java | 6 + .../ui/text/c/hover/CInformationProvider.java | 1 + .../ui/text/c/hover/CMacroCompareViewer.java | 5 + .../text/c/hover/CMacroExpansionControl.java | 3 + .../CMacroExpansionExplorationControl.java | 16 +- .../ui/text/c/hover/CMacroExpansionHover.java | 4 + .../ui/text/c/hover/CSourceHover.java | 2 + .../contentassist/CCompletionProposal.java | 2 + .../CContentAssistInvocationContext.java | 1 + .../CContentAssistProcessor.java | 5 + .../CProposalContextInformation.java | 1 + .../CompletionProposalComputerRegistry.java | 6 +- .../contentassist/ContentAssistHandler.java | 1 + .../contentassist/ContentAssistProcessor.java | 5 +- .../HelpCompletionProposalComputer.java | 1 + .../KeywordCompletionProposalComputer.java | 1 + .../text/correction/CCorrectionAssistant.java | 4 + .../text/correction/CCorrectionProcessor.java | 4 + .../CSelectAnnotationRulerAction.java | 9 +- .../text/correction/CSelectRulerAction.java | 3 +- .../correction/CorrectionCommandHandler.java | 1 + .../ui/text/correction/ProblemLocation.java | 1 + .../DocCommentMultilineProposalComputer.java | 1 + .../DocCommentSinglelineProposalComputer.java | 1 + .../doctools/DocCommentSpellDictionary.java | 2 + .../ui/text/doctools/EditorReopener.java | 1 + .../DefaultCFoldingStructureProvider.java | 5 + .../ui/text/spelling/CSpellingEngine.java | 1 + .../ui/text/spelling/CSpellingProblem.java | 4 + .../spelling/CSpellingReconcileStrategy.java | 5 + .../ui/text/spelling/CSpellingService.java | 1 + .../ui/text/spelling/ChangeCaseProposal.java | 1 + .../ui/text/spelling/TaskTagDictionary.java | 4 + .../ui/text/spelling/TextSpellingEngine.java | 1 + .../WordCompletionProposalComputer.java | 1 + .../LocaleSensitiveSpellDictionary.java | 1 + .../engine/PersistentSpellDictionary.java | 3 + .../spelling/engine/RankedWordProposal.java | 2 + .../ui/text/template/TemplateEngine.java | 1 + .../template/TemplateVariableProcessor.java | 1 + .../OpenTypeHierarchyAction.java | 5 + .../typehierarchy/THDropTargetListener.java | 2 +- .../internal/ui/typehierarchy/THGraph.java | 12 +- .../ui/typehierarchy/THHistoryAction.java | 1 + .../THHistoryDropDownAction.java | 2 + .../ui/typehierarchy/THHistoryListAction.java | 2 +- .../typehierarchy/THInformationControl.java | 17 +- .../internal/ui/typehierarchy/THViewPart.java | 5 +- .../ui/typehierarchy/TypeHierarchyUI.java | 8 +- .../ui/util/BusyIndicatorRunnableContext.java | 1 + .../ui/util/DeleteIProblemMarkerAction.java | 2 + .../internal/ui/util/DeleteTaskAction.java | 2 + .../internal/ui/util/ExternalEditorInput.java | 1 + .../ui/util/OpenExternalProblemAction.java | 2 + .../internal/ui/util/ProblemTableViewer.java | 4 + .../internal/ui/util/ProblemTreeViewer.java | 5 + .../ui/util/RemoteTreeContentManager.java | 10 +- .../internal/ui/util/RemoteTreeViewer.java | 17 +- .../eclipse/cdt/internal/ui/util/SWTUtil.java | 1 + .../cdt/internal/ui/util/StringMatcher.java | 1 + .../ui/util/TableLayoutComposite.java | 1 + .../AppearanceAwareLabelProvider.java | 3 + .../viewsupport/AsyncTreeContentProvider.java | 3 +- .../AsyncTreeWorkInProgressNode.java | 3 +- .../ui/viewsupport/CUILabelProvider.java | 6 + .../viewsupport/DecoratingCLabelProvider.java | 2 + .../ui/viewsupport/ExtendedTreeViewer.java | 3 +- .../ui/viewsupport/ImageImageDescriptor.java | 3 + .../internal/ui/viewsupport/MemberFilter.java | 2 + .../ui/viewsupport/MemberFilterAction.java | 1 + .../ui/viewsupport/ProjectTemplateStore.java | 2 + .../SelectionListenerWithASTManager.java | 1 + .../StandardCElementLabelProvider.java | 3 + .../ui/viewsupport/StorageLabelProvider.java | 3 + .../ui/wizards/AbstractOpenWizardAction.java | 1 + .../wizards/AbstractWizardDropDownAction.java | 1 + .../ui/wizards/NewClassCreationWizard.java | 12 +- .../internal/ui/wizards/NewElementWizard.java | 1 + .../ui/wizards/NewElementWizardPage.java | 1 + .../ui/wizards/NewFileDropDownAction.java | 1 + .../ui/wizards/NewFolderDropDownAction.java | 1 + .../ui/wizards/NewProjectDropDownAction.java | 1 + .../ui/wizards/NewTypeDropDownAction.java | 1 + .../ui/wizards/OpenNewWizardAction.java | 1 + .../BaseClassesListDialogField.java | 9 +- .../classwizard/ConstructorMethodStub.java | 12 +- .../classwizard/DestructorMethodStub.java | 9 +- .../MethodStubsListDialogField.java | 9 +- .../NewBaseClassSelectionDialog.java | 4 + .../SourceFileSelectionDialog.java | 25 ++- .../dialogfields/CheckedListDialogField.java | 6 + .../dialogfields/ComboDialogField.java | 4 + .../ui/wizards/dialogfields/LayoutUtil.java | 1 + .../wizards/dialogfields/LinkToFileGroup.java | 7 + .../wizards/dialogfields/ListDialogField.java | 5 + .../SelectionButtonDialogField.java | 3 + .../SelectionButtonDialogFieldGroup.java | 3 + .../ui/wizards/dialogfields/Separator.java | 2 + .../dialogfields/StringButtonDialogField.java | 3 + .../dialogfields/StringDialogField.java | 4 + .../dialogfields/TreeListDialogField.java | 6 + .../AbstractFileCreationWizard.java | 9 +- .../AbstractFileCreationWizardPage.java | 2 + .../filewizard/NewFileFromTemplateWizard.java | 12 +- .../NewHeaderFileCreationWizardPage.java | 7 + .../NewSourceFileCreationWizardPage.java | 7 + ...WizardNewFileFromTemplateCreationPage.java | 5 + .../NewSourceFolderWizardPage.java | 1 + .../StringVariableLabelProvider.java | 1 + .../StringVariableSelectionDialog.java | 9 +- .../TeamProjectIndexExportWizard.java | 4 +- ...CElementWorkingSetPageContentProvider.java | 1 + .../CElementWorkingSetUpdater.java | 2 + .../cdt/ui/CElementContentProvider.java | 24 ++- .../org/eclipse/cdt/ui/CElementGrouping.java | 2 + .../cdt/ui/CElementImageDescriptor.java | 7 + .../eclipse/cdt/ui/CElementLabelProvider.java | 3 + .../org/eclipse/cdt/ui/CElementSorter.java | 2 + .../src/org/eclipse/cdt/ui/CUIPlugin.java | 1 + .../cdt/ui/CUIPreferenceInitializer.java | 1 + .../org/eclipse/cdt/ui/IncludesGrouping.java | 3 + .../eclipse/cdt/ui/NamespacesGrouping.java | 4 + .../eclipse/cdt/ui/PreferenceConstants.java | 1 + .../actions/BuildActiveConfigMenuAction.java | 2 + .../cdt/ui/actions/BuildConfigAction.java | 1 + .../ChangeBuildConfigContextAction.java | 1 + .../actions/ChangeBuildConfigMenuAction.java | 1 + .../cdt/ui/actions/ChangeConfigAction.java | 1 + .../ui/actions/CustomFiltersActionGroup.java | 6 + .../ui/actions/DeleteResConfigsAction.java | 1 + .../cdt/ui/actions/GenerateActionGroup.java | 3 + .../ui/actions/MemberFilterActionGroup.java | 3 + .../eclipse/cdt/ui/actions/OpenAction.java | 4 + .../ui/actions/SelectionDispatchAction.java | 1 + .../cdt/ui/actions/ShowInCViewAction.java | 3 + .../ui/dialogs/AbstractBinaryParserPage.java | 4 + .../ui/dialogs/AbstractErrorParserBlock.java | 8 + .../dialogs/AbstractGNUBinaryParserPage.java | 5 + .../cdt/ui/dialogs/BinaryParserBlock.java | 10 ++ .../CHelpConfigurationPropertyPage.java | 4 + .../ui/dialogs/CygwinPEBinaryParserPage.java | 7 + .../cdt/ui/dialogs/DocCommentOwnerBlock.java | 5 + .../cdt/ui/dialogs/DocCommentOwnerCombo.java | 1 + .../ui/dialogs/DocCommentOwnerComposite.java | 1 + .../ui/dialogs/GNUElfBinaryParserPage.java | 1 + .../ui/dialogs/GNUSomBinaryParserPage.java | 1 + .../ui/dialogs/GNUXCoffBinaryParserPage.java | 1 + .../eclipse/cdt/ui/dialogs/IndexerBlock.java | 15 +- .../ui/dialogs/IndexerOptionPropertyPage.java | 3 + .../cdt/ui/dialogs/MachOBinaryParserPage.java | 4 + .../cdt/ui/dialogs/NullIndexerBlock.java | 3 + .../cdt/ui/dialogs/PreferenceScopeBlock.java | 2 + .../cdt/ui/dialogs/ReferenceBlock.java | 5 + .../cdt/ui/dialogs/TabFolderOptionBlock.java | 1 + .../cdt/ui/newui/AbstractCPropertyTab.java | 6 +- .../cdt/ui/newui/AbstractExportTab.java | 17 +- .../cdt/ui/newui/AbstractLangsListTab.java | 26 ++- .../eclipse/cdt/ui/newui/AbstractPage.java | 21 ++- .../cdt/ui/newui/AbstractPrefPage.java | 6 + .../cdt/ui/newui/AbstractPropertyDialog.java | 3 +- .../cdt/ui/newui/AbstractSinglePage.java | 12 +- .../eclipse/cdt/ui/newui/BinaryParsTab.java | 14 +- .../cdt/ui/newui/BuildVarListDialog.java | 6 +- .../cdt/ui/newui/CDTUIListComparator.java | 1 + .../cdt/ui/newui/CLocationOutputTab.java | 5 + .../cdt/ui/newui/CLocationSourceTab.java | 5 + .../eclipse/cdt/ui/newui/CLocationTab.java | 17 +- .../ui/newui/ConfigMultiSelectionDialog.java | 3 + .../org/eclipse/cdt/ui/newui/EnvDialog.java | 4 + .../eclipse/cdt/ui/newui/EnvironmentTab.java | 21 ++- .../eclipse/cdt/ui/newui/ErrorParsTab.java | 9 + .../eclipse/cdt/ui/newui/ExPatternDialog.java | 4 + .../cdt/ui/newui/ExPatternEntryDialog.java | 2 + .../org/eclipse/cdt/ui/newui/ExpDialog.java | 5 + .../eclipse/cdt/ui/newui/ExpIncludeTab.java | 4 + .../cdt/ui/newui/ExpLibraryPathTab.java | 4 + .../eclipse/cdt/ui/newui/ExpLibraryTab.java | 4 + .../eclipse/cdt/ui/newui/ExpSymbolTab.java | 4 + .../eclipse/cdt/ui/newui/IncludeDialog.java | 3 + .../org/eclipse/cdt/ui/newui/IncludeTab.java | 6 +- .../eclipse/cdt/ui/newui/LibraryPathTab.java | 6 + .../org/eclipse/cdt/ui/newui/LibraryTab.java | 6 + .../cdt/ui/newui/ManageConfigDialog.java | 6 + .../ui/newui/MultiLineTextFieldEditor.java | 15 ++ .../cdt/ui/newui/NewConfigurationDialog.java | 5 + .../org/eclipse/cdt/ui/newui/PageLayout.java | 2 + .../cdt/ui/newui/Page_head_general.java | 3 + .../cdt/ui/newui/PrefPage_Abstract.java | 2 + .../cdt/ui/newui/ProjectContentsArea.java | 2 + .../src/org/eclipse/cdt/ui/newui/RefsTab.java | 14 +- .../ui/newui/RenameConfigurationDialog.java | 4 + .../cdt/ui/newui/StructureTreeTab.java | 12 ++ .../eclipse/cdt/ui/newui/SymbolDialog.java | 2 + .../org/eclipse/cdt/ui/newui/SymbolTab.java | 17 +- .../cdt/ui/newui/TypedCDTViewerFilter.java | 1 + .../ContentAssistInvocationContext.java | 2 + .../contentassist/ICompletionContributor.java | 1 + ...faultMultilineCommentAutoEditStrategy.java | 2 + .../DoxygenMultilineAutoEditStrategy.java | 1 + .../generic/GenericTagCommentScanner.java | 1 + .../GenericTagDoubleClickStrategy.java | 1 + .../cdt/ui/wizards/CCProjectWizard.java | 2 + .../ui/wizards/CDTCommonProjectWizard.java | 9 +- .../cdt/ui/wizards/CDTMainWizardPage.java | 14 +- .../cdt/ui/wizards/CDTProjectWizard.java | 2 + .../cdt/ui/wizards/CProjectWizard.java | 2 + .../cdt/ui/wizards/CWizardHandler.java | 1 + .../cdt/ui/wizards/ICPathContainerPage.java | 1 + .../cdt/ui/wizards/NewCCProjectWizard.java | 1 + .../cdt/ui/wizards/NewCProjectWizard.java | 4 + .../wizards/NewCProjectWizardOptionPage.java | 1 + .../cdt/ui/wizards/NewCProjectWizardPage.java | 1 + .../wizards/NewClassCreationWizardPage.java | 3 +- .../wizards/NewHeaderFileCreationWizard.java | 3 +- .../wizards/NewSourceFileCreationWizard.java | 3 +- .../NewSourceFolderCreationWizard.java | 3 + .../wizards/conversion/ConversionWizard.java | 18 +- .../conversion/ConvertProjectWizardPage.java | 10 +- .../wizard/TemplateCNewWizard.java | 2 + .../AbstractWizardDataPage.java | 1 + .../templateengine/ProjectSelectionPage.java | 2 + .../SimpleElementException.java | 1 + .../cdt/ui/templateengine/Template.java | 2 + .../templateengine/TemplateClassWizard.java | 7 + .../templateengine/TemplateDrivenWizard.java | 7 + .../TemplateListSelectionPage.java | 2 + .../templateengine/TemplatesChoiceWizard.java | 2 + .../cdt/ui/templateengine/WizardNode.java | 5 + .../ui/templateengine/event/PatternEvent.java | 1 + .../pages/NewProjectCreationPage.java | 2 + .../pages/TemplateInputDialog.java | 4 + .../pages/TemplatePreferencePage.java | 3 + .../cdt/ui/templateengine/pages/UIPage.java | 1 + .../ui/templateengine/pages/UIWizardPage.java | 3 + .../uitree/GenericUIElementGroup.java | 11 ++ .../templateengine/uitree/InputUIElement.java | 3 + .../uitree/SimpleUIElementGroup.java | 5 + .../templateengine/uitree/UIAttributes.java | 2 + .../uitree/UIGroupTypeEnum.java | 3 + .../uitree/uiwidgets/UIBooleanWidget.java | 6 + .../uitree/uiwidgets/UIBrowseWidget.java | 3 + .../uitree/uiwidgets/UISelectWidget.java | 6 + .../uitree/uiwidgets/UISpecialListWidget.java | 2 + .../uitree/uiwidgets/UIStringListWidget.java | 5 + .../uitree/uiwidgets/UITextWidget.java | 5 + .../utils/ui/controls/FileListControl.java | 6 + .../utils/ui/controls/RadioButtonsArea.java | 2 + .../utils/ui/controls/TabFolderLayout.java | 2 + 581 files changed, 2607 insertions(+), 528 deletions(-) diff --git a/core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs index c5d5e882e5a..8824e1831d7 100644 --- a/core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs +++ b/core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ -#Thu Jan 31 11:29:21 MSK 2008 +#Wed Apr 09 11:35:31 CEST 2008 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.5 @@ -17,7 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod= org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=warning org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning @@ -25,7 +25,7 @@ org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled @@ -34,25 +34,26 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullReference=error org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -61,10 +62,11 @@ org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled org.eclipse.jdt.core.compiler.problem.unusedImport=warning diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeDialog.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeDialog.java index 4bfa0c06825..8a5915f2559 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeDialog.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeDialog.java @@ -21,6 +21,7 @@ import org.eclipse.swt.widgets.Shell; * * @deprecated Use {@link ElementSelectionDialog} instead. */ +@Deprecated public class OpenTypeDialog extends ElementSelectionDialog { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java index 3049ce6e0fb..b8b2c10c854 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java @@ -75,7 +75,7 @@ public class AddIncludesOperation implements IWorkspaceRunnable { monitor.beginTask(CEditorMessages.getString("AddIncludesOperation.description"), 2); //$NON-NLS-1$ - List elements = fTranslationUnit.getChildrenOfType(ICElement.C_INCLUDE); + List elements = fTranslationUnit.getChildrenOfType(ICElement.C_INCLUDE); for (int i = 0; i < fIncludes.length; ++i) { String name = fIncludes[i].getIncludeName(); boolean found = false; @@ -129,7 +129,7 @@ public class AddIncludesOperation implements IWorkspaceRunnable { monitor.beginTask(CEditorMessages.getString("AddIncludesOperation.description"), 2); //$NON-NLS-1$ - List elements = fTranslationUnit.getChildrenOfType(ICElement.C_USING); + List elements = fTranslationUnit.getChildrenOfType(ICElement.C_USING); for (int i = 0; i < fUsings.length; ++i) { String name = fUsings[i]; boolean found = false; @@ -154,7 +154,7 @@ public class AddIncludesOperation implements IWorkspaceRunnable { } int pos; - List includes = fTranslationUnit.getChildrenOfType(ICElement.C_INCLUDE); + List includes = fTranslationUnit.getChildrenOfType(ICElement.C_INCLUDE); if (includes.size() > 0) { IInclude lastInclude = (IInclude)includes.get(includes.size() - 1); ISourceRange range = lastInclude.getSourceRange(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java index 2ccc8375f35..10a7edd6bc1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java @@ -468,9 +468,8 @@ public class StubUtility { int idx= markers.indexOf(','); if (idx == -1) { return markers; - } else { - return markers.substring(0, idx); } + return markers.substring(0, idx); } return CCorePreferenceConstants.DEFAULT_TASK_TAG; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java index 9166cba0246..47d0834143f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java @@ -64,6 +64,7 @@ public class CContext extends TranslationUnitContext { /* * @see DocumentTemplateContext#getStart() */ + @Override public int getStart() { if (fIsManaged && getCompletionLength() > 0) return super.getStart(); @@ -90,6 +91,7 @@ public class CContext extends TranslationUnitContext { } } + @Override public int getEnd() { if (fIsManaged || getCompletionLength() == 0) return super.getEnd(); @@ -113,6 +115,7 @@ public class CContext extends TranslationUnitContext { /* * @see TemplateContext#evaluate(Template) */ + @Override public TemplateBuffer evaluate(Template template) throws BadLocationException, TemplateException { if (!canEvaluate(template)) return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java index 09513011c5d..c9673f37e44 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java @@ -31,6 +31,7 @@ public class CContextType extends TranslationUnitContextType { /* * @see org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType#createContext(org.eclipse.jface.text.IDocument, int, int, org.eclipse.cdt.core.model.ITranslationUnit) */ + @Override public TranslationUnitContext createContext(IDocument document, int offset, int length, ITranslationUnit translationUnit) { return new CContext(this, document, offset, length, translationUnit); @@ -39,6 +40,7 @@ public class CContextType extends TranslationUnitContextType { /* * @see org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType#createContext(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position, org.eclipse.cdt.core.model.ITranslationUnit) */ + @Override public TranslationUnitContext createContext(IDocument document, Position position, ITranslationUnit translationUnit) { return new CContext(this, document, position, translationUnit); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java index f7fc9caf3ac..6b36e1c4057 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java @@ -167,7 +167,7 @@ public class CFormatter { } private void format(IDocument doc) throws BadLocationException { - Map options; + Map options; if (fProject != null) options= fProject.getOptions(true); else diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java index a971ee624eb..505f4773e2a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java @@ -97,6 +97,7 @@ public class CodeTemplateContextType extends FileTemplateContextType { super("todo", TemplateMessages.CodeTemplateContextType_variable_description_todo); //$NON-NLS-1$ } + @Override protected String resolve(TemplateContext context) { String todoTaskTag= StubUtility.getTodoTaskTag(((CodeTemplateContext) context).getCProject()); if (todoTaskTag == null) @@ -184,6 +185,7 @@ public class CodeTemplateContextType extends FileTemplateContextType { /* * @see org.eclipse.cdt.internal.corext.template.c.FileTemplateContextType#addResourceVariables() */ + @Override protected void addResourceVariables() { // don't add resource variables by default } @@ -213,6 +215,7 @@ public class CodeTemplateContextType extends FileTemplateContextType { registry.addContextType(new CodeTemplateContextType(CodeTemplateContextType.DESTRUCTORCOMMENT_CONTEXTTYPE)); } + @Override public void validate(String pattern) throws TemplateException { super.validate(pattern); if (fIsComment) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java index bb38305aa9d..7fc4beb29a9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java @@ -61,6 +61,7 @@ public class CommentContext extends TranslationUnitContext { /* * @see DocumentTemplateContext#getStart() */ + @Override public int getStart() { if (fIsManaged && getCompletionLength() > 0) return super.getStart(); @@ -104,6 +105,7 @@ public class CommentContext extends TranslationUnitContext { /* * @see org.eclipse.jdt.internal.corext.template.DocumentTemplateContext#getEnd() */ + @Override public int getEnd() { if (fIsManaged || getCompletionLength() == 0) return super.getEnd(); @@ -127,6 +129,7 @@ public class CommentContext extends TranslationUnitContext { /* * @see TemplateContext#evaluate(Template) */ + @Override public TemplateBuffer evaluate(Template template) throws BadLocationException, TemplateException { TemplateTranslator translator= new TemplateTranslator(); TemplateBuffer buffer= translator.translate(template); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java index 2bdde5bca40..fccb8310dc6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java @@ -35,6 +35,7 @@ public class CommentContextType extends TranslationUnitContextType { /* * @see org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType#createContext(org.eclipse.jface.text.IDocument, int, int, org.eclipse.cdt.core.model.ITranslationUnit) */ + @Override public TranslationUnitContext createContext(IDocument document, int offset, int length, ITranslationUnit translationUnit) { return new CommentContext(this, document, offset, length, translationUnit); @@ -43,6 +44,7 @@ public class CommentContextType extends TranslationUnitContextType { /* * @see org.eclipse.cdt.internal.corext.template.c.TranslationUnitContextType#createContext(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position, org.eclipse.cdt.core.model.ITranslationUnit) */ + @Override public TranslationUnitContext createContext(IDocument document, Position position, ITranslationUnit translationUnit) { return new CommentContext(this, document, position, translationUnit); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java index 7817902b4d7..f3bae923bac 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java @@ -46,9 +46,10 @@ public class FileTemplateContext extends TemplateContext { /* * @see org.eclipse.jface.text.templates.TemplateContext#evaluate(org.eclipse.jface.text.templates.Template) */ + @Override public TemplateBuffer evaluate(Template template) throws BadLocationException, TemplateException { // test that all variables are defined - Iterator iterator= getContextType().resolvers(); + Iterator iterator= getContextType().resolvers(); while (iterator.hasNext()) { TemplateVariableResolver var= (TemplateVariableResolver) iterator.next(); if (var.getClass() == FileTemplateContextType.FileTemplateVariableResolver.class) { @@ -95,6 +96,7 @@ public class FileTemplateContext extends TemplateContext { /* * @see org.eclipse.jface.text.templates.TemplateContext#canEvaluate(org.eclipse.jface.text.templates.Template) */ + @Override public boolean canEvaluate(Template template) { return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java index 2c51c7b21f7..2a6384a073c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java @@ -84,7 +84,7 @@ public class FileTemplateContextType extends TemplateContextType { public void resolve(TemplateVariable variable, TemplateContext context) { fFormat= null; TemplateVariableType type= variable.getVariableType(); - List params= type.getParams(); + List params= type.getParams(); if (params.size() == 1) { fFormat= params.get(0).toString(); } @@ -179,7 +179,7 @@ public class FileTemplateContextType extends TemplateContextType { @Override protected void validateVariables(TemplateVariable[] variables) throws TemplateException { - ArrayList required= new ArrayList(5); + ArrayList required= new ArrayList(5); for (int i= 0; i < variables.length; i++) { String type= variables[i].getType(); if (getResolver(type) == null) { @@ -188,7 +188,7 @@ public class FileTemplateContextType extends TemplateContextType { required.remove(type); } if (!required.isEmpty()) { - String missing= (String) required.get(0); + String missing= required.get(0); throw new TemplateException(Messages.format(TemplateMessages.FileTemplateContextType_validate_missingvariable, missing)); } super.validateVariables(variables); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java index eea31001e00..c47e54a0db6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java @@ -75,6 +75,7 @@ public abstract class TranslationUnitContext extends DocumentTemplateContext { /* * @see org.eclipse.jface.text.templates.DocumentTemplateContext#canEvaluate(org.eclipse.jface.text.templates.Template) */ + @Override public boolean canEvaluate(Template template) { if (fForceEvaluation) return true; @@ -89,6 +90,7 @@ public abstract class TranslationUnitContext extends DocumentTemplateContext { /* * @see org.eclipse.cdt.internal.corext.template.DocumentTemplateContext#getKey() */ + @Override public String getKey() { if (getCompletionLength() == 0) return super.getKey(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java index 1b202d1c0af..a7aa4b0e87a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java @@ -37,7 +37,8 @@ public abstract class TranslationUnitContextType extends TemplateContextType { public ReturnType() { super("return_type", TemplateMessages.CContextType_variable_description_return_type); //$NON-NLS-1$ } - public String resolve(TemplateContext context) { + @Override + public String resolve(TemplateContext context) { ICElement element= ((TranslationUnitContext) context).findEnclosingElement(ICElement.C_METHOD); if (element == null) { element= ((TranslationUnitContext) context).findEnclosingElement(ICElement.C_FUNCTION); @@ -57,6 +58,7 @@ public abstract class TranslationUnitContextType extends TemplateContextType { public File() { super("file", TemplateMessages.CContextType_variable_description_file); //$NON-NLS-1$ } + @Override public String resolve(TemplateContext context) { ITranslationUnit unit= ((TranslationUnitContext) context).getTranslationUnit(); @@ -71,6 +73,7 @@ public abstract class TranslationUnitContextType extends TemplateContextType { super(name, description); fElementType= elementType; } + @Override public String resolve(TemplateContext context) { ICElement element= ((TranslationUnitContext) context).findEnclosingElement(fElementType); return (element == null) ? null : element.getElementName(); @@ -87,6 +90,7 @@ public abstract class TranslationUnitContextType extends TemplateContextType { public Project() { super("enclosing_project", TemplateMessages.CContextType_variable_description_enclosing_project); //$NON-NLS-1$ } + @Override public String resolve(TemplateContext context) { ITranslationUnit unit= ((TranslationUnitContext) context).getTranslationUnit(); return (unit == null) ? null : unit.getCProject().getElementName(); @@ -97,6 +101,7 @@ public abstract class TranslationUnitContextType extends TemplateContextType { public Arguments() { super("enclosing_method_arguments", TemplateMessages.CContextType_variable_description_enclosing_method_arguments); //$NON-NLS-1$ } + @Override public String resolve(TemplateContext context) { ICElement element= ((TranslationUnitContext) context).findEnclosingElement(ICElement.C_FUNCTION); if (element == null) { @@ -130,6 +135,7 @@ public abstract class TranslationUnitContextType extends TemplateContextType { public Todo() { super("todo", TemplateMessages.CContextType_variable_description_todo); //$NON-NLS-1$ } + @Override protected String resolve(TemplateContext context) { TranslationUnitContext cContext= (TranslationUnitContext) context; ITranslationUnit tUnit= cContext.getTranslationUnit(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java index 409a1345ffa..f97184d5317 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java @@ -33,7 +33,7 @@ public class CodeFormatterUtil { * @return the indent string */ public static String createIndentString(int indentationUnits, ICProject project) { - Map options= project != null ? project.getOptions(true) : CCorePlugin.getOptions(); + Map options= project != null ? project.getOptions(true) : CCorePlugin.getOptions(); return ToolFactory.createDefaultCodeFormatter(options).createIndentationString(indentationUnits); } @@ -117,7 +117,7 @@ public class CodeFormatterUtil { * @throws IllegalArgumentException If the offset and length are not inside the string, a * IllegalArgumentException is thrown. */ - public static TextEdit format(int kind, String source, int offset, int length, int indentationLevel, String lineSeparator, Map options) { + public static TextEdit format(int kind, String source, int offset, int length, int indentationLevel, String lineSeparator, Map options) { if (offset < 0 || length < 0 || offset + length > source.length()) { throw new IllegalArgumentException("offset or length outside of string. offset: " + offset + ", length: " + length + ", string size: " + source.length()); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ } @@ -128,7 +128,7 @@ public class CodeFormatterUtil { return null; } - public static TextEdit format(int kind, String source, int indentationLevel, String lineSeparator, Map options) { + public static TextEdit format(int kind, String source, int indentationLevel, String lineSeparator, Map options) { String prefix= ""; //$NON-NLS-1$ String suffix= ""; //$NON-NLS-1$ switch (kind) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java index 971060eae64..014986ba6b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java @@ -16,6 +16,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.ui.model.IWorkbenchAdapter; + import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.IArchive; @@ -38,14 +47,6 @@ import org.eclipse.cdt.ui.CElementGrouping; import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.IncludesGrouping; import org.eclipse.cdt.ui.NamespacesGrouping; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.ui.model.IWorkbenchAdapter; /** * A base content provider for C elements. It provides access to the @@ -328,7 +329,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { if (!cproject.getProject().isOpen()) return NO_CHILDREN; - List list= new ArrayList(); + List list= new ArrayList(); ICElement[] children = cproject.getChildren(); for (int i= 0; i < children.length; i++) { ICElement child = children[i]; @@ -355,7 +356,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { Object[] children = unit.getChildren(); if (fIncludesGrouping) { boolean hasInclude = false; - ArrayList list = new ArrayList(children.length); + ArrayList list = new ArrayList(children.length); for (int i = 0; i < children.length; i++) { if (!(children[i] instanceof IInclude)) { list.add(children[i]); @@ -370,12 +371,12 @@ public class BaseCElementContentProvider implements ITreeContentProvider { } if (fNamespacesGrouping) { // check if there is another namespace with the same name for the same parent - List list = new ArrayList(children.length); - Map map = new HashMap(); + List list = new ArrayList(children.length); + Map map = new HashMap(); for (int i = 0; i < children.length; ++i) { if (children[i] instanceof INamespace) { INamespace n1 = (INamespace)children[i]; - NamespacesGrouping namespacesGrouping = (NamespacesGrouping)map.get(n1.getElementName()); + NamespacesGrouping namespacesGrouping = map.get(n1.getElementName()); if (namespacesGrouping == null) { for (int j = i + 1; j < children.length; ++j) { if (children[j] instanceof INamespace) { @@ -457,7 +458,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { } catch (CModelException e) { roots = new ISourceRoot[0]; } - List nonCResources = new ArrayList(objects.length); + List nonCResources = new ArrayList(objects.length); for (int i= 0; i < objects.length; i++) { Object o= objects[i]; // A folder can also be a source root in the following case @@ -533,7 +534,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { protected IBinary[] getBinaries(IBinaryContainer container) throws CModelException { ICElement[] celements = container.getChildren(); - ArrayList list = new ArrayList(celements.length); + ArrayList list = new ArrayList(celements.length); for (int i = 0; i < celements.length; i++) { if (celements[i] instanceof IBinary) { IBinary bin = (IBinary)celements[i]; @@ -552,7 +553,7 @@ public class BaseCElementContentProvider implements ITreeContentProvider { protected IArchive[] getArchives(IArchiveContainer container) throws CModelException { ICElement[] celements = container.getChildren(); - ArrayList list = new ArrayList(celements.length); + ArrayList list = new ArrayList(celements.length); for (int i = 0; i < celements.length; i++) { if (celements[i] instanceof IArchive) { IArchive ar = (IArchive)celements[i]; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java index a8c1de40bb6..a255ccf7491 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java @@ -11,8 +11,6 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui; -import org.eclipse.cdt.core.model.IBinary; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.IBasicPropertyConstants; import org.eclipse.ui.views.properties.FilePropertySource; @@ -20,7 +18,10 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.PropertyDescriptor; -public class BinaryPropertySource extends FilePropertySource implements IPropertySource { +import org.eclipse.cdt.core.model.IBinary; +import org.eclipse.cdt.ui.CUIPlugin; + +public class BinaryPropertySource extends FilePropertySource { private final static String ELF_CPU= "CElementProperties.elf_cpu"; //$NON-NLS-1$ private final static String ELF_TEXT= "CElementProperties.elf_text"; //$NON-NLS-1$ @@ -101,6 +102,7 @@ public class BinaryPropertySource extends FilePropertySource implements IPropert /** * @see IPropertySource#getPropertyDescriptors */ + @Override public IPropertyDescriptor[] getPropertyDescriptors() { if (fgPropertyDescriptors == null) { initializeBinaryDescriptors(); @@ -111,6 +113,7 @@ public class BinaryPropertySource extends FilePropertySource implements IPropert /** * @see IPropertySource#getPropertyValue */ + @Override public Object getPropertyValue(Object name) { if (element != null) { Object returnValue = super.getPropertyValue(name); @@ -176,6 +179,7 @@ public class BinaryPropertySource extends FilePropertySource implements IPropert /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#getEditableValue() */ + @Override public Object getEditableValue() { return this; } @@ -183,6 +187,7 @@ public class BinaryPropertySource extends FilePropertySource implements IPropert /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#isPropertySet(java.lang.Object) */ + @Override public boolean isPropertySet(Object id) { return false; } @@ -190,12 +195,14 @@ public class BinaryPropertySource extends FilePropertySource implements IPropert /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object) */ + @Override public void resetPropertyValue(Object id) { } /* (non-Javadoc) * @see org.eclipse.ui.views.properties.IPropertySource#setPropertyValue(java.lang.Object, java.lang.Object) */ + @Override public void setPropertyValue(Object id, Object value) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java index dab63204b00..2e1af3c2a6e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java @@ -31,7 +31,7 @@ import org.eclipse.cdt.core.model.ICElement; */ public class CElementAdapterFactory implements IAdapterFactory { - private static Class[] PROPERTIES= new Class[] { + private static Class[] PROPERTIES= new Class[] { IPropertySource.class, IResource.class, IWorkbenchAdapter.class, @@ -45,13 +45,14 @@ public class CElementAdapterFactory implements IAdapterFactory { /** * @see CElementAdapterFactory#getAdapterList */ - public Class[] getAdapterList() { + public Class[] getAdapterList() { return PROPERTIES; } /** * @see CElementAdapterFactory#getAdapter */ + @SuppressWarnings("unchecked") public Object getAdapter(Object element, Class key) { ICElement celem = (ICElement) element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java index 80e5af9478f..5a6bab9b9b5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java @@ -23,11 +23,12 @@ import org.eclipse.cdt.core.model.ICProject; */ public class CProjectAdapterFactory implements IAdapterFactory { - private static final Class[] ADAPTERS = { IProject.class }; + private static final Class[] ADAPTERS = { IProject.class }; /* * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) */ + @SuppressWarnings("unchecked") public Object getAdapter(Object adaptableObject, Class adapterType) { if (IProject.class.equals(adapterType)) { return ((ICProject)adaptableObject).getProject(); @@ -38,7 +39,7 @@ public class CProjectAdapterFactory implements IAdapterFactory { /* * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ - public Class[] getAdapterList() { + public Class[] getAdapterList() { return ADAPTERS; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DocumentInputStream.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DocumentInputStream.java index 359b39e7ba3..e2f1948ed8b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DocumentInputStream.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DocumentInputStream.java @@ -36,7 +36,8 @@ public class DocumentInputStream extends InputStream { /** * {@inheritDoc} */ - public int read() throws IOException { + @Override + public int read() throws IOException { try { if (fCurrPos < fDocument.getLength()) { return fDocument.getChar(fCurrPos++); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java index 10a11e0fe77..3eab2be55ff 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java @@ -59,11 +59,11 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { /** The viewer's widget */ private StyledText fTextWidget; /** Text positions (cursor line position is always at index 0 */ - private List fPositions= new ArrayList(); + private List fPositions= new ArrayList(); /** Cached text positions */ - private List fLastPositions= new ArrayList(); + private List fLastPositions= new ArrayList(); /** Temporary changed positions */ - private List fChangedPositions= new ArrayList(); + private List fChangedPositions= new ArrayList(); /** Cursor line position */ private Position fCursorLine= new TypedPosition(0, 0, CURSOR_LINE_TYPE); /** Saved cursor line position */ @@ -73,7 +73,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { /** Whether cursor line highlighting is active */ private boolean fCursorLineActive; /** Map of position type to color */ - private Map fColorMap= new HashMap(); + private Map fColorMap= new HashMap(); /** * Creates a new painter for the given text viewer. @@ -134,7 +134,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { * * @param positions a list of Positions */ - public void setHighlightPositions(List positions) { + public void setHighlightPositions(List positions) { boolean isActive= fIsActive; deactivate(isActive); fPositions.clear(); @@ -151,7 +151,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { * * @param positions a list of Positions */ - public void addHighlightPositions(List positions) { + public void addHighlightPositions(List positions) { boolean isActive= fIsActive; deactivate(isActive); fPositions.addAll(positions); @@ -165,7 +165,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { * * @param positions a list of Positions */ - public void removeHighlightPositions(List positions) { + public void removeHighlightPositions(List positions) { boolean isActive= fIsActive; deactivate(isActive); fPositions.removeAll(positions); @@ -180,7 +180,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { * @param removePositions a list of Positions to remove * @param addPositions a list of Positions to add */ - public void replaceHighlightPositions(List removePositions, List addPositions) { + public void replaceHighlightPositions(List removePositions, List addPositions) { boolean isActive= fIsActive; deactivate(isActive); fPositions.removeAll(removePositions); @@ -203,13 +203,13 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { * Manage all positions. * @param positions */ - private void managePositions(List positions) { + private void managePositions(List positions) { if (fPositionManager == null) { return; } int sz= fPositions.size(); for (int i= 0; i < sz; ++i) { - Position position= (Position)positions.get(i); + Position position= positions.get(i); fPositionManager.managePosition(position); } } @@ -218,13 +218,13 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { * Unmanage all positions. * @param positions */ - private void unmanagePositions(List positions) { + private void unmanagePositions(List positions) { if (fPositionManager == null) { return; } int sz= fPositions.size(); for (int i= 0; i < sz; ++i) { - Position position= (Position)positions.get(i); + Position position= positions.get(i); fPositionManager.unmanagePosition(position); } } @@ -286,7 +286,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { updateCursorLine(); } } - List changedPositions= getChangedPositions(); + List changedPositions= getChangedPositions(); if (changedPositions != null) { redrawPositions(changedPositions); updatePositions(); @@ -319,14 +319,14 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { private void updatePositions() { int sz= fPositions.size(); for (int i= 0; i < sz; ++i) { - Position position= (Position)fPositions.get(i); + Position position= fPositions.get(i); Position copy; if (i == fLastPositions.size()) { copy= new Position(position.offset, position.length); copy.isDeleted= position.isDeleted; fLastPositions.add(copy); } else { - copy= (Position)fLastPositions.get(i); + copy= fLastPositions.get(i); copy.offset= position.offset; copy.length= position.length; copy.isDeleted= position.isDeleted; @@ -344,14 +344,14 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { * Check which positions have changed since last redraw. * @return a list of changed positions or null if none changed. */ - private List getChangedPositions() { + private List getChangedPositions() { if (fLastPositions.size() != fPositions.size()) { return fLastPositions; } - List changedPositions= null; + List changedPositions= null; for (int i= 0, sz= fPositions.size(); i < sz; ++i) { - Position previous= (Position)fLastPositions.get(i); - Position current= (Position)fPositions.get(i); + Position previous= fLastPositions.get(i); + Position current= fPositions.get(i); if (!previous.equals(current)) { if (changedPositions == null) { changedPositions= fChangedPositions; @@ -368,7 +368,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { * * @param positions */ - private void redrawPositions(List positions) { + private void redrawPositions(List positions) { // TextViewer.getTopIndexStartOffset is buggy // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=174419 // final int minOffset= fTextViewer.getTopIndexStartOffset(); @@ -378,7 +378,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { int width= clientArea.width + fTextWidget.getHorizontalPixel(); int lineHeight= fTextWidget.getLineHeight(); for (int i= 0, sz= positions.size(); i < sz; ++i) { - Position position= (Position)positions.get(i); + Position position= positions.get(i); // if the position that is about to be drawn was deleted then we can't if (position.isDeleted()) { continue; @@ -456,14 +456,13 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { if (fTextViewer instanceof ITextViewerExtension5) { ITextViewerExtension5 extension= (ITextViewerExtension5)fTextViewer; return extension.modelOffset2WidgetOffset(documentOffset); - } else { - IRegion visible= fTextViewer.getVisibleRegion(); - int widgetOffset= documentOffset - visible.getOffset(); - if (widgetOffset > visible.getLength()) { - return -1; - } - return widgetOffset; } + IRegion visible= fTextViewer.getVisibleRegion(); + int widgetOffset= documentOffset - visible.getOffset(); + if (widgetOffset > visible.getLength()) { + return -1; + } + return widgetOffset; } /** @@ -475,13 +474,12 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { if (fTextViewer instanceof ITextViewerExtension5) { ITextViewerExtension5 extension= (ITextViewerExtension5)fTextViewer; return extension.widgetOffset2ModelOffset(widgetOffset); - } else { - IRegion visible= fTextViewer.getVisibleRegion(); - if (widgetOffset > visible.getLength()) { - return -1; - } - return widgetOffset + visible.getOffset(); } + IRegion visible= fTextViewer.getVisibleRegion(); + if (widgetOffset > visible.getLength()) { + return -1; + } + return widgetOffset + visible.getOffset(); } /* @@ -507,15 +505,14 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { private Color getColorForPosition(Position position) { if (position == fCursorLine) { if (fCursorLine.length == 0) { - return (Color)fColorMap.get(CURSOR_LINE_TYPE); + return fColorMap.get(CURSOR_LINE_TYPE); } } else { if (position instanceof TypedPosition) { String type= ((TypedPosition)position).getType(); - return (Color)fColorMap.get(type); - } else { - return (Color)fColorMap.get(DEFAULT_TYPE); + return fColorMap.get(type); } + return fColorMap.get(DEFAULT_TYPE); } return null; } @@ -528,7 +525,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener { private Position findIncludingPosition(int offset) { // TLETODO [performance] Use binary search? for (int i= fCursorLineActive ? 0 : 1, sz= fPositions.size(); i < sz; ++i) { - Position position= (Position)fPositions.get(i); + Position position= fPositions.get(i); if (position.offset == offset || position.includes(offset)) { return position; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java index 777d3b62214..a5440a07592 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java @@ -18,12 +18,12 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; public class ResourceAdapterFactory implements IAdapterFactory { - private static Class[] PROPERTIES= new Class[] { + private static Class[] PROPERTIES= new Class[] { ICElement.class }; @@ -33,13 +33,14 @@ public class ResourceAdapterFactory implements IAdapterFactory { /** * @see IAdapterFactory#getAdapterList */ - public Class[] getAdapterList() { + public Class[] getAdapterList() { return PROPERTIES; } /** * @see IAdapterFactory#getAdapter */ + @SuppressWarnings("unchecked") public Object getAdapter(Object element, Class key) { if (ICElement.class.equals(key)) { //try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java index 6ee251a7564..eb13a84a1cd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java @@ -37,5 +37,6 @@ public abstract class AbstractToggleLinkingAction extends Action { /** * Runs the action. */ + @Override public abstract void run(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java index 2c687b568ff..af5f665952a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java @@ -43,15 +43,15 @@ public abstract class AbstractUpdateIndexAction implements IObjectActionDelegate return; IStructuredSelection cElements= SelectionConverter.convertSelectionToCElements(fSelection); - Iterator i= cElements.iterator(); - ArrayList tuSelection= new ArrayList(); + Iterator i= cElements.iterator(); + ArrayList tuSelection= new ArrayList(); while (i.hasNext()) { Object o= i.next(); if (o instanceof ICProject || o instanceof ICContainer || o instanceof ITranslationUnit) { - tuSelection.add(o); + tuSelection.add((ICElement) o); } } - ICElement[] tuArray= (ICElement[]) tuSelection.toArray(new ICElement[tuSelection.size()]); + ICElement[] tuArray= tuSelection.toArray(new ICElement[tuSelection.size()]); try { CCorePlugin.getIndexManager().update(tuArray, getUpdateOptions()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java index 71b44f27005..a8f1a9e07c7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java @@ -50,10 +50,11 @@ public class AddBlockCommentAction extends BlockCommentAction { /* * @see org.eclipse.jdt.internal.ui.actions.BlockCommentAction#runInternal(org.eclipse.jface.text.ITextSelection, org.eclipse.jface.text.IDocumentExtension3, org.eclipse.jdt.internal.ui.actions.BlockCommentAction.Edit.EditFactory) */ + @Override protected void runInternal(ITextSelection selection, IDocumentExtension3 docExtension, Edit.EditFactory factory) throws BadLocationException, BadPartitioningException { int selectionOffset= selection.getOffset(); int selectionEndOffset= selectionOffset + selection.getLength(); - List edits= new LinkedList(); + List edits= new LinkedList(); ITypedRegion partition= docExtension.getPartition(ICPartitions.C_PARTITIONING, selectionOffset, false); handleFirstPartition(partition, edits, factory, selectionOffset); @@ -75,7 +76,7 @@ public class AddBlockCommentAction extends BlockCommentAction { * @param factory * @param offset */ - private void handleFirstPartition(ITypedRegion partition, List edits, Edit.EditFactory factory, int offset) throws BadLocationException { + private void handleFirstPartition(ITypedRegion partition, List edits, Edit.EditFactory factory, int offset) throws BadLocationException { int partOffset= partition.getOffset(); String partType= partition.getType(); @@ -104,7 +105,7 @@ public class AddBlockCommentAction extends BlockCommentAction { * @throws BadPartitioningException * @return the region */ - private ITypedRegion handleInteriorPartition(ITypedRegion partition, List edits, Edit.EditFactory factory, IDocumentExtension3 docExtension) throws BadPartitioningException, BadLocationException { + private ITypedRegion handleInteriorPartition(ITypedRegion partition, List edits, Edit.EditFactory factory, IDocumentExtension3 docExtension) throws BadPartitioningException, BadLocationException { // end of previous partition String partType= partition.getType(); @@ -136,7 +137,7 @@ public class AddBlockCommentAction extends BlockCommentAction { * @param factory * @param endOffset */ - private void handleLastPartition(ITypedRegion partition, List edits, Edit.EditFactory factory, int endOffset) throws BadLocationException { + private void handleLastPartition(ITypedRegion partition, List edits, Edit.EditFactory factory, int endOffset) throws BadLocationException { String partType= partition.getType(); @@ -167,6 +168,7 @@ public class AddBlockCommentAction extends BlockCommentAction { /* * @see org.eclipse.jdt.internal.ui.actions.BlockCommentAction#validSelection(org.eclipse.jface.text.ITextSelection) */ + @Override protected boolean isValidSelection(ITextSelection selection) { return selection != null && !selection.isEmpty() && selection.getLength() > 0; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java index c5469ff224e..d761c3732d8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java @@ -151,6 +151,7 @@ public abstract class BlockCommentAction extends TextEditorAction { /* * @see org.eclipse.jface.text.DocumentEvent#getOffset() */ + @Override public int getOffset() { return fPosition.getOffset(); } @@ -166,6 +167,7 @@ public abstract class BlockCommentAction extends TextEditorAction { } + @Override public void run() { if (!isEnabled()) return; @@ -227,9 +229,9 @@ public abstract class BlockCommentAction extends TextEditorAction { * @param edits a list of Edits * @throws BadLocationException if an Edit threw such an exception. */ - protected void executeEdits(List edits) throws BadLocationException { - for (Iterator it= edits.iterator(); it.hasNext();) { - Edit edit= (Edit) it.next(); + protected void executeEdits(List edits) throws BadLocationException { + for (Iterator it= edits.iterator(); it.hasNext();) { + Edit edit= it.next(); edit.perform(); } } @@ -256,6 +258,7 @@ public abstract class BlockCommentAction extends TextEditorAction { /* * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { super.update(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java index 49c7b426170..2dea365d086 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java @@ -51,6 +51,7 @@ public class CompositeActionGroup extends ActionGroup { } } + @Override public void dispose() { super.dispose(); if (fGroups == null) @@ -60,6 +61,7 @@ public class CompositeActionGroup extends ActionGroup { } } + @Override public void fillActionBars(IActionBars actionBars) { super.fillActionBars(actionBars); if (fGroups == null) @@ -69,6 +71,7 @@ public class CompositeActionGroup extends ActionGroup { } } + @Override public void fillContextMenu(IMenuManager menu) { super.fillContextMenu(menu); if (fGroups == null) @@ -78,6 +81,7 @@ public class CompositeActionGroup extends ActionGroup { } } + @Override public void setContext(ActionContext context) { super.setContext(context); if (fGroups == null) @@ -87,6 +91,7 @@ public class CompositeActionGroup extends ActionGroup { } } + @Override public void updateActionBars() { super.updateActionBars(); if (fGroups == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java index 551d5618cc6..1529951fda8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java @@ -125,7 +125,7 @@ public class CreateParserLogAction implements IObjectActionDelegate { final String title= action.getText().replace("&", ""); //$NON-NLS-1$ //$NON-NLS-2$ IStructuredSelection cElements= SelectionConverter.convertSelectionToCElements(fSelection); - Iterator i= cElements.iterator(); + Iterator i= cElements.iterator(); ArrayList tuSelection= new ArrayList(); while (i.hasNext()) { Object o= i.next(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java index e337a056c4c..6a212ba1a1a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java @@ -40,6 +40,7 @@ public class FindWordAction extends TextEditorAction { * (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { ITextEditor editor = getTextEditor(); if (editor == null ) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java index adb31073c9c..6caf724b3a9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java @@ -122,6 +122,7 @@ public class FoldingActionGroup extends ActionGroup { editor.setAction("FoldingCollapse", fCollapse); //$NON-NLS-1$ fRestoreDefaults= new FoldingAction(FoldingMessages.getResourceBundle(), "Projection.Restore.") { //$NON-NLS-1$ + @Override public void run() { if (editor instanceof CEditor) { CEditor cEditor= (CEditor) editor; @@ -148,6 +149,7 @@ public class FoldingActionGroup extends ActionGroup { /* * @see org.eclipse.ui.actions.ActionGroup#dispose() */ + @Override public void dispose() { if (isEnabled()) { fViewer.removeProjectionListener(fProjectionListener); @@ -191,6 +193,7 @@ public class FoldingActionGroup extends ActionGroup { /* * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() */ + @Override public void updateActionBars() { update(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java index d30cce09901..c2bb33fb2e2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java @@ -15,6 +15,7 @@ import org.eclipse.cdt.core.index.IIndexManager; public class FreshenIndexAction extends AbstractUpdateIndexAction { + @Override protected int getUpdateOptions() { return IIndexManager.UPDATE_ALL; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java index eaeb351b8c1..9234c5a6da3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java @@ -73,6 +73,7 @@ public class GoToNextPreviousMemberAction extends TextEditorAction { /* * @see org.eclipse.ui.texteditor.TextEditorAction#update() */ + @Override public void update() { final ITextEditor editor = getTextEditor(); setEnabled(editor instanceof CEditor && ((CEditor)editor).getInputCElement() != null); @@ -81,7 +82,8 @@ public class GoToNextPreviousMemberAction extends TextEditorAction { /** * @see org.eclipse.jface.action.Action#run() */ - public void run() { + @Override + public void run() { final CEditor editor = (CEditor) getTextEditor(); final ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection(); final IEditorInput editorInput = editor.getEditorInput(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java index 17ad83e8c59..76095d49937 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java @@ -27,10 +27,8 @@ public class GotoNextBookmarkAction extends TextEditorAction { /** * Private class to handle comparison of markers using their line numbers. */ - private class CompareMarker implements Comparator { - public int compare(Object o1, Object o2) { - IMarker m1 = (IMarker) o1; - IMarker m2 = (IMarker) o2; + private class CompareMarker implements Comparator { + public int compare(IMarker m1, IMarker m2) { int l1 = MarkerUtilities.getLineNumber(m1); int l2 = MarkerUtilities.getLineNumber(m2); if (l1 > l2) return 1; @@ -50,7 +48,7 @@ public class GotoNextBookmarkAction extends TextEditorAction { * (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ - @SuppressWarnings("unchecked") + @Override public void run() { ITextEditor editor = getTextEditor(); if (editor == null ) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java index f525e4d18bb..ffd3886f90c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java @@ -14,9 +14,9 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ResourceBundle; +import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -88,6 +88,7 @@ public class IndentAction extends TextEditorAction { /* * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { // update has been called by the framework if (!isEnabled() || !validateEditorInputState()) @@ -290,9 +291,8 @@ public class IndentAction extends TextEditorAction { if (!indent.equals(currentIndent)) { document.replace(offset, length, indent); return true; - } else { - return false; } + return false; } /** @@ -446,6 +446,7 @@ public class IndentAction extends TextEditorAction { /* * @see org.eclipse.ui.texteditor.IUpdate#update() */ + @Override public void update() { super.update(); @@ -483,10 +484,9 @@ public class IndentAction extends TextEditorAction { // or the selection has to extend over multiple lines if (length == 0) { return document.get(lineOffset, offset - lineOffset).trim().length() == 0; - } else { -// return lineOffset + firstLine.getLength() < offset + length; - return false; // only enable for empty selections for now - } + } +// return lineOffset + firstLine.getLength() < offset + length; + return false; // only enable for empty selections for now } catch (BadLocationException e) { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java index bdb3d0c9a57..580e8d9227e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java @@ -14,16 +14,6 @@ package org.eclipse.cdt.internal.ui.actions; import java.util.ArrayList; import java.util.List; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.util.CElementBaseLabels; - -import org.eclipse.cdt.internal.ui.util.EditorUtility; -import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; - -import org.eclipse.cdt.ui.CElementLabelProvider; - import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; @@ -31,6 +21,15 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.dialogs.ElementListSelectionDialog; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.util.CElementBaseLabels; +import org.eclipse.cdt.ui.CElementLabelProvider; + +import org.eclipse.cdt.internal.ui.util.EditorUtility; +import org.eclipse.cdt.internal.ui.viewsupport.CUILabelProvider; + public class OpenActionUtil { private OpenActionUtil() { @@ -57,12 +56,12 @@ public class OpenActionUtil { * Filters out source references from the given code resolve results. * A utility method that can be called by subclassers. */ - public static List filterResolveResults(ICElement[] codeResolveResults) { + public static List filterResolveResults(ICElement[] codeResolveResults) { int nResults= codeResolveResults.length; - List refs= new ArrayList(nResults); + List refs= new ArrayList(nResults); for (int i= 0; i < nResults; i++) { if (codeResolveResults[i] instanceof ISourceReference) - refs.add(codeResolveResults[i]); + refs.add((ISourceReference) codeResolveResults[i]); } return refs; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RebuildIndexAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RebuildIndexAction.java index 67344410843..cd6a5f10d55 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RebuildIndexAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RebuildIndexAction.java @@ -32,7 +32,7 @@ public class RebuildIndexAction implements IObjectActionDelegate { public void run(IAction action) { IStructuredSelection cElements= SelectionConverter.convertSelectionToCElements(fSelection); - for (Iterator i = cElements.iterator(); i.hasNext();) { + for (Iterator i = cElements.iterator(); i.hasNext();) { Object elem = i.next(); if (elem instanceof ICProject) { CCorePlugin.getIndexManager().reindex((ICProject) elem); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java index 002ce9fa138..0d66e0367a4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java @@ -47,8 +47,9 @@ public class RemoveBlockCommentAction extends BlockCommentAction { /* * @see org.eclipse.jdt.internal.ui.actions.AddBlockCommentAction#runInternal(org.eclipse.jface.text.ITextSelection, org.eclipse.jface.text.IDocumentExtension3, org.eclipse.jdt.internal.ui.actions.AddBlockCommentAction.Edit.EditFactory) */ + @Override protected void runInternal(ITextSelection selection, IDocumentExtension3 docExtension, Edit.EditFactory factory) throws BadPartitioningException, BadLocationException { - List edits= new LinkedList(); + List edits= new LinkedList(); int tokenLength= getCommentStart().length(); int offset= selection.getOffset(); @@ -81,6 +82,7 @@ public class RemoveBlockCommentAction extends BlockCommentAction { /* * @see org.eclipse.jdt.internal.ui.actions.AddBlockCommentAction#validSelection(org.eclipse.jface.text.ITextSelection) */ + @Override protected boolean isValidSelection(ITextSelection selection) { return selection != null && !selection.isEmpty() && selection.getLength() > 0; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java index ff3d2ab89d5..b3e29ab7cd2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java @@ -40,6 +40,7 @@ public class SelectAllAction extends Action { /** * Selects all resources in the view. */ + @Override public void run() { fViewer.getTable().selectAll(); // force viewer selection change diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java index e09422dd436..9c5709c243d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java @@ -127,7 +127,7 @@ public class SelectionConverter { } public static boolean allResourcesAreOfType(IStructuredSelection selection, int resourceMask) { - Iterator resources = selection.iterator(); + Iterator resources = selection.iterator(); while (resources.hasNext()) { Object next = resources.next(); if (next instanceof IAdaptable) { @@ -159,7 +159,7 @@ public class SelectionConverter { * @see IResource#getType() */ public static IStructuredSelection allResources(IStructuredSelection selection, int resourceMask) { - Iterator adaptables = selection.iterator(); + Iterator adaptables = selection.iterator(); List result = new ArrayList(); while (adaptables.hasNext()) { Object next = adaptables.next(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java index 7eea506a028..d556a25674f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java @@ -15,6 +15,7 @@ import org.eclipse.cdt.core.index.IIndexManager; public class UpdateIndexWithModifiedFilesAction extends AbstractUpdateIndexAction { + @Override protected int getUpdateOptions() { return IIndexManager.UPDATE_CHECK_TIMESTAMPS | IIndexManager.UPDATE_CHECK_CONFIGURATION; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java index 2e4d719d07f..e4095331c82 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java @@ -73,6 +73,7 @@ public class WorkbenchRunnableAdapter implements IRunnableWithProgress { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { try { WorkbenchRunnableAdapter.this.run(monitor); @@ -89,6 +90,7 @@ public class WorkbenchRunnableAdapter implements IRunnableWithProgress { } return Status.OK_STATUS; } + @Override public boolean belongsTo(Object family) { return jobFamiliy == family; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java index e80d424af4b..78747827c25 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java @@ -52,7 +52,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang ListenerList listeners = new ListenerList(); BuildConsole fConsole; - private Map fConsoleMap = new HashMap(); + private Map fConsoleMap = new HashMap(); Color infoColor, outputColor, errorColor; BuildConsoleStream infoStream, outputStream, errorStream; String fName, fContextMenuId; @@ -137,7 +137,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang IResource resource = event.getResource(); if (resource != null && resource.getType() == IResource.PROJECT) { if (event.getType() == IResourceChangeEvent.PRE_DELETE || event.getType() == IResourceChangeEvent.PRE_CLOSE) { - IDocumentPartitioner partioner = (IDocumentPartitioner)fConsoleMap.remove(resource); + IDocumentPartitioner partioner = fConsoleMap.remove(resource); if (partioner != null) { partioner.disconnect(); Object[] list = listeners.getListeners(); @@ -273,7 +273,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang } private BuildConsolePartitioner getConsolePartioner(IProject project) { - BuildConsolePartitioner partioner = (BuildConsolePartitioner)fConsoleMap.get(project); + BuildConsolePartitioner partioner = fConsoleMap.get(project); if (partioner == null) { partioner = new BuildConsolePartitioner(this); fConsoleMap.put(project, partioner); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java index c06c52374d6..9ed00ccd129 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java @@ -102,8 +102,8 @@ public class BuildConsolePage extends Page // actions private ClearOutputAction fClearOutputAction; - private Map fGlobalActions = new HashMap(10); - private List fSelectionActions = new ArrayList(3); + private Map fGlobalActions = new HashMap(10); + private List fSelectionActions = new ArrayList(3); // menus private Menu fMenu; @@ -180,6 +180,7 @@ public class BuildConsolePage extends Page * * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { fViewer = new BuildConsoleViewer(parent); @@ -217,11 +218,11 @@ public class BuildConsolePage extends Page * menu */ protected void contextMenuAboutToShow(IMenuManager menu) { - menu.add((IAction)fGlobalActions.get(ActionFactory.COPY.getId())); - menu.add((IAction)fGlobalActions.get(ActionFactory.SELECT_ALL.getId())); + menu.add(fGlobalActions.get(ActionFactory.COPY.getId())); + menu.add(fGlobalActions.get(ActionFactory.SELECT_ALL.getId())); menu.add(new Separator("FIND")); //$NON-NLS-1$ - menu.add((IAction)fGlobalActions.get(ActionFactory.FIND.getId())); - menu.add((IAction)fGlobalActions.get(ITextEditorActionConstants.GOTO_LINE)); + menu.add(fGlobalActions.get(ActionFactory.FIND.getId())); + menu.add(fGlobalActions.get(ITextEditorActionConstants.GOTO_LINE)); menu.add(fClearOutputAction); menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); } @@ -287,14 +288,14 @@ public class BuildConsolePage extends Page } protected void updateSelectionDependentActions() { - Iterator iterator = fSelectionActions.iterator(); + Iterator iterator = fSelectionActions.iterator(); while (iterator.hasNext()) { - updateAction((String)iterator.next()); + updateAction(iterator.next()); } } protected void updateAction(String actionId) { - IAction action = (IAction)fGlobalActions.get(actionId); + IAction action = fGlobalActions.get(actionId); if (action instanceof IUpdate) { ((IUpdate)action).update(); } @@ -328,6 +329,7 @@ public class BuildConsolePage extends Page * * @see org.eclipse.ui.part.IPage#dispose() */ + @Override public void dispose() { getSite().getPage().removeSelectionListener(this); getConsole().getConsoleManager().removeConsoleListener(this); @@ -335,6 +337,7 @@ public class BuildConsolePage extends Page super.dispose(); } + @Override public void init(IPageSite pageSite) { super.init(pageSite); getSite().getPage().addSelectionListener(this); @@ -400,16 +403,14 @@ public class BuildConsolePage extends Page Object element = ssel.getFirstElement(); if (element instanceof IAdaptable) { IAdaptable input = (IAdaptable)element; - if (input != null) { - IResource resource = null; - if (input instanceof IResource) { - resource = (IResource)input; - } else { - resource = (IResource)input.getAdapter(IResource.class); - } - if (resource != null) { - project = resource.getProject(); - } + IResource resource = null; + if (input instanceof IResource) { + resource = (IResource)input; + } else { + resource = (IResource)input.getAdapter(IResource.class); + } + if (resource != null) { + project = resource.getProject(); } } return project; @@ -420,6 +421,7 @@ public class BuildConsolePage extends Page * * @see org.eclipse.ui.part.IPage#getControl() */ + @Override public Control getControl() { if (fViewer != null) { return fViewer.getControl(); @@ -432,6 +434,7 @@ public class BuildConsolePage extends Page * * @see org.eclipse.ui.part.IPage#setFocus() */ + @Override public void setFocus() { Control control = getControl(); if (control != null) { @@ -470,6 +473,7 @@ public class BuildConsolePage extends Page /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @SuppressWarnings("unchecked") public Object getAdapter(Class required) { if (IFindReplaceTarget.class.equals(required)) { return getViewer().getFindReplaceTarget(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java index d5879e79a2a..7e695bbf3cc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java @@ -33,6 +33,7 @@ public class BuildConsolePartition extends TypedRegion { /** * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object partition) { if (super.equals(partition)) { return fStream.equals(((BuildConsolePartition) partition).getStream()); @@ -43,6 +44,7 @@ public class BuildConsolePartition extends TypedRegion { /** * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return super.hashCode() + fStream.hashCode(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java index abf45998ce3..71201ed2765 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java @@ -16,10 +16,6 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; -import org.eclipse.cdt.core.ConsoleOutputStream; -import org.eclipse.cdt.core.resources.IConsole; -import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.BadLocationException; @@ -35,6 +31,12 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.console.ConsolePlugin; +import org.eclipse.cdt.core.ConsoleOutputStream; +import org.eclipse.cdt.core.resources.IConsole; +import org.eclipse.cdt.ui.CUIPlugin; + +import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage; + public class BuildConsolePartitioner implements IDocumentPartitioner, @@ -45,7 +47,7 @@ public class BuildConsolePartitioner /** * List of partitions */ - List fPartitions = new ArrayList(5); + List fPartitions = new ArrayList(5); private int fMaxLines; @@ -64,7 +66,7 @@ public class BuildConsolePartitioner * Intentionally a vector to obtain synchronization as entries are added and * removed. */ - Vector fQueue = new Vector(5); + Vector fQueue = new Vector(5); //private boolean fAppending; @@ -129,7 +131,7 @@ public class BuildConsolePartitioner synchronized (fQueue) { int i = fQueue.size(); if (i > 0) { - StreamEntry entry = (StreamEntry)fQueue.get(i - 1); + StreamEntry entry = fQueue.get(i - 1); // if last stream is the same and we have not exceeded our // display write limit, append. if (entry.getStream() == stream && entry.size() < 10000) { @@ -146,7 +148,7 @@ public class BuildConsolePartitioner public void run() { StreamEntry entry; try { - entry = (StreamEntry)fQueue.remove(0); + entry = fQueue.remove(0); } catch (ArrayIndexOutOfBoundsException e) { return; } @@ -227,19 +229,19 @@ public class BuildConsolePartitioner */ public ITypedRegion[] computePartitioning(int offset, int length) { if (offset == 0 && length == fDocument.getLength()) { - return (ITypedRegion[])fPartitions.toArray(new ITypedRegion[fPartitions.size()]); + return fPartitions.toArray(new ITypedRegion[fPartitions.size()]); } int end = offset + length; - List list = new ArrayList(); + List list = new ArrayList(); for (int i = 0; i < fPartitions.size(); i++) { - ITypedRegion partition = (ITypedRegion)fPartitions.get(i); + ITypedRegion partition = fPartitions.get(i); int partitionStart = partition.getOffset(); int partitionEnd = partitionStart + partition.getLength(); if ( (offset >= partitionStart && offset <= partitionEnd) || (offset < partitionStart && end >= partitionStart)) { list.add(partition); } } - return (ITypedRegion[])list.toArray(new ITypedRegion[list.size()]); + return list.toArray(new ITypedRegion[list.size()]); } /** @@ -247,7 +249,7 @@ public class BuildConsolePartitioner */ public ITypedRegion getPartition(int offset) { for (int i = 0; i < fPartitions.size(); i++) { - ITypedRegion partition = (ITypedRegion)fPartitions.get(i); + ITypedRegion partition = fPartitions.get(i); int start = partition.getOffset(); int end = start + partition.getLength(); if (offset >= start && offset < end) { @@ -295,10 +297,10 @@ public class BuildConsolePartitioner } catch (BadLocationException e1) { } // update partitions - List newParitions = new ArrayList(fPartitions.size()); - Iterator partitions = fPartitions.iterator(); + List newParitions = new ArrayList(fPartitions.size()); + Iterator partitions = fPartitions.iterator(); while (partitions.hasNext()) { - ITypedRegion region = (ITypedRegion)partitions.next(); + ITypedRegion region = partitions.next(); if (region instanceof BuildConsolePartition) { BuildConsolePartition messageConsolePartition = (BuildConsolePartition)region; @@ -389,13 +391,16 @@ public class BuildConsolePartitioner fStream = stream; } + @Override public void flush() throws IOException { } + @Override public void close() throws IOException { flush(); } + @Override public void write(byte[] b, int off, int len) throws IOException { appendToDocument(new String(b, off, len), fStream); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java index b30e44ad919..9d4f922b903 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java @@ -127,6 +127,7 @@ public class BuildConsoleViewer extends TextViewer implements LineStyleListener * * @see org.eclipse.jface.text.ITextViewer#setDocument(org.eclipse.jface.text.IDocument) */ + @Override public void setDocument(IDocument doc) { IDocument oldDoc = getDocument(); IDocument document = doc; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ScrollLockAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ScrollLockAction.java index 7903fbefb2d..0f74d75d684 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ScrollLockAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ScrollLockAction.java @@ -32,6 +32,7 @@ public class ScrollLockAction extends Action { /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { fConsoleViewer.setAutoScroll(!isChecked()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java index 2fded570869..2153d7bc54c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java @@ -97,9 +97,7 @@ public class CHContentProvider extends AsyncTreeContentProvider { if (fComputeReferencedBy) { return asyncronouslyComputeReferencedBy(node); } - else { - return asyncronouslyComputeRefersTo(node); - } + return asyncronouslyComputeRefersTo(node); } } catch (CoreException e) { CUIPlugin.log(e); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java index b31c14be871..8fdbcb61692 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java @@ -56,7 +56,7 @@ public class CHDropTargetListener implements DropTargetListener { private ICElement checkLocalSelection() { ISelection sel= LocalSelectionTransfer.getTransfer().getSelection(); if (sel instanceof IStructuredSelection) { - for (Iterator iter = ((IStructuredSelection)sel).iterator(); iter.hasNext();) { + for (Iterator iter = ((IStructuredSelection)sel).iterator(); iter.hasNext();) { Object element = iter.next(); if (element instanceof ICElement) { return (ICElement) element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java index bb6355a3410..162257f92e3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java @@ -52,6 +52,7 @@ public class CHHistoryAction extends Action { /* * @see Action#run() */ + @Override public void run() { fViewPart.setInput(fElement); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java index 1ba051eae6c..c59b5ea3b6c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java @@ -34,6 +34,7 @@ public class CHHistoryDropDownAction extends Action implements IMenuCreator { fView= view; } + @Override public void run() { fView.setHistoryEntries(new ICElement[0]); fView.setInput(null); @@ -99,6 +100,7 @@ public class CHHistoryDropDownAction extends Action implements IMenuCreator { item.fill(parent, -1); } + @Override public void run() { (new CHHistoryListAction(fHierarchyView)).run(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java index 0ac4f52af4a..2b9d284d810 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java @@ -121,7 +121,7 @@ public class CHHistoryListAction extends Action { private void doSelectionChanged() { StatusInfo status= new StatusInfo(); - List selected= fHistoryList.getSelectedElements(); + List selected= fHistoryList.getSelectedElements(); if (selected.size() != 1) { status.setError(""); //$NON-NLS-1$ fResult= null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java index 5f00627d158..d5905bfeaf9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java @@ -26,18 +26,22 @@ public class CHMultiDefChildNode extends CHNode { super(parent, fileOfReferences, timestamp, decl); } + @Override public int getReferenceCount() { return getParent().getReferenceCount(); } + @Override public CHReferenceInfo getReference(int idx) { return getParent().getReference(idx); } + @Override public int getFirstReferenceOffset() { return getParent().getFirstReferenceOffset(); } + @Override public void addReference(CHReferenceInfo info) { assert false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java index 5a025bd39ac..aa19b549e4f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java @@ -34,19 +34,23 @@ public class CHMultiDefNode extends CHNode { return fChildren; } + @Override public boolean isMacro() { return fChildren[0].isMacro(); } + @Override public boolean isVariableOrEnumerator() { return fChildren[0].isVariableOrEnumerator(); } + @Override public ICElement getOneRepresentedDeclaration() { return fChildren[0].getRepresentedDeclaration(); } + @Override public boolean isMultiDef() { return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java index b40318df629..95482531e03 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java @@ -770,7 +770,7 @@ public class CHViewPart extends ViewPart { private CHNode selectionToNode(ISelection selection) { if (selection instanceof IStructuredSelection) { IStructuredSelection ss= (IStructuredSelection) selection; - for (Iterator iter = ss.iterator(); iter.hasNext(); ) { + for (Iterator iter = ss.iterator(); iter.hasNext(); ) { Object cand= iter.next(); if (cand instanceof CHNode) { return (CHNode) cand; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java index 866764a8c69..d9fc6d51b6c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java @@ -60,7 +60,8 @@ public class CallHierarchyUI { final Display display= Display.getCurrent(); Job job= new Job(CHMessages.CallHierarchyUI_label) { - protected IStatus run(IProgressMonitor monitor) { + @Override + protected IStatus run(IProgressMonitor monitor) { final ICElement[] elems= findDefinitions(input); if (elems != null && elems.length > 0) { display.asyncExec(new Runnable() { @@ -120,6 +121,7 @@ public class CallHierarchyUI { final Display display= Display.getCurrent(); Job job= new Job(CHMessages.CallHierarchyUI_label) { + @Override protected IStatus run(IProgressMonitor monitor) { try { StatusLineHandler.clearStatusLine(editor.getSite()); @@ -183,9 +185,7 @@ public class CallHierarchyUI { } } finally { - if (index != null) { - index.releaseReadLock(); - } + index.releaseReadLock(); } } catch (CoreException e) { @@ -222,9 +222,7 @@ public class CallHierarchyUI { } } finally { - if (index != null) { - index.releaseReadLock(); - } + index.releaseReadLock(); } } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java index f382fb054c8..6dea19a1fdb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java @@ -42,10 +42,12 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction { setEnabled(fEditor != null && CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput()) != null); } + @Override public void run(ITextSelection sel) { CallHierarchyUI.open(fEditor, sel); } + @Override public void run(IStructuredSelection selection) { if (!selection.isEmpty()) { Object selectedObject= selection.getFirstElement(); @@ -56,9 +58,11 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction { } } + @Override public void selectionChanged(ITextSelection sel) { } + @Override public void selectionChanged(IStructuredSelection selection) { if (selection.isEmpty()) { setEnabled(false); @@ -88,6 +92,7 @@ public class OpenCallHierarchyAction extends SelectionDispatchAction { return false; } + @SuppressWarnings("unchecked") private Object getAdapter(Object object, Class desiredClass) { if (desiredClass.isInstance(object)) { return object; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java index 70447815a25..0d929ea9a4a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java @@ -90,6 +90,7 @@ abstract class AbstractMergeViewer extends TextMergeViewer { return fPreferenceStore; } + @Override protected void handleDispose(DisposeEvent event) { if (fPreferenceChangeListener != null) { fPreferenceStore.removePropertyChangeListener(fPreferenceChangeListener); @@ -130,14 +131,17 @@ abstract class AbstractMergeViewer extends TextMergeViewer { } } + @Override protected String getDocumentPartitioning() { return ICPartitions.C_PARTITIONING; } + @Override protected IDocumentPartitioner getDocumentPartitioner() { return CUIPlugin.getDefault().getTextTools().createDocumentPartitioner(null); } + @Override protected void configureTextViewer(TextViewer textViewer) { if (textViewer instanceof SourceViewer) { ((SourceViewer)textViewer).configure(getSourceViewerConfiguration()); @@ -147,6 +151,7 @@ abstract class AbstractMergeViewer extends TextMergeViewer { /* * @see org.eclipse.compare.contentmergeviewer.ContentMergeViewer#getTitle() */ + @Override public abstract String getTitle(); /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java index d0a1696e1bf..5f5106a9a7f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java @@ -46,6 +46,7 @@ public class AsmMergeViewer extends AbstractMergeViewer { /* * @see org.eclipse.cdt.internal.ui.compare.AbstractMergeViewer#getSourceViewerConfiguration() */ + @Override protected SourceViewerConfiguration getSourceViewerConfiguration() { if (fSourceViewerConfiguration == null) { AsmTextTools tools= CUIPlugin.getDefault().getAsmTextTools(); @@ -58,6 +59,7 @@ public class AsmMergeViewer extends AbstractMergeViewer { /* * @see org.eclipse.cdt.internal.ui.compare.AbstractMergeViewer#getTitle() */ + @Override public String getTitle() { return CUIPlugin.getResourceString(TITLE); } @@ -65,6 +67,7 @@ public class AsmMergeViewer extends AbstractMergeViewer { /* * @see org.eclipse.cdt.internal.ui.compare.AbstractMergeViewer#handlePropertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override protected void handlePropertyChange(PropertyChangeEvent event) { super.handlePropertyChange(event); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java index 4ee09a6effa..f5f734f7fe5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java @@ -37,6 +37,7 @@ public class CMergeViewer extends AbstractMergeViewer { super(parent, styles, mp); } + @Override protected SourceViewerConfiguration getSourceViewerConfiguration() { if (fSourceViewerConfiguration == null) { CTextTools tools= CUIPlugin.getDefault().getTextTools(); @@ -46,6 +47,7 @@ public class CMergeViewer extends AbstractMergeViewer { return fSourceViewerConfiguration; } + @Override public String getTitle() { return CUIPlugin.getResourceString(TITLE); } @@ -53,6 +55,7 @@ public class CMergeViewer extends AbstractMergeViewer { /* * @see org.eclipse.cdt.internal.ui.compare.AbstractMergeViewer#handlePropertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override protected void handlePropertyChange(PropertyChangeEvent event) { super.handlePropertyChange(event); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java index 7f665ecb2cf..9b6054bd447 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java @@ -90,6 +90,7 @@ public class CStructureCreator extends StructureCreator { /* * @see org.eclipse.compare.structuremergeviewer.StructureCreator#createStructureComparator(java.lang.Object, org.eclipse.jface.text.IDocument, org.eclipse.compare.ISharedDocumentAdapter, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStructureComparator createStructureComparator(Object element, IDocument document, ISharedDocumentAdapter sharedDocumentAdapter, IProgressMonitor monitor) throws CoreException { @@ -153,6 +154,7 @@ public class CStructureCreator extends StructureCreator { /* * @see org.eclipse.compare.structuremergeviewer.StructureCreator#getDocumentPartitioning() */ + @Override protected String getDocumentPartitioning() { return ICPartitions.C_PARTITIONING; } @@ -160,6 +162,7 @@ public class CStructureCreator extends StructureCreator { /* * @see org.eclipse.compare.structuremergeviewer.StructureCreator#getDocumentPartitioner() */ + @Override protected IDocumentPartitioner getDocumentPartitioner() { return CUIPlugin.getDefault().getTextTools().createDocumentPartitioner(null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java index c27e6350af7..1ad381b8dc8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java @@ -63,7 +63,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { private static final String TRANSLATION_UNIT_NAME = CUIMessages.getString("CStructureCreatorVisitor.translationUnitName"); //$NON-NLS-1$ private static final String ANONYMOUS_NAME= CoreModelMessages.getString("CElementLabels.anonymous"); //$NON-NLS-1$ - private Stack fStack = new Stack(); + private Stack fStack = new Stack(); private IDocument fDocument; private String fTranslationUnitFileName; @@ -86,6 +86,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { /* * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit) */ + @Override public int visit(IASTTranslationUnit tu) { fTranslationUnitFileName= tu.getFilePath(); @@ -167,6 +168,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { /* * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#leave(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit) */ + @Override public int leave(IASTTranslationUnit tu) { super.leave(tu); assert getCurrentContainer().getTypeCode() == ICElement.C_UNIT; @@ -177,6 +179,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { /* * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTDeclaration) */ + @Override public int visit(IASTDeclaration node) { boolean isTemplateDecl= isTemplateDecl(node); final int startOffset= isTemplateDecl ? getStartOffset(node.getParent()) : getStartOffset(node); @@ -285,6 +288,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { /* * @see org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor#visit(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition) */ + @Override public int visit(ICPPASTNamespaceDefinition namespace) { push(ICElement.C_NAMESPACE, ASTStringUtil.getQualifiedName(namespace.getName()), getStartOffset(namespace)); return super.visit(namespace); @@ -293,6 +297,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { /* * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator) */ + @Override public int visit(IASTEnumerator enumerator) { push(ICElement.C_ENUMERATOR, ASTStringUtil.getQualifiedName(enumerator.getName()), getStartOffset(enumerator)); pop(getEndOffset(enumerator)); @@ -302,6 +307,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { /* * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#leave(org.eclipse.cdt.core.dom.ast.IASTDeclaration) */ + @Override public int leave(IASTDeclaration node) { super.leave(node); boolean isTemplateDecl= isTemplateDecl(node); @@ -408,6 +414,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { /* * @see org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor#leave(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition) */ + @Override public int leave(ICPPASTNamespaceDefinition namespace) { assert getCurrentContainer().getTypeCode() == ICElement.C_NAMESPACE; pop(getEndOffset(namespace)); @@ -415,7 +422,7 @@ class CStructureCreatorVisitor extends CPPASTVisitor { } private DocumentRangeNode getCurrentContainer() { - return (DocumentRangeNode) fStack.peek(); + return fStack.peek(); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java index 818e1d029a6..b5f12aa0232 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java @@ -89,7 +89,7 @@ public class BuildGroup extends CViewActionGroup { menu.add(new GroupMarker(BUILD_GROUP_MARKER)); - Iterator resources = selection.iterator(); + Iterator resources = selection.iterator(); while (resources.hasNext() && (!hasOpenProjects || !hasClosedProjects || hasBuilder || isProjectSelection)) { Object next = resources.next(); IProject project = null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java index 500dec06eb2..53023b5b1f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java @@ -198,6 +198,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha /** * @see IWorkbenchPart#setFocus() */ + @Override public void setFocus() { viewer.getTree().setFocus(); //composite.setFocus (); @@ -309,6 +310,8 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha /** * Answer the property defined by key. */ + @SuppressWarnings("unchecked") + @Override public Object getAdapter(Class key) { if (key.equals(ISelectionProvider.class)) { return viewer; @@ -323,6 +326,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha /* * (non-Javadoc) Method declared on IViewPart. */ + @Override public void init(IViewSite site, IMemento memento) throws PartInitException { super.init(site, memento); this.memento = memento; @@ -496,16 +500,19 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha viewer.getControl().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleKeyPressed(e); } + @Override public void keyReleased(KeyEvent e) { handleKeyReleased(e); } }); } + @Override public void createPartControl(Composite parent) { viewer = createViewer(parent); @@ -577,6 +584,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha /* * (non-Javadoc) Method declared on IWorkbenchPart. */ + @Override public void dispose() { if (fContextActivation != null) { IContextService ctxService = (IContextService)getSite().getService(IContextService.class); @@ -920,7 +928,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha IMemento childMem = memento.getChild(TAG_EXPANDED); if (childMem != null) { - ArrayList elements = new ArrayList(); + ArrayList elements = new ArrayList(); IMemento[] elementMem = childMem.getChildren(TAG_ELEMENT); for (int i = 0; i < elementMem.length; i++) { String p = elementMem[i].getString(TAG_PATH); @@ -936,7 +944,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha } childMem = memento.getChild(TAG_SELECTION); if (childMem != null) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList(); IMemento[] elementMem = childMem.getChildren(TAG_ELEMENT); for (int i = 0; i < elementMem.length; i++) { String p = elementMem[i].getString(TAG_PATH); @@ -977,6 +985,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha } } + @Override public void saveState(IMemento memento) { if (viewer == null) { if (this.memento != null) { //Keep the old state; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java index 62ca6550fed..c84afc59009 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java @@ -97,13 +97,16 @@ public abstract class CViewActionGroup extends ActionGroup { * Called when the context menu is about to open. * Override to add your own context dependent menu contributions. */ + @Override public abstract void fillContextMenu(IMenuManager menu); /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ + @Override public abstract void fillActionBars(IActionBars actionBars); + @Override public abstract void updateActionBars(); /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java index 26412f4fd1e..386dcb4606c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java @@ -13,6 +13,12 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.ArrayList; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.runtime.IPath; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.ui.IWorkbenchPartSite; + import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.IArchive; import org.eclipse.cdt.core.model.IArchiveContainer; @@ -22,14 +28,10 @@ import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IIncludeReference; import org.eclipse.cdt.core.model.ILibraryReference; +import org.eclipse.cdt.ui.CElementContentProvider; + import org.eclipse.cdt.internal.ui.util.RemoteTreeContentManager; import org.eclipse.cdt.internal.ui.util.RemoteTreeViewer; -import org.eclipse.cdt.ui.CElementContentProvider; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.ui.IWorkbenchPartSite; /** * CViewContentProvider @@ -68,6 +70,7 @@ public class CViewContentProvider extends CElementContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object element) { Object[] objs = null; @@ -102,7 +105,6 @@ public class CViewContentProvider extends CElementContentProvider { extras = ((ILibraryReference)element).getChildren(); }*/ } catch (CModelException e) { - extras = null; } if (extras != null && extras.length > 0) { objs = concatenate(objs, extras); @@ -165,7 +167,7 @@ public class CViewContentProvider extends CElementContentProvider { protected IBinary[] getExecutables(IBinaryContainer container) throws CModelException { ICElement[] celements = container.getChildren(); - ArrayList list = new ArrayList(celements.length); + ArrayList list = new ArrayList(celements.length); for (int i = 0; i < celements.length; i++) { if (celements[i] instanceof IBinary) { IBinary bin = (IBinary)celements[i]; @@ -182,6 +184,7 @@ public class CViewContentProvider extends CElementContentProvider { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.BaseCElementContentProvider#internalGetParent(java.lang.Object) */ + @Override public Object internalGetParent(Object element) { // since we insert logical containers we have to fix // up the parent for {IInclude,ILibrary}Reference so that they refer @@ -203,6 +206,7 @@ public class CViewContentProvider extends CElementContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren(Object element) { if (fManager != null) { if (element instanceof IBinary) { @@ -244,6 +248,7 @@ public class CViewContentProvider extends CElementContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { if (fManager != null) { fManager.cancel(); @@ -254,6 +259,7 @@ public class CViewContentProvider extends CElementContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (fManager != null) { fManager.cancel(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewFrameSource.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewFrameSource.java index 906e18ddc13..98b1288267e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewFrameSource.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewFrameSource.java @@ -17,7 +17,8 @@ import org.eclipse.ui.views.framelist.TreeViewerFrameSource; public class CViewFrameSource extends TreeViewerFrameSource { private CView cview; - protected TreeFrame createFrame(Object input) { + @Override + protected TreeFrame createFrame(Object input) { TreeFrame frame = super.createFrame(input); frame.setToolTipText(cview.getToolTipText(input)); return frame; @@ -25,7 +26,8 @@ public class CViewFrameSource extends TreeViewerFrameSource { /** * Also updates the title of the packages explorer */ - protected void frameChanged(TreeFrame frame) { + @Override + protected void frameChanged(TreeFrame frame) { super.frameChanged(frame); cview.updateTitle(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java index b517ef5eb55..185a1048da2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java @@ -42,6 +42,7 @@ public class CViewLabelProvider extends AppearanceAwareLabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { if (element instanceof IncludeReferenceProxy) { final IIncludeReference ref = ((IncludeReferenceProxy)element).getReference(); @@ -93,6 +94,7 @@ public class CViewLabelProvider extends AppearanceAwareLabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { if (element instanceof IncludeReferenceProxy) { IIncludeReference reference = ((IncludeReferenceProxy)element).getReference(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java index 448af47854e..295f6dbb51d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java @@ -62,11 +62,11 @@ public void run() { } super.run(); - List destinations = getDestinations(); + List destinations = getDestinations(); if (destinations != null && destinations.isEmpty() == false) { IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); List resources = new ArrayList(); - Iterator iterator = destinations.iterator(); + Iterator iterator = destinations.iterator(); while (iterator.hasNext()) { IResource newResource = root.findMember((IPath) iterator.next()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java index 76a8bfeb99b..a9986ae0e73 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java @@ -31,6 +31,7 @@ class CollapseAllAction extends Action { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.COLLAPSE_ALL_ACTION); } + @Override public void run() { cview.collapseAll(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java index 8ed095536bc..048a76c3ccf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java @@ -14,12 +14,11 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWTError; import org.eclipse.swt.dnd.Clipboard; @@ -32,6 +31,8 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.SelectionListenerAction; import org.eclipse.ui.part.ResourceTransfer; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; + /** * Standard action for copying the currently selected resources to the clipboard. *

@@ -97,9 +98,10 @@ public class CopyAction extends SelectionListenerAction { * on IAction copies the selected resources to the * clipboard. */ + @Override public void run() { - List selectedResources = getSelectedResources(); - IResource[] resources = (IResource[]) selectedResources.toArray(new IResource[selectedResources.size()]); + List selectedResources = getSelectedResources(); + IResource[] resources = selectedResources.toArray(new IResource[selectedResources.size()]); // Get the file names and a string representation final int length = resources.length; @@ -160,6 +162,7 @@ public class CopyAction extends SelectionListenerAction { * SelectionListenerAction method enables this action if * one or more resources of compatible types are selected. */ + @Override protected boolean updateSelection(IStructuredSelection selection) { if (!super.updateSelection(selection)) return false; @@ -167,7 +170,7 @@ public class CopyAction extends SelectionListenerAction { if (getSelectedNonResources().size() > 0) return false; - List selectedResources = getSelectedResources(); + List selectedResources = getSelectedResources(); if (selectedResources.size() == 0) return false; @@ -185,7 +188,7 @@ public class CopyAction extends SelectionListenerAction { if (firstParent == null) return false; - Iterator resourcesEnum = selectedResources.iterator(); + Iterator resourcesEnum = selectedResources.iterator(); while (resourcesEnum.hasNext()) { IResource currentResource = (IResource) resourcesEnum.next(); if (!currentResource.getParent().equals(firstParent)) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java index ae0d3dcfa73..0d0e8a6bd33 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java @@ -25,6 +25,7 @@ public class DefaultAction extends Action { this.shell = shell; } + @Override public void run() { MessageBox errorMsg = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK); errorMsg.setText(CViewMessages.getString("DefaultAction.WIP")); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java index c40511dc971..070f521ba63 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java @@ -42,6 +42,7 @@ public class GotoActionGroup extends CViewActionGroup { super(cview); } + @Override public void fillContextMenu(IMenuManager menu) { IStructuredSelection celements = (IStructuredSelection) getContext().getSelection(); IStructuredSelection selection = SelectionConverter.convertSelectionToResources(celements); @@ -60,6 +61,7 @@ public class GotoActionGroup extends CViewActionGroup { } } + @Override public void fillActionBars(IActionBars actionBars) { actionBars.setGlobalActionHandler(IWorkbenchActionConstants.GO_INTO, goIntoAction); actionBars.setGlobalActionHandler(ActionFactory.BACK.getId(), backAction); @@ -72,6 +74,7 @@ public class GotoActionGroup extends CViewActionGroup { toolBar.add(upAction); } + @Override protected void makeActions() { FrameList frameList = getCView().getFrameList(); goIntoAction = new GoIntoAction(frameList); @@ -82,6 +85,7 @@ public class GotoActionGroup extends CViewActionGroup { /* (non-Javadoc) */ + @Override public void updateActionBars() { ActionContext context = getContext(); boolean enable = false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java index ae1dfc73450..af974b94022 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java @@ -12,13 +12,15 @@ package org.eclipse.cdt.internal.ui.cview; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.model.IWorkbenchAdapter; + import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.IIncludeReference; -import org.eclipse.cdt.internal.ui.CPluginImages; import org.eclipse.cdt.ui.CElementGrouping; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.model.IWorkbenchAdapter; + +import org.eclipse.cdt.internal.ui.CPluginImages; /** * IncludeRefContainer @@ -38,6 +40,8 @@ public class IncludeRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @SuppressWarnings("unchecked") + @Override public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return this; @@ -51,6 +55,7 @@ public class IncludeRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object o) { try { IIncludeReference[] references = fCProject.getIncludeReferences(); @@ -67,6 +72,7 @@ public class IncludeRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ + @Override public ImageDescriptor getImageDescriptor(Object object) { return CPluginImages.DESC_OBJS_INCLUDES_CONTAINER; } @@ -74,6 +80,7 @@ public class IncludeRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ + @Override public String getLabel(Object o) { return CViewMessages.getString("IncludeRefContainer.Includes"); //$NON-NLS-1$ } @@ -81,6 +88,7 @@ public class IncludeRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object o) { return getCProject(); } @@ -92,6 +100,7 @@ public class IncludeRefContainer extends CElementGrouping { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof IncludeRefContainer) { IncludeRefContainer other = (IncludeRefContainer)obj; @@ -103,6 +112,7 @@ public class IncludeRefContainer extends CElementGrouping { /* (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { if (fCProject != null) { return fCProject.hashCode(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java index 07346bdadde..26b8a74e04c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java @@ -41,6 +41,7 @@ public class IncludeReferenceProxy extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object object) { try { return reference.getChildren(); @@ -53,6 +54,7 @@ public class IncludeReferenceProxy extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ + @Override public ImageDescriptor getImageDescriptor(Object object) { return CPluginImages.DESC_OBJS_INCLUDES_FOLDER; } @@ -60,6 +62,7 @@ public class IncludeReferenceProxy extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object object) { return getIncludeRefContainer(); } @@ -71,6 +74,7 @@ public class IncludeReferenceProxy extends CElementGrouping { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { return reference.equals(obj); } @@ -78,6 +82,7 @@ public class IncludeReferenceProxy extends CElementGrouping { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { return reference.toString(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java index 25221023f76..767276be1e4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java @@ -13,16 +13,18 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.ArrayList; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.ICProject; -import org.eclipse.cdt.core.model.ILibraryReference; -import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.ui.CElementGrouping; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.model.IWorkbenchAdapter; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.ICProject; +import org.eclipse.cdt.core.model.ILibraryReference; +import org.eclipse.cdt.ui.CElementGrouping; + +import org.eclipse.cdt.internal.ui.CPluginImages; + /** * VirtualGrouping */ @@ -42,6 +44,8 @@ public class LibraryRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ + @SuppressWarnings("unchecked") + @Override public Object getAdapter(Class adapter) { if (adapter == IWorkbenchAdapter.class) { return this; @@ -55,10 +59,11 @@ public class LibraryRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object o) { try { ILibraryReference[] references = fCProject.getLibraryReferences(); - ArrayList list = new ArrayList(references.length); + ArrayList list = new ArrayList(references.length); for (int i = 0; i < references.length; i++) { IPath path = references[i].getPath(); IFile file = references[i].getCModel().getWorkspace().getRoot().getFileForLocation(path); @@ -75,6 +80,7 @@ public class LibraryRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ + @Override public ImageDescriptor getImageDescriptor(Object object) { return CPluginImages.DESC_OBJS_LIBRARY; } @@ -82,6 +88,7 @@ public class LibraryRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ + @Override public String getLabel(Object o) { return CViewMessages.getString("LibraryRefContainer.Libraries"); //$NON-NLS-1$ } @@ -89,6 +96,7 @@ public class LibraryRefContainer extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object o) { return getCProject(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java index 7441908309c..090bca5a854 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java @@ -43,10 +43,12 @@ public class OpenFileGroup extends CViewActionGroup { super(cview); } + @Override protected void makeActions() { openFileAction = new OpenFileAction(getCView().getSite().getPage()); } + @Override public void fillContextMenu(IMenuManager menu) { IStructuredSelection celements = (IStructuredSelection) getContext().getSelection(); IStructuredSelection selection = SelectionConverter.convertSelectionToResources(celements); @@ -116,17 +118,20 @@ public class OpenFileGroup extends CViewActionGroup { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ - public void fillActionBars(IActionBars actionBars) { + @Override + public void fillActionBars(IActionBars actionBars) { } /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() */ - public void updateActionBars() { + @Override + public void updateActionBars() { } /** * Runs the default action (open file). */ + @Override public void runDefaultAction(IStructuredSelection selection) { Object obj = selection.getFirstElement(); if (obj instanceof ICElement) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java index 8943d3fc613..2fee3f2ecc6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java @@ -76,7 +76,7 @@ public class OpenProjectGroup extends CViewActionGroup { boolean isProjectSelection = true; boolean hasOpenProjects = false; boolean hasClosedProjects = false; - Iterator resources = selection.iterator(); + Iterator resources = selection.iterator(); while (resources.hasNext() && (!hasOpenProjects || !hasClosedProjects || isProjectSelection)) { Object next = resources.next(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java index aa6897ce89a..4c67f2d02b1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java @@ -12,7 +12,6 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.List; -import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -29,6 +28,8 @@ import org.eclipse.ui.actions.CopyProjectOperation; import org.eclipse.ui.actions.SelectionListenerAction; import org.eclipse.ui.part.ResourceTransfer; +import org.eclipse.cdt.internal.ui.ICHelpContextIds; + /** * Standard action for pasting resources on the clipboard to the selected resource's location. *

@@ -77,7 +78,7 @@ public class PasteAction extends SelectionListenerAction { * @return the actual target of the paste action */ private IResource getTarget() { - List selectedResources = getSelectedResources(); + List selectedResources = getSelectedResources(); for (int i = 0; i < selectedResources.size(); i++) { IResource resource = (IResource) selectedResources.get(i); @@ -111,6 +112,7 @@ public class PasteAction extends SelectionListenerAction { /** * Implementation of method defined on IAction. */ + @Override public void run() { // try a resource transfer ResourceTransfer resTransfer = ResourceTransfer.getInstance(); @@ -149,7 +151,7 @@ public class PasteAction extends SelectionListenerAction { * Returns the container to hold the pasted resources. */ private IContainer getContainer() { - List selection = getSelectedResources(); + List selection = getSelectedResources(); if (selection.get(0) instanceof IFile) return ((IFile) selection.get(0)).getParent(); return (IContainer) selection.get(0); @@ -159,6 +161,7 @@ public class PasteAction extends SelectionListenerAction { * SelectionListenerAction method enables this action if * a resource compatible with what is on the clipboard is selected. */ + @Override protected boolean updateSelection(IStructuredSelection selection) { if (!super.updateSelection(selection)) return false; @@ -172,11 +175,7 @@ public class PasteAction extends SelectionListenerAction { } }); IResource[] resourceData = clipboardData[0]; - boolean isProjectRes = resourceData != null - && resourceData.length > 0 - && resourceData[0].getType() == IResource.PROJECT; - - if (isProjectRes) { + if (resourceData != null && resourceData.length > 0 && resourceData[0].getType() == IResource.PROJECT) { for (int i = 0; i < resourceData.length; i++) { // make sure all resource data are open projects // can paste open projects regardless of selection @@ -199,7 +198,7 @@ public class PasteAction extends SelectionListenerAction { // can paste files and folders to a single selection (file, folder, // open project) or multiple file selection with the same parent - List selectedResources = getSelectedResources(); + List selectedResources = getSelectedResources(); if (selectedResources.size() > 1) { // if more than one resource is selected the selection has // to be all files with the same parent diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java index 5b7d1e9822e..b506e669c2c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java @@ -13,22 +13,25 @@ package org.eclipse.cdt.internal.ui.cview; import java.util.Iterator; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.internal.ui.dnd.BasicSelectionTransferDragAdapter; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; + +import org.eclipse.cdt.internal.ui.dnd.BasicSelectionTransferDragAdapter; + public class SelectionTransferDragAdapter extends BasicSelectionTransferDragAdapter { public SelectionTransferDragAdapter(ISelectionProvider provider) { super(provider); } + @Override protected boolean isDragable(ISelection selection) { if (selection instanceof IStructuredSelection) { - for (Iterator iter= ((IStructuredSelection)selection).iterator(); iter.hasNext();) { + for (Iterator iter= ((IStructuredSelection)selection).iterator(); iter.hasNext();) { Object element= iter.next(); if (element instanceof ICElement) { if (!(element instanceof ISourceReference)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java index 69e6a8f6d8c..231d2400b61 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java @@ -17,14 +17,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.cdt.core.model.CModelException; -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.model.ICElement; -import org.eclipse.cdt.core.model.ISourceReference; -import org.eclipse.cdt.core.model.ITranslationUnit; -import org.eclipse.cdt.internal.ui.dnd.CDTViewerDropAdapter; -import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableContext; @@ -38,9 +30,19 @@ import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.views.navigator.LocalSelectionTransfer; +import org.eclipse.cdt.core.model.CModelException; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.core.model.ISourceReference; +import org.eclipse.cdt.core.model.ITranslationUnit; + +import org.eclipse.cdt.internal.ui.dnd.CDTViewerDropAdapter; +import org.eclipse.cdt.internal.ui.dnd.TransferDropTargetListener; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; + public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implements TransferDropTargetListener { - private List fElements; + private List fElements; private ICElement[] fMoveData; private ICElement[] fCopyData; @@ -66,11 +68,13 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement //---- Actual DND ----------------------------------------------------------------- + @Override public void dragEnter(DropTargetEvent event) { clear(); super.dragEnter(event); } + @Override public void dragLeave(DropTargetEvent event) { clear(); super.dragLeave(event); @@ -82,6 +86,7 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement fCopyData = null; } + @Override public void validateDrop(Object target, DropTargetEvent event, int operation) { event.detail= DND.DROP_NONE; @@ -127,6 +132,7 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement return Math.abs(LocalSelectionTransfer.getInstance().getSelectionSetTime() - (event.time & 0xFFFFFFFFL)) < DROP_TIME_DIFF_TRESHOLD; } + @Override public void drop(Object target, DropTargetEvent event) { try { switch(event.detail) { @@ -194,8 +200,10 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement ICElement parent = elements[0]; for (int i = 0; i < elements.length; ++i) { ICElement p = elements[i].getParent(); - if (parent == null && p!= null) { - return false; + if (parent == null) { + if (p != null) { + return false; + } } else if (!parent.equals(p)){ return false; } @@ -318,17 +326,17 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement context.run(true, true, runnable); } - public static ICElement[] getCElements(List elements) { - List resources= new ArrayList(elements.size()); - for (Iterator iter= elements.iterator(); iter.hasNext();) { + public static ICElement[] getCElements(List elements) { + List resources= new ArrayList(elements.size()); + for (Iterator iter= elements.iterator(); iter.hasNext();) { Object element= iter.next(); if (element instanceof ITranslationUnit) { continue; } if (element instanceof ICElement) - resources.add(element); + resources.add((ICElement) element); } - return (ICElement[]) resources.toArray(new ICElement[resources.size()]); + return resources.toArray(new ICElement[resources.size()]); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ToggleLinkingAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ToggleLinkingAction.java index d1195c86d17..899c356fd43 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ToggleLinkingAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ToggleLinkingAction.java @@ -34,6 +34,7 @@ public class ToggleLinkingAction extends AbstractToggleLinkingAction { /** * Runs the action. */ + @Override public void run() { fCView.setLinkingEnabled(isChecked()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java index 1b0c60f4e66..7bfb9864b4f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java @@ -11,9 +11,10 @@ *******************************************************************************/ package org.eclipse.cdt.internal.ui.dialogs; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.events.SelectionEvent; @@ -26,8 +27,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.jface.viewers.ILabelProvider; - /** * A class to select one or more elements out of an indexed property */ @@ -57,6 +56,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * @private * @see Dialog#cancelPressed */ + @Override protected void cancelPressed() { setResult(null); super.cancelPressed(); @@ -68,6 +68,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * @private * @see Window#createDialogArea(Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite contents= (Composite)super.createDialogArea(parent); @@ -116,6 +117,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * @private * @see Window#create(Shell) */ + @Override public void create() { super.create(); if (isEmptyList()) { @@ -143,9 +145,9 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * Returns the widget selection. Returns empty list when the widget is not * usable. */ - protected List getWidgetSelection() { + protected List getWidgetSelection() { if (fSelectionList == null || fSelectionList.isDisposed()) - return new ArrayList(0); + return Collections.emptyList(); return fSelectionList.getSelection(); } /** @@ -195,6 +197,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus /* * @private */ + @Override public int open() { BusyIndicator.showWhile(null, new Runnable() { public void run() { @@ -227,6 +230,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * Sets the message to be shown above the match text field. * Must be set before widget creation */ + @Override public void setMessage(String message) { fMessageText= message; } @@ -247,7 +251,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * Initializes the selection list widget with the given list of * elements. */ - protected void setSelectionListElements(List elements, boolean refilter) { + protected void setSelectionListElements(List elements, boolean refilter) { fSelectionList.setElements(elements, refilter); } /** @@ -262,7 +266,7 @@ public abstract class AbstractElementListSelectionDialog extends SelectionStatus * accordingly. */ protected boolean verifyCurrentSelection() { - List sel= getWidgetSelection(); + List sel= getWidgetSelection(); int length= sel.size(); if (length > 0) { if (fValidator != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ElementListSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ElementListSelectionDialog.java index 8560673f64a..71aeab44a83 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ElementListSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ElementListSelectionDialog.java @@ -14,30 +14,31 @@ package org.eclipse.cdt.internal.ui.dialogs; import java.util.Arrays; import java.util.List; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.viewers.ILabelProvider; - /** * A class to select one or more elements out of an indexed property */ public class ElementListSelectionDialog extends AbstractElementListSelectionDialog { - private List fElements; + private List fElements; /* * @private */ + @Override protected void computeResult() { setResult(getWidgetSelection()); } /* * @private */ + @Override protected Control createDialogArea(Composite parent) { Control result= super.createDialogArea(parent); @@ -62,6 +63,7 @@ public class ElementListSelectionDialog extends AbstractElementListSelectionDial /* * @private */ + @Override protected void handleDoubleClick() { if (verifyCurrentSelection()) { buttonPressed(IDialogConstants.OK_ID); @@ -96,7 +98,7 @@ public class ElementListSelectionDialog extends AbstractElementListSelectionDial * @param elements The elements to show in the list * @return Returns OK or CANCEL */ - public int open(List elements) { + public int open(List elements) { setElements(elements); return open(); } @@ -106,7 +108,7 @@ public class ElementListSelectionDialog extends AbstractElementListSelectionDial * @param initialSelection The initial content of the match text box. * @return Returns OK or CANCEL */ - public int open(List elements, String initialSelection) { + public int open(List elements, String initialSelection) { setElements(elements); setInitialSelection(initialSelection); return open(); @@ -114,7 +116,7 @@ public class ElementListSelectionDialog extends AbstractElementListSelectionDial /** * Sets the elements presented by this dialog. */ - public void setElements(List elements) { + public void setElements(List elements) { fElements= elements; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java index b8bb439045b..739d4bf3caf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java @@ -64,6 +64,7 @@ public class OptionalMessageDialog extends MessageDialog { fId= id; } + @Override protected Control createCustomArea(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); GridLayout layout= new GridLayout(); @@ -76,6 +77,7 @@ public class OptionalMessageDialog extends MessageDialog { fHideDialogCheckBox= new Button(composite, SWT.CHECK | SWT.LEFT); fHideDialogCheckBox.setText(CHECKBOX_TEXT); fHideDialogCheckBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { setDialogEnabled(fId, !((Button)e.widget).getSelection()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java index db7222e1c69..6fd301370a6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java @@ -12,8 +12,10 @@ package org.eclipse.cdt.internal.ui.dialogs; import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -29,8 +31,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.eclipse.jface.viewers.ILabelProvider; - import org.eclipse.cdt.internal.ui.util.StringMatcher; import org.eclipse.cdt.internal.ui.util.TwoArrayQuickSort; @@ -122,11 +122,11 @@ public class SelectionList extends Composite { * returned in the list are the same as the ones passed to the selection list * via setElements. The list doesn't contain the rendered strings. */ - public List getSelection() { + public List getSelection() { if (fList == null || fList.isDisposed() || fList.getSelectionCount() == 0) - return new ArrayList(0); + return Collections.emptyList(); int[] listSelection= fList.getSelectionIndices(); - List selected= new ArrayList(listSelection.length); + List selected= new ArrayList(listSelection.length); for (int i= 0; i < listSelection.length; i++) { selected.add(fElements[fFilteredElements[listSelection[i]]]); } @@ -175,7 +175,7 @@ public class SelectionList extends Composite { /** * Sets the list of elements presented in the widget. */ - public void setElements(List elements, boolean refilter) { + public void setElements(List elements, boolean refilter) { // We copy the list since we sort it. if (elements == null) fElements= new Object[0]; @@ -189,6 +189,7 @@ public class SelectionList extends Composite { /* * Non Java-doc */ + @Override public void setEnabled(boolean enable) { super.setEnabled(enable); fText.setEnabled(enable); @@ -205,12 +206,14 @@ public class SelectionList extends Composite { /* * Non Java-doc */ + @Override public boolean setFocus() { return fText.setFocus(); } /* * Non Java-doc */ + @Override public void setFont(Font font) { super.setFont(font); fText.setFont(font); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java index 4cdec7e8afb..63240aebb7b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java @@ -14,6 +14,7 @@ package org.eclipse.cdt.internal.ui.dialogs; import java.util.Arrays; import java.util.List; +import org.eclipse.core.runtime.IStatus; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; @@ -22,11 +23,8 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; - import org.eclipse.ui.dialogs.SelectionDialog; -import org.eclipse.core.runtime.IStatus; - /** * An abstract base class for dialogs with a status bar and ok/cancel buttons. * The status message must be passed over as StatusInfo object and can be @@ -49,6 +47,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog { /* (non-Javadoc) * Method declared in Window. */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (fImage != null) @@ -57,6 +56,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog { /* (non-Javadoc) * Method declared in Dialog. */ + @Override protected Control createButtonBar(Composite parent) { Composite composite= new Composite(parent, SWT.NULL); GridLayout layout= new GridLayout(); @@ -80,6 +80,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog { /* (non-Javadoc) * Method declared in Dialog. */ + @Override public void create() { super.create(); if (fLastStatus != null) { @@ -92,7 +93,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog { * @return the first element of the initial selection. */ protected Object getPrimaryInitialSelection() { - List result= getInitialElementSelections(); + List result= getInitialElementSelections(); if (result == null || result.size() == 0) return null; return result.get(0); @@ -117,6 +118,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog { /* (non-Javadoc) * Method declared in Dialog. */ + @Override protected void okPressed() { computeResult(); super.okPressed(); @@ -130,7 +132,8 @@ public abstract class SelectionStatusDialog extends SelectionDialog { fImage= image; } protected void setInitialSelection(int position, Object element) { - List l= getInitialElementSelections(); + @SuppressWarnings("unchecked") + List l= getInitialElementSelections(); l.set(position, element); fInitialSelectionSet= true; } @@ -148,6 +151,7 @@ public abstract class SelectionStatusDialog extends SelectionDialog { setInitialSelections(new Object[0]); } } + @Override public void setInitialSelections(Object[] selectedElements) { super.setInitialSelections(selectedElements); fInitialSelectionSet= true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java index 376c3998bec..8cf070798ad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java @@ -78,6 +78,7 @@ public abstract class StatusDialog extends Dialog { /* * @see Window#create(Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (fTitle != null) @@ -87,6 +88,7 @@ public abstract class StatusDialog extends Dialog { /* * @see Window#create() */ + @Override public void create() { super.create(); if (fLastStatus != null) { @@ -103,6 +105,7 @@ public abstract class StatusDialog extends Dialog { /* * @see Dialog#createButtonsForButtonBar(Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { fOkButton= createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); @@ -111,6 +114,7 @@ public abstract class StatusDialog extends Dialog { /* * @see Dialog#createButtonBar(Composite) */ + @Override protected Control createButtonBar(Composite parent) { Composite composite= new Composite(parent, SWT.NULL); GridLayout layout= new GridLayout(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java index bcea5a96434..6140633dfc7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java @@ -126,6 +126,7 @@ public class StatusInfo implements IStatus { * Returns a string representation of the status, suitable * for debugging purposes only. */ + @Override public String toString() { StringBuffer buf = new StringBuffer(); buf.append("StatusInfo "); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java index 65c772f6a4b..e26eebe9a7e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java @@ -12,10 +12,8 @@ package org.eclipse.cdt.internal.ui.dialogs; import java.util.Collection; -import org.eclipse.core.runtime.IStatus; - import org.eclipse.core.runtime.Assert; - +import org.eclipse.core.runtime.IStatus; import org.eclipse.ui.dialogs.ISelectionStatusValidator; @@ -29,16 +27,16 @@ public class TypedElementSelectionValidator implements ISelectionStatusValidator private IStatus fgErrorStatus= new StatusInfo(IStatus.ERROR, ""); //$NON-NLS-1$ private IStatus fgOKStatus= new StatusInfo(); - private Class[] fAcceptedTypes; + private Class[] fAcceptedTypes; private boolean fAllowMultipleSelection; - private Collection fRejectedElements; + private Collection fRejectedElements; /** * @param acceptedTypes The types accepted by the validator * @param allowMultipleSelection If set to true, the validator * allows multiple selection. */ - public TypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) { + public TypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) { this(acceptedTypes, allowMultipleSelection, null); } @@ -48,7 +46,7 @@ public class TypedElementSelectionValidator implements ISelectionStatusValidator * allows multiple selection. * @param rejectedElements A list of elements that are not accepted */ - public TypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection, Collection rejectedElements) { + public TypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection, Collection rejectedElements) { Assert.isNotNull(acceptedTypes); fAcceptedTypes= acceptedTypes; fAllowMultipleSelection= allowMultipleSelection; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedViewerFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedViewerFilter.java index 3d70a7213e6..1900c67adb1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedViewerFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedViewerFilter.java @@ -19,14 +19,14 @@ import org.eclipse.jface.viewers.ViewerFilter; */ public class TypedViewerFilter extends ViewerFilter { - private Class[] fAcceptedTypes; + private Class[] fAcceptedTypes; private Object[] fRejectedElements; /** * Creates a filter that only allows elements of gives types. * @param acceptedTypes The types of accepted elements */ - public TypedViewerFilter(Class[] acceptedTypes) { + public TypedViewerFilter(Class[] acceptedTypes) { this(acceptedTypes, null); } @@ -37,7 +37,7 @@ public class TypedViewerFilter extends ViewerFilter { * @param rejectedElements Element equals to the rejected elements are * filtered out */ - public TypedViewerFilter(Class[] acceptedTypes, Object[] rejectedElements) { + public TypedViewerFilter(Class[] acceptedTypes, Object[] rejectedElements) { Assert.isNotNull(acceptedTypes); fAcceptedTypes= acceptedTypes; fRejectedElements= rejectedElements; @@ -46,6 +46,7 @@ public class TypedViewerFilter extends ViewerFilter { /** * @see ViewerFilter#select */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (fRejectedElements != null) { for (int i= 0; i < fRejectedElements.length; i++) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java index 44baac3a508..9dab3180264 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java @@ -195,6 +195,7 @@ abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock imple fUserSettingsTimeStamp = getEncodedSettings(); } + @Override abstract protected void addTabs(); protected void setCElement(ICElement element) { @@ -228,6 +229,7 @@ abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock imple // -------- tab switching ---------- + @Override public void setCurrentPage(ICOptionPage page) { super.setCurrentPage(page); CPathBasePage newPage = (CPathBasePage) page; @@ -278,6 +280,7 @@ abstract public class AbstractPathOptionBlock extends TabFolderOptionBlock imple fPageCount++; } + @Override protected ICOptionPage getStartPage() { if (fCurrPage == null) { return super.getStartPage(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ArchiveFileFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ArchiveFileFilter.java index 211c7c3b680..3ad2f842d75 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ArchiveFileFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ArchiveFileFilter.java @@ -56,6 +56,7 @@ public class ArchiveFileFilter extends ViewerFilter { /* * @see ViewerFilter#select */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { if (element instanceof IFile) { if (fExcludes != null && fExcludes.contains(element)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java index 0b288c57ca5..44c9bbff739 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java @@ -420,6 +420,7 @@ public class CPElement { /* * @see Object#equals(java.lang.Object) */ + @Override public boolean equals(Object other) { if (other != null && other.getClass().equals(getClass())) { CPElement elem = (CPElement)other; @@ -456,6 +457,7 @@ public class CPElement { /* * @see Object#hashCode() */ + @Override public int hashCode() { final int HASH_FACTOR = 89; int hashCode = fPath.hashCode() + fEntryKind; @@ -494,6 +496,7 @@ public class CPElement { * * @see java.lang.Object#toString() */ + @Override public String toString() { return getPathEntry().toString(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java index 47a5020495f..361ad828831 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java @@ -48,6 +48,7 @@ public class CPElementFilter extends ViewerFilter { /* * @see ViewerFilter#select */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { if (element instanceof CPElement) { for (int i = 0; i < fKind.length; i++) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java index c54ca7026e7..fa8d3db0786 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java @@ -57,6 +57,7 @@ public class CPElementGroup { return kind; } + @Override public boolean equals(Object arg0) { if (arg0 == this) { return true; @@ -68,6 +69,7 @@ public class CPElementGroup { return false; } + @Override public int hashCode() { int hashCode = parent != null ? parent.hashCode() : 0; hashCode += resource != null ? resource.hashCode() : 0; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java index 55578a68b65..adc258a4f35 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java @@ -75,12 +75,14 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider { /* * @see org.eclipse.jface.viewers.BaseLabelProvider#dispose() */ + @Override public void dispose() { inDirect.dispose(); inDirect= null; super.dispose(); } + @Override public String getText(Object element) { if (element instanceof CPElement) { return getCPElementText((CPElement)element); @@ -356,6 +358,7 @@ class CPElementLabelProvider extends LabelProvider implements IColorProvider { private static final Point SMALL_SIZE = new Point(16, 16); + @Override public Image getImage(Object element) { if (element instanceof CPElement) { CPElement cpentry = (CPElement)element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java index b2cb94e8a93..d3ad8f7ba5a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java @@ -29,6 +29,7 @@ public class CPElementSorter extends ViewerSorter { /* * @see ViewerSorter#category(Object) */ + @Override public int category(Object obj) { if (obj instanceof CPElement) { switch ( ((CPElement)obj).getEntryKind()) { @@ -60,6 +61,7 @@ public class CPElementSorter extends ViewerSorter { return OTHER; } + @Override public void sort(Viewer viewer, Object[] elements) { // include paths and symbol definitions must not be sorted List sort = new ArrayList(elements.length); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java index 4bea6bc110a..403fd2c4f8f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java @@ -40,6 +40,7 @@ public class CPListImageDescriptor extends CompositeImageDescriptor { /** * @see CompositeImageDescriptor#getSize() */ + @Override protected Point getSize() { if (fSize == null) { ImageData data = fBaseImage.getImageData(); @@ -51,6 +52,7 @@ public class CPListImageDescriptor extends CompositeImageDescriptor { /** * @see Object#equals(java.lang.Object) */ + @Override public boolean equals(Object object) { if (!(object instanceof CPListImageDescriptor)) { return false; @@ -63,6 +65,7 @@ public class CPListImageDescriptor extends CompositeImageDescriptor { /** * @see Object#hashCode() */ + @Override public int hashCode() { return fBaseImage.hashCode() & flags | fSize.hashCode(); } @@ -70,6 +73,7 @@ public class CPListImageDescriptor extends CompositeImageDescriptor { /** * @see CompositeImageDescriptor#drawCompositeImage(int, int) */ + @Override protected void drawCompositeImage(int width, int height) { ImageData bg = fBaseImage.getImageData(); if (bg == null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java index 72f27588e39..f9a44b36d83 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java @@ -46,6 +46,7 @@ public class CPathContainerDescriptor implements IContainerDescriptor { * @author Dave * @deprecated */ + @Deprecated public static class PathEntryContainerPageAdapter implements IWizardPage, IPathEntryContainerPage { public static IPathEntryContainerPage createAdapter(Object elem) { if (elem instanceof org.eclipse.cdt.ui.wizards.ICPathContainerPage) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java index 99c636a0820..6a9e244cd64 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java @@ -99,6 +99,7 @@ public class CPathContainerEntryPage extends CPathBasePage { // -------- ui creation + @Override public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); @@ -112,6 +113,7 @@ public class CPathContainerEntryPage extends CPathBasePage { fContainersList.getTreeViewer().addFilter(new ViewerFilter() { + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof CPElementGroup) { return ((CPElementGroup)element).getChildren().length != 0; @@ -438,6 +440,7 @@ public class CPathContainerEntryPage extends CPathBasePage { * * @see org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathBasePage#isEntryKind(int) */ + @Override public boolean isEntryKind(int kind) { return kind == IPathEntry.CDT_CONTAINER; } @@ -445,6 +448,7 @@ public class CPathContainerEntryPage extends CPathBasePage { /* * @see BuildPathBasePage#getSelection */ + @Override public List getSelection() { return fContainersList.getSelectedElements(); } @@ -452,13 +456,16 @@ public class CPathContainerEntryPage extends CPathBasePage { /* * @see BuildPathBasePage#setSelection */ + @Override public void setSelection(List selElements) { fContainersList.selectElements(new StructuredSelection(selElements)); } + @Override public void performApply(IProgressMonitor monitor) throws CoreException { } + @Override public void performDefaults() { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java index 566741b8d9a..35d40434ce2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java @@ -40,10 +40,12 @@ public class CPathContainerSelectionPage extends WizardPage { private static class CPathContainerLabelProvider extends LabelProvider { + @Override public String getText(Object element) { return ((IContainerDescriptor) element).getName(); } + @Override public Image getImage(Object element) { return ((IContainerDescriptor) element).getImage(); } @@ -51,6 +53,7 @@ public class CPathContainerSelectionPage extends WizardPage { private static class CPathContainerSorter extends ViewerSorter { + @Override public int category(Object element) { if ( element instanceof ProjectContainerDescriptor) { return 0; @@ -139,6 +142,7 @@ public class CPathContainerSelectionPage extends WizardPage { /* (non-Javadoc) * @see IWizardPage#canFlipToNextPage() */ + @Override public boolean canFlipToNextPage() { return isPageComplete(); // avoid the getNextPage call to prevent potential plugin load } @@ -146,6 +150,7 @@ public class CPathContainerSelectionPage extends WizardPage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean) */ + @Override public void setVisible(boolean visible) { if (!visible && fListViewer != null) { fDialogSettings.put(DIALOGSTORE_CONTAINER_IDX, fListViewer.getTable().getSelectionIndex()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java index 8cff7140200..a233f12d11d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java @@ -91,6 +91,7 @@ public class CPathContainerWizard extends Wizard { * * @see IWizard#performFinish() */ + @Override public boolean performFinish() { if (fContainerPage != null) { if (fContainerPage.finish()) { @@ -113,6 +114,7 @@ public class CPathContainerWizard extends Wizard { * * @see IWizard#addPages() */ + @Override public void addPages() { if (fPageDesc != null) { fContainerPage = getContainerPage(fPageDesc); @@ -170,6 +172,7 @@ public class CPathContainerWizard extends Wizard { * * @see IWizard#getNextPage(IWizardPage) */ + @Override public IWizardPage getNextPage(IWizardPage page) { if (page == fSelectionWizardPage) { @@ -212,6 +215,7 @@ public class CPathContainerWizard extends Wizard { * * @see IWizard#canFinish() */ + @Override public boolean canFinish() { if (fSelectionWizardPage != null) { if (!fContainerPage.isPageComplete()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java index 8f35c33a3f1..7aebf2d8cca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java @@ -85,6 +85,7 @@ public class CPathFilterPage extends WizardPage { Dialog.applyDialogFont(container); } + @Override public void setVisible(boolean visible) { if (fPaths != null) { viewer.setInput(fPaths); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPathPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPathPage.java index 87f5dd7a971..94379f625ef 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPathPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPathPage.java @@ -15,6 +15,7 @@ import org.eclipse.jface.wizard.Wizard; public class CPathFilterPathPage extends Wizard { + @Override public boolean performFinish() { return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java index d7aedd5a33c..8744f0a7b6e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java @@ -168,6 +168,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage IncludeSymbolAdapter adapter = new IncludeSymbolAdapter(); fIncludeSymPathsList = new TreeListDialogField(adapter, buttonLabel, new CPElementLabelProvider(true, false)) { + @Override protected int getTreeStyle() { return super.getTreeStyle() & ~SWT.MULTI; } @@ -192,6 +193,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage true); } + @Override public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); @@ -208,10 +210,12 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage CUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(composite, ICHelpContextIds.PROJECT_INCLUDE_PATHS_SYMBOLS); } + @Override public Image getImage() { return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_CONTAINER); } + @Override public void init(ICElement cElement, List cPaths) { fCurrCProject = cElement.getCProject(); List elements = createGroups(cElement, cPaths); @@ -1044,6 +1048,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage super(parentShell, dialogTitle, dialogMessage, initialValue, validator); } + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); Button browse = createButton(parent, 3, @@ -1051,6 +1056,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage false); browse.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent ev) { DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.OPEN); dialog.setText(CPathEntryMessages.getString("IncludeSymbolEntryPage.browseForFolder")); //$NON-NLS-1$ @@ -1073,6 +1079,7 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage * * @see org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathBasePage#getSelection() */ + @Override public List getSelection() { return fIncludeSymPathsList.getSelectedElements(); } @@ -1082,20 +1089,25 @@ public class CPathIncludeSymbolEntryPage extends CPathIncludeSymbolEntryBasePage * * @see org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathBasePage#setSelection(java.util.List) */ + @Override public void setSelection(List selElements) { fIncludeSymPathsList.selectElements(new StructuredSelection(selElements)); } + @Override public boolean isEntryKind(int kind) { return kind == IPathEntry.CDT_INCLUDE || kind == IPathEntry.CDT_MACRO; } + @Override public void performApply(IProgressMonitor monitor) throws CoreException { } + @Override public void performDefaults() { } + @Override public List getCPaths() { List cPaths = new ArrayList(); List groups = fIncludeSymPathsList.getElements(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java index 065bbdc8e23..1e18a3b9a7e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java @@ -122,7 +122,8 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.dialogs.cpaths.CPElementFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public boolean select(Viewer viewer, Object parent, Object element) { + @Override + public boolean select(Viewer viewer, Object parent, Object element) { IResource res = null; if (element instanceof CPElement) { CPElement cpElem = (CPElement) element; @@ -212,7 +213,8 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB IncludeSymbolAdapter adapter = new IncludeSymbolAdapter(); fIncludeSymPathsList = new TreeListDialogField(adapter, buttonLabel, new CPElementLabelProvider(true, false)) { - protected int getTreeStyle() { + @Override + protected int getTreeStyle() { return super.getTreeStyle() & ~SWT.MULTI; } }; @@ -238,7 +240,8 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB false, true); } - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); Composite composite = new Composite(parent, SWT.NONE); @@ -254,11 +257,13 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB CUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(composite, ICHelpContextIds.PROJECT_INCLUDE_PATHS_SYMBOLS); } - public Image getImage() { + @Override + public Image getImage() { return CPluginImages.get(CPluginImages.IMG_OBJS_INCLUDES_CONTAINER); } - public void init(ICElement cElement, List cPaths) { + @Override + public void init(ICElement cElement, List cPaths) { fCurrCElement = cElement; fCurrCProject = cElement.getCProject(); List elements = createGroups(cElement, cPaths); @@ -1099,14 +1104,16 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB super(parentShell, dialogTitle, dialogMessage, initialValue, validator); } - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); Button browse = createButton(parent, 3, CPathEntryMessages.getString("IncludeSymbolEntryPage.addExternal.button.browse"), //$NON-NLS-1$ false); browse.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent ev) { + @Override + public void widgetSelected(SelectionEvent ev) { DirectoryDialog dialog = new DirectoryDialog(getShell(), SWT.OPEN); dialog.setText(CPathEntryMessages.getString("IncludeSymbolEntryPage.browseForFolder")); //$NON-NLS-1$ String currentName = getText().getText(); @@ -1128,7 +1135,8 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB * * @see org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathBasePage#getSelection() */ - public List getSelection() { + @Override + public List getSelection() { return fIncludeSymPathsList.getSelectedElements(); } @@ -1137,21 +1145,26 @@ public class CPathIncludeSymbolEntryPerFilePage extends CPathIncludeSymbolEntryB * * @see org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathBasePage#setSelection(java.util.List) */ - public void setSelection(List selElements) { + @Override + public void setSelection(List selElements) { fIncludeSymPathsList.selectElements(new StructuredSelection(selElements)); } - public boolean isEntryKind(int kind) { + @Override + public boolean isEntryKind(int kind) { return kind == IPathEntry.CDT_INCLUDE || kind == IPathEntry.CDT_MACRO; } - public void performApply(IProgressMonitor monitor) throws CoreException { + @Override + public void performApply(IProgressMonitor monitor) throws CoreException { } - public void performDefaults() { + @Override + public void performDefaults() { } - public List getCPaths() { + @Override + public List getCPaths() { List cPaths = new ArrayList(); List groups = fIncludeSymPathsList.getElements(); for (int i = 0; i < groups.size(); i++) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java index 1c069155e81..e172f9e95f0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java @@ -103,6 +103,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { fLibrariesList.setTreeExpansionLevel(2); } + @Override public Image getImage() { return CPluginImages.get(CPluginImages.IMG_OBJS_ARCHIVE); } @@ -121,6 +122,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathBasePage#getSelection() */ + @Override public List getSelection() { return fLibrariesList.getSelectedElements(); } @@ -128,6 +130,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathBasePage#setSelection(java.util.List) */ + @Override public void setSelection(List selElements) { fLibrariesList.selectElements(new StructuredSelection(selElements)); } @@ -135,6 +138,7 @@ public class CPathLibraryEntryPage extends CPathBasePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathBasePage#isEntryKind(int) */ + @Override public boolean isEntryKind(int kind) { return kind == IPathEntry.CDT_LIBRARY; } @@ -142,18 +146,21 @@ public class CPathLibraryEntryPage extends CPathBasePage { /* (non-Javadoc) * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void performApply(IProgressMonitor monitor) throws CoreException { } /* (non-Javadoc) * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performDefaults() */ + @Override public void performDefaults() { } /* (non-Javadoc) * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); Composite composite = new Composite(parent, SWT.NONE); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java index dd5692f13ad..c763d0ec921 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java @@ -39,6 +39,7 @@ public class CPathOrderExportPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.AbstractCOptionPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); @@ -52,12 +53,14 @@ public class CPathOrderExportPage extends CPathBasePage { fCPathList.setButtonsMinWidth(buttonBarWidth); } + @Override public Image getImage() { return CPluginImages.get(CPluginImages.IMG_OBJS_ORDER); } /* * @see BuildPathBasePage#getSelection */ + @Override public List getSelection() { return fCPathList.getSelectedElements(); } @@ -65,6 +68,7 @@ public class CPathOrderExportPage extends CPathBasePage { /* * @see BuildPathBasePage#setSelection */ + @Override public void setSelection(List selElements) { fCPathList.selectElements(new StructuredSelection(selElements)); } @@ -74,6 +78,7 @@ public class CPathOrderExportPage extends CPathBasePage { * * @see org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathBasePage#isEntryKind(int) */ + @Override public boolean isEntryKind(int kind) { return true; } @@ -83,6 +88,7 @@ public class CPathOrderExportPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.AbstractCOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void performApply(IProgressMonitor monitor) throws CoreException { } @@ -92,6 +98,7 @@ public class CPathOrderExportPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.AbstractCOptionPage#performDefaults() */ + @Override public void performDefaults() { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java index 533058365cd..52c620d44be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java @@ -95,6 +95,7 @@ public class CPathOutputEntryPage extends CPathBasePage { fOutputList.setTreeExpansionLevel(2); } + @Override public Image getImage() { return CPluginImages.get(CPluginImages.IMG_OBJS_CONTAINER); } @@ -119,6 +120,7 @@ public class CPathOutputEntryPage extends CPathBasePage { } } + @Override public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); Composite composite = new Composite(parent, SWT.NONE); @@ -518,6 +520,7 @@ public class CPathOutputEntryPage extends CPathBasePage { /* * @see BuildPathBasePage#getSelection */ + @Override public List getSelection() { return fOutputList.getSelectedElements(); } @@ -525,6 +528,7 @@ public class CPathOutputEntryPage extends CPathBasePage { /* * @see BuildPathBasePage#setSelection */ + @Override public void setSelection(List selElements) { fOutputList.selectElements(new StructuredSelection(selElements)); } @@ -534,6 +538,7 @@ public class CPathOutputEntryPage extends CPathBasePage { * * @see org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathBasePage#isEntryKind(int) */ + @Override public boolean isEntryKind(int kind) { return kind == IPathEntry.CDT_OUTPUT; } @@ -543,6 +548,7 @@ public class CPathOutputEntryPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void performApply(IProgressMonitor monitor) throws CoreException { } @@ -551,6 +557,7 @@ public class CPathOutputEntryPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performDefaults() */ + @Override public void performDefaults() { } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java index f65793f2d38..3ff353ac5b6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java @@ -59,6 +59,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { fCPathList = cPathList; } + @Override public Image getImage() { return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT); } @@ -68,6 +69,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void performApply(IProgressMonitor monitor) throws CoreException { } @@ -76,6 +78,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performDefaults() */ + @Override public void performDefaults() { } @@ -84,6 +87,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); @@ -179,6 +183,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { /* * @see BuildPathBasePage#getSelection */ + @Override public List getSelection() { return fProjectsList.getSelectedElements(); } @@ -186,6 +191,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { /* * @see BuildPathBasePage#setSelection */ + @Override public void setSelection(List selElements) { fProjectsList.selectElements(new StructuredSelection(selElements)); } @@ -195,6 +201,7 @@ public class CPathProjectsEntryPage extends CPathBasePage { * * @see org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathBasePage#isEntryKind(int) */ + @Override public boolean isEntryKind(int kind) { return kind == IPathEntry.CDT_PROJECT; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java index 5c18c4b209a..f665957cc2d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java @@ -50,6 +50,7 @@ public class CPathPropertyPage extends PropertyPage implements IStatusChangeList CPathTabBlock fCPathsBlock; IPathEntryStore fStore; + @Override protected Control createContents(Composite parent) { IProject project = getProject(); Control result; @@ -110,6 +111,7 @@ public class CPathPropertyPage extends PropertyPage implements IStatusChangeList return label; } + @Override public void setVisible(boolean visible) { if (fCPathsBlock != null) { if (!visible) { @@ -161,6 +163,7 @@ public class CPathPropertyPage extends PropertyPage implements IStatusChangeList /* * @see IPreferencePage#performOk */ + @Override public boolean performOk() { if (fCPathsBlock != null) { getSettings().put(INDEX, fCPathsBlock.getPageIndex()); @@ -207,6 +210,7 @@ public class CPathPropertyPage extends PropertyPage implements IStatusChangeList * * @see org.eclipse.jface.preference.IPreferencePage#performCancel() */ + @Override public boolean performCancel() { if (fCPathsBlock != null) { getSettings().put(INDEX, fCPathsBlock.getPageIndex()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java index f64a591252a..b2bff5aa571 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java @@ -95,6 +95,7 @@ public class CPathSourceEntryPage extends CPathBasePage { fFoldersList.setTreeExpansionLevel(2); } + @Override public Image getImage() { return CPluginImages.get(CPluginImages.IMG_OBJS_SOURCE_ROOT); } @@ -118,6 +119,7 @@ public class CPathSourceEntryPage extends CPathBasePage { } } + @Override public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); Composite composite = new Composite(parent, SWT.NONE); @@ -497,6 +499,7 @@ public class CPathSourceEntryPage extends CPathBasePage { /* * @see BuildPathBasePage#getSelection */ + @Override public List getSelection() { return fFoldersList.getSelectedElements(); } @@ -504,6 +507,7 @@ public class CPathSourceEntryPage extends CPathBasePage { /* * @see BuildPathBasePage#setSelection */ + @Override public void setSelection(List selElements) { fFoldersList.selectElements(new StructuredSelection(selElements)); } @@ -513,6 +517,7 @@ public class CPathSourceEntryPage extends CPathBasePage { * * @see org.eclipse.jdt.internal.ui.wizards.buildpaths.BuildPathBasePage#isEntryKind(int) */ + @Override public boolean isEntryKind(int kind) { return kind == IPathEntry.CDT_SOURCE; } @@ -522,6 +527,7 @@ public class CPathSourceEntryPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.AbstractCOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void performApply(IProgressMonitor monitor) throws CoreException { } @@ -530,6 +536,7 @@ public class CPathSourceEntryPage extends CPathBasePage { * * @see org.eclipse.cdt.ui.dialogs.AbstractCOptionPage#performDefaults() */ + @Override public void performDefaults() { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java index 6b1a4e76bc9..b266f4761b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java @@ -65,10 +65,12 @@ public class CPathTabBlock extends AbstractPathOptionBlock { fCPathList.setDialogFieldListener(adapter); } + @Override protected List getCPaths() { return fCPathList.getElements(); } + @Override protected void addTabs() { fSourcePage = new CPathSourceEntryPage(fCPathList); addPage(fSourcePage); @@ -87,6 +89,7 @@ public class CPathTabBlock extends AbstractPathOptionBlock { * * @see org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock#createContents(org.eclipse.swt.widgets.Composite) */ + @Override public Control createContents(Composite parent) { Control control = super.createContents(parent); if (getCProject() != null) { @@ -100,6 +103,7 @@ public class CPathTabBlock extends AbstractPathOptionBlock { return control; } + @Override protected void initialize(ICElement element, List cPaths) { fCPathList.setElements(cPaths); @@ -116,10 +120,12 @@ public class CPathTabBlock extends AbstractPathOptionBlock { initializeTimeStamps(); } + @Override protected int[] getFilteredTypes() { return pathTypes; } + @Override protected int[] getAppliedFilteredTypes() { return pathTypes; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java index 8d55f1312ba..c05d49b166b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java @@ -55,11 +55,13 @@ public class ExclusionPatternDialog extends StatusDialog { private static class ExclusionPatternLabelProvider extends LabelProvider { + @Override public Image getImage(Object element) { ImageDescriptorRegistry registry= CUIPlugin.getImageDescriptorRegistry(); return registry.get(CPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB); } + @Override public String getText(Object element) { return (String) element; } @@ -121,6 +123,7 @@ public class ExclusionPatternDialog extends StatusDialog { } + @Override protected Control createDialogArea(Composite parent) { Composite composite= (Composite)super.createDialogArea(parent); @@ -224,6 +227,7 @@ public class ExclusionPatternDialog extends StatusDialog { /* * @see org.eclipse.jface.window.Window#configureShell(Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); // WorkbenchHelp.setHelp(newShell, ICHelpContextIds.EXCLUSION_PATTERN_DIALOG); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java index 6d433f64cc2..15f49844638 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java @@ -90,6 +90,7 @@ public class ExclusionPatternEntryDialog extends StatusDialog { } } + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -176,6 +177,7 @@ public class ExclusionPatternEntryDialog extends StatusDialog { /* * @see org.eclipse.jface.window.Window#configureShell(Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); // WorkbenchHelp.setHelp(newShell, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java index fe56d145a9c..194386076be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java @@ -50,6 +50,7 @@ public class FolderSelectionDialog extends ElementTreeSelectionDialog implements /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite result= (Composite)super.createDialogArea(parent); @@ -58,6 +59,7 @@ public class FolderSelectionDialog extends ElementTreeSelectionDialog implements Button button = new Button(result, SWT.PUSH); button.setText(CPathEntryMessages.getString("FolderSelectionDialog.button")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { newFolderButtonPressed(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java index e442c15f4a5..98fbaa74ca9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java @@ -50,6 +50,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus NewIncludesSymbolsTabBlock fIncludesSymbolsBlock; IPathEntryStore fStore; + @Override protected Control createContents(Composite parent) { IProject project = getProject(); Control result; @@ -118,12 +119,14 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus * * @see org.eclipse.jface.dialogs.IDialogPage#dispose() */ + @Override public void dispose() { if (fStore != null) { fStore.removePathEntryStoreListener(this); } } + @Override public void setVisible(boolean visible) { if (fIncludesSymbolsBlock != null) { if (!visible) { @@ -182,6 +185,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus /* * @see IPreferencePage#performOk */ + @Override public boolean performOk() { if (fIncludesSymbolsBlock != null) { getSettings().put(INDEX, fIncludesSymbolsBlock.getPageIndex()); @@ -228,6 +232,7 @@ public class IncludesSymbolsPropertyPage extends PropertyPage implements IStatus * * @see org.eclipse.jface.preference.IPreferencePage#performCancel() */ + @Override public boolean performCancel() { if (fIncludesSymbolsBlock != null) { getSettings().put(INDEX, fIncludesSymbolsBlock.getPageIndex()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java index 4263413fc1b..56868ce7704 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java @@ -111,6 +111,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme /** * Handles cancel button pressed event. */ + @Override protected void cancelPressed() { setSelectionResult(null); super.cancelPressed(); @@ -119,6 +120,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme /* * @see SelectionStatusDialog#computeResult() */ + @Override protected void computeResult() { Object[] checked = fViewer.getCheckedElements(); if (fExisting == null) { @@ -149,6 +151,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme /* * @see Window#create() */ + @Override public void create() { BusyIndicator.showWhile(null, new Runnable() { @@ -218,6 +221,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -236,6 +240,7 @@ public class MultipleFolderSelectionDialog extends SelectionStatusDialog impleme button.setText(CPathEntryMessages.getString("MultipleFolderSelectionDialog.button")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { newFolderButtonPressed(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java index a734f918227..183131b67eb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java @@ -36,15 +36,18 @@ public class NewIncludesSymbolsTabBlock extends AbstractPathOptionBlock implemen super(context, pageToShow); } + @Override protected void addTab(ICOptionPage tab) { tab.setContainer(this); tab.createControl(fComposite); addOptionPage(tab); } + @Override protected void addTabs() { } + @Override public Control createContents(Composite parent) { fComposite = new Composite(parent, SWT.NONE); fComposite.setLayout(new GridLayout(1, false)); @@ -60,6 +63,7 @@ public class NewIncludesSymbolsTabBlock extends AbstractPathOptionBlock implemen return fComposite; } + @Override protected List getCPaths() { if (fIncludeSymbols != null) { return fIncludeSymbols.getCPaths(); @@ -67,14 +71,17 @@ public class NewIncludesSymbolsTabBlock extends AbstractPathOptionBlock implemen return fCPaths; } + @Override protected int[] getFilteredTypes() { return new int[] {IPathEntry.CDT_INCLUDE, IPathEntry.CDT_MACRO, IPathEntry.CDT_CONTAINER}; } + @Override protected int[] getAppliedFilteredTypes() { return new int[] {IPathEntry.CDT_INCLUDE, IPathEntry.CDT_MACRO}; } + @Override protected void initialize(ICElement element, List cPaths) { fCPaths = cPaths; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java index d550e3fbd1f..88a7f2f5ff5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java @@ -85,6 +85,7 @@ public class NewSourceFolderDialog extends StatusDialog { fContainerDialogField.setLabelText(message); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -175,6 +176,7 @@ public class NewSourceFolderDialog extends StatusDialog { /* * @see org.eclipse.jface.window.Window#configureShell(Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); // WorkbenchHelp.setHelp(newShell, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java index 8ac6ab8ef08..37139d2e6d9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java @@ -113,6 +113,7 @@ public class ProjectContainerPage extends WizardPage implements IPathEntryContai viewer.getTable().setLayoutData(gd); viewer.addFilter(new ViewerFilter() { + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { return !element.equals(fCProject); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java index 5ab10051b85..fa0c5c5db70 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java @@ -90,6 +90,7 @@ public class SourceAttachmentBlock { /** * @deprecated */ + @Deprecated public SourceAttachmentBlock(IWorkspaceRoot root, IStatusChangeListener context, ILibraryEntry oldEntry) { this(context, oldEntry, null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java index 2b6c4daf6ff..82f54e17656 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java @@ -71,6 +71,7 @@ public class SourceAttachmentDialog extends StatusDialog { /* (non-Javadoc) * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); //WorkbenchHelp.setHelp(newShell, IJavaHelpContextIds.SOURCE_ATTACHMENT_DIALOG); @@ -79,6 +80,7 @@ public class SourceAttachmentDialog extends StatusDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite= (Composite) super.createDialogArea(parent); @@ -115,6 +117,7 @@ public class SourceAttachmentDialog extends StatusDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { super.okPressed(); if (fApplyChanges) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java index dd5f65856bc..eee01d46e68 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java @@ -40,6 +40,7 @@ public class BasicSelectionTransferDragAdapter extends DragSourceAdapter impleme /* non Java-doc * @see org.eclipse.swt.dnd.DragSourceListener#dragStart */ + @Override public void dragStart(DragSourceEvent event) { ISelection selection= fProvider.getSelection(); LocalSelectionTransfer.getInstance().setSelection(selection); @@ -63,6 +64,7 @@ public class BasicSelectionTransferDragAdapter extends DragSourceAdapter impleme /* non Java-doc * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData */ + @Override public void dragSetData(DragSourceEvent event) { // For consistency set the data to the selection even though // the selection is provided by the LocalSelectionTransfer @@ -74,6 +76,7 @@ public class BasicSelectionTransferDragAdapter extends DragSourceAdapter impleme /* non Java-doc * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished */ + @Override public void dragFinished(DragSourceEvent event) { // Make sure we don't have to do any remaining work Assert.isTrue(event.detail != DND.DROP_MOVE); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDragAdapter.java index 5b7e37057b8..8ddb84a0c74 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDragAdapter.java @@ -29,6 +29,7 @@ public class CDTViewerDragAdapter extends DelegatingDragAdapter { fViewer= viewer; } + @Override public void dragStart(DragSourceEvent event) { IStructuredSelection selection= (IStructuredSelection)fViewer.getSelection(); if (selection.isEmpty()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java index eaaf233605d..cc747182232 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java @@ -28,7 +28,7 @@ import org.eclipse.swt.dnd.TransferData; */ public class DelegatingDragAdapter implements DragSourceListener { private TransferDragSourceListener[] fPossibleListeners; - private List fActiveListeners; + private List fActiveListeners; private TransferDragSourceListener fFinishListener; public DelegatingDragAdapter(TransferDragSourceListener[] listeners) { @@ -49,8 +49,8 @@ public class DelegatingDragAdapter implements DragSourceListener { boolean saveDoit= event.doit; Object saveData= event.data; boolean doIt= false; - List transfers= new ArrayList(fPossibleListeners.length); - fActiveListeners= new ArrayList(fPossibleListeners.length); + List transfers= new ArrayList(fPossibleListeners.length); + fActiveListeners= new ArrayList(fPossibleListeners.length); for (int i= 0; i < fPossibleListeners.length; i++) { TransferDragSourceListener listener= fPossibleListeners[i]; @@ -63,7 +63,7 @@ public class DelegatingDragAdapter implements DragSourceListener { doIt= doIt || event.doit; } if (doIt) { - ((DragSource)event.widget).setTransfer((Transfer[])transfers.toArray(new Transfer[transfers.size()])); + ((DragSource)event.widget).setTransfer(transfers.toArray(new Transfer[transfers.size()])); } event.data= saveData; event.doit= doIt; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java index 03e4a200cdb..6ba17d1ad78 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java @@ -18,10 +18,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.eclipse.cdt.internal.ui.CUIMessages; -import org.eclipse.cdt.internal.ui.util.ExceptionHandler; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IPath; @@ -31,7 +29,6 @@ import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.core.runtime.Assert; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; @@ -44,6 +41,11 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.actions.WorkspaceModifyOperation; +import org.eclipse.cdt.ui.CUIPlugin; + +import org.eclipse.cdt.internal.ui.CUIMessages; +import org.eclipse.cdt.internal.ui.util.ExceptionHandler; + public class FileTransferDragAdapter implements TransferDragSourceListener { private final ISelectionProvider provider; @@ -77,12 +79,12 @@ public class FileTransferDragAdapter implements TransferDragSourceListener { } private static class RefreshOperation extends WorkspaceModifyOperation { - private final Set roots; + private final Set roots; public RefreshOperation(List resources) { super(); - roots = new HashSet(resources.size()); + roots = new HashSet(resources.size()); for (Iterator iterator = resources.iterator(); iterator.hasNext();) { IResource resource = (IResource) iterator.next(); @@ -92,6 +94,7 @@ public class FileTransferDragAdapter implements TransferDragSourceListener { } } + @Override public void execute(IProgressMonitor monitor) throws CoreException { try { monitor.beginTask(CUIMessages.getString("FileTransferDragAdapter.refreshing"), roots.size()); //$NON-NLS-1$ @@ -118,13 +121,13 @@ public class FileTransferDragAdapter implements TransferDragSourceListener { } private List getResources() { - List result = Collections.EMPTY_LIST; + List result = Collections.emptyList(); ISelection selection = provider.getSelection(); if (selection instanceof IStructuredSelection) { IStructuredSelection structured = (IStructuredSelection) selection; - result = new ArrayList(structured.size()); + result = new ArrayList(structured.size()); for (Iterator iterator = structured.iterator(); iterator.hasNext();) { Object object = iterator.next(); @@ -147,7 +150,7 @@ public class FileTransferDragAdapter implements TransferDragSourceListener { private static String[] getResourceLocations(List resources) { if (!resources.isEmpty()) { int count = resources.size(); - List locations = new ArrayList(count); + List locations = new ArrayList(count); for (Iterator iterator = resources.iterator(); iterator.hasNext();) { IResource resource = (IResource) iterator.next(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java index 8df2ad1cf36..763c4f112b0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java @@ -50,6 +50,7 @@ public class FileTransferDropAdapter extends CDTViewerDropAdapter implements Tra //---- Actual DND ----------------------------------------------------------------- + @Override public void validateDrop(Object target, DropTargetEvent event, int operation) { event.detail= DND.DROP_NONE; boolean isContainer = false; @@ -70,6 +71,7 @@ public class FileTransferDropAdapter extends CDTViewerDropAdapter implements Tra } } + @Override public void drop(Object dropTarget, final DropTargetEvent event) { int operation= event.detail; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java index 386c744f35d..a5f122df7ad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java @@ -95,13 +95,13 @@ public class ResourceTransferDragAdapter implements TransferDragSourceListener { } private IResource[] getSelectedResources() { - List resources = Collections.EMPTY_LIST; + List resources = Collections.emptyList(); ISelection selection = provider.getSelection(); if (selection instanceof IStructuredSelection) { IStructuredSelection structured = (IStructuredSelection) selection; - resources = new ArrayList(structured.size()); + resources = new ArrayList(structured.size()); for (Iterator iterator = structured.iterator(); iterator.hasNext();) { Object element = iterator.next(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java index 48193b02ee1..f48e1bd8c83 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java @@ -15,7 +15,6 @@ package org.eclipse.cdt.internal.ui.dnd; import java.util.ArrayList; import java.util.Iterator; -import org.eclipse.cdt.core.model.ICElement; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; @@ -32,6 +31,8 @@ import org.eclipse.ui.actions.ReadOnlyStateChecker; import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.views.navigator.LocalSelectionTransfer; +import org.eclipse.cdt.core.model.ICElement; + /** * ResourceTransferDropAdapter */ @@ -62,6 +63,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements return target instanceof ICElement || target instanceof IResource; } + @Override public void validateDrop(Object target, DropTargetEvent event, int op) { IContainer destination = getDestination(target); if (destination == null) { @@ -86,6 +88,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements } } + @Override public void drop(Object dropTarget, final DropTargetEvent event) { int op= event.detail; @@ -128,7 +131,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements * @return the resource selection from the LocalSelectionTransfer */ private IResource[] getSelectedResources() { - ArrayList selectedResources = new ArrayList(); + ArrayList selectedResources = new ArrayList(); ISelection selection = LocalSelectionTransfer.getInstance() .getSelection(); @@ -137,7 +140,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements for (Iterator i = ssel.iterator(); i.hasNext();) { Object o = i.next(); if (o instanceof IResource) { - selectedResources.add(o); + selectedResources.add((IResource) o); } else if (o instanceof IAdaptable) { IAdaptable a = (IAdaptable) o; @@ -148,7 +151,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements } } } - return (IResource[]) selectedResources.toArray(new IResource[selectedResources.size()]); + return selectedResources.toArray(new IResource[selectedResources.size()]); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextEditorDropAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextEditorDropAdapter.java index d5bb672aa63..1947f6fa0e1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextEditorDropAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextEditorDropAdapter.java @@ -114,6 +114,7 @@ public class TextEditorDropAdapter extends DropTargetAdapter implements /* * @see org.eclipse.swt.dnd.DropTargetListener#drop(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void drop(final DropTargetEvent event) { try { TransferData dataType= event.currentDataType; @@ -141,6 +142,7 @@ public class TextEditorDropAdapter extends DropTargetAdapter implements /* * @see org.eclipse.swt.dnd.DropTargetListener#dragEnter(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void dragEnter(DropTargetEvent event) { TransferData dataType= event.currentDataType; if (isFileDataType(dataType)) { @@ -168,6 +170,7 @@ public class TextEditorDropAdapter extends DropTargetAdapter implements /* * @see org.eclipse.swt.dnd.DropTargetListener#dragOver(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void dragOver(DropTargetEvent event) { TransferData dataType= event.currentDataType; if (isFileDataType(dataType)) { @@ -208,6 +211,7 @@ public class TextEditorDropAdapter extends DropTargetAdapter implements /* * @see org.eclipse.swt.dnd.DropTargetListener#dropAccept(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void dropAccept(DropTargetEvent event) { TransferData dataType= event.currentDataType; if (isTextDataType(dataType)) { @@ -236,6 +240,7 @@ public class TextEditorDropAdapter extends DropTargetAdapter implements /* * @see org.eclipse.swt.dnd.DropTargetListener#dragOperationChanged(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void dragOperationChanged(DropTargetEvent event) { TransferData dataType= event.currentDataType; if (isFileDataType(dataType)) { @@ -276,6 +281,7 @@ public class TextEditorDropAdapter extends DropTargetAdapter implements /* * @see org.eclipse.swt.dnd.DropTargetListener#dragLeave(org.eclipse.swt.dnd.DropTargetEvent) */ + @Override public void dragLeave(DropTargetEvent event) { fDropSelection= null; } @@ -410,13 +416,12 @@ public class TextEditorDropAdapter extends DropTargetAdapter implements if (fViewer instanceof ITextViewerExtension5) { ITextViewerExtension5 extension= (ITextViewerExtension5) fViewer; return extension.widgetOffset2ModelOffset(widgetOffset); - } else { - IRegion visible= fViewer.getVisibleRegion(); - if (widgetOffset > visible.getLength()) { - return -1; - } - return widgetOffset + visible.getOffset(); } + IRegion visible= fViewer.getVisibleRegion(); + if (widgetOffset > visible.getLength()) { + return -1; + } + return widgetOffset + visible.getOffset(); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextViewerDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextViewerDragAdapter.java index 4e12979e4fd..85e3f7c05cf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextViewerDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextViewerDragAdapter.java @@ -68,6 +68,7 @@ public class TextViewerDragAdapter extends DragSourceAdapter { /* * @see org.eclipse.swt.dnd.DragSourceListener#dragFinished(org.eclipse.swt.dnd.DragSourceEvent) */ + @Override public void dragFinished(DragSourceEvent event) { IDocument doc= fViewer.getDocument(); try { @@ -91,6 +92,7 @@ public class TextViewerDragAdapter extends DragSourceAdapter { /* * @see org.eclipse.swt.dnd.DragSourceListener#dragSetData(org.eclipse.swt.dnd.DragSourceEvent) */ + @Override public void dragSetData(DragSourceEvent event) { IDocument doc= fViewer.getDocument(); try { @@ -104,6 +106,7 @@ public class TextViewerDragAdapter extends DragSourceAdapter { /* * @see org.eclipse.swt.dnd.DragSourceListener#dragStart(org.eclipse.swt.dnd.DragSourceEvent) */ + @Override public void dragStart(DragSourceEvent event) { if (!fIsEnabled) { event.doit= false; @@ -196,13 +199,12 @@ public class TextViewerDragAdapter extends DragSourceAdapter { if (fViewer instanceof ITextViewerExtension5) { ITextViewerExtension5 extension= (ITextViewerExtension5)fViewer; return extension.widgetOffset2ModelOffset(widgetOffset); - } else { - IRegion visible= fViewer.getVisibleRegion(); - if (widgetOffset > visible.getLength()) { - return -1; - } - return widgetOffset + visible.getOffset(); } + IRegion visible= fViewer.getVisibleRegion(); + if (widgetOffset > visible.getLength()) { + return -1; + } + return widgetOffset + visible.getOffset(); } /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java index bad7442e8e8..57b7f3c95b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java @@ -54,6 +54,7 @@ public final class ASTProvider { /* * @see java.lang.Object#toString() */ + @Override public String toString() { return fName; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java index f44bb844ccf..c9c902bf2ad 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java @@ -144,6 +144,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate { return fEditor.getSite().getShell(); } + @Override public void run() { ITranslationUnit tu= getTranslationUnit(); if (tu == null) { @@ -160,10 +161,8 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate { return; } try { - if (tu != null) { - extractIncludes(fEditor, index); - addInclude(tu); - } + extractIncludes(fEditor, index); + addInclude(tu); } finally { index.releaseReadLock(); @@ -186,15 +185,14 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate { this.binding= binding; } + @Override public String toString() { try { - if (binding != null) - { + if (binding != null) { return getBindingQualifiedName(binding) + " - " + name.getFileLocation().getFileName(); //$NON-NLS-1$ } - else - return null; + return null; } catch (CoreException e) { CCorePlugin.log(e); return null; @@ -257,7 +255,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate { IndexFilter filter= new IndexFilter() { }; IIndexBinding[] bindings= index.findBindings(pattern, false, filter, new NullProgressMonitor()); - ArrayList pdomNames= new ArrayList(); + ArrayList pdomNames= new ArrayList(); for (int i = 0; i < bindings.length; ++i) { IIndexBinding binding= bindings[i]; IIndexName[] defs= null; @@ -286,7 +284,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate { Object[] selects = dialog.getResult(); fRequiredIncludes = new IRequiredInclude[selects.length]; - List usings = new ArrayList(selects.length); + List usings = new ArrayList(selects.length); for (int i = 0; i < fRequiredIncludes.length; i++) { IRequiredInclude include = getRequiredInclude(((DisplayName)selects[i]).getName().getFileLocation().getFileName(), getTranslationUnit()); if (include != null) { @@ -307,7 +305,7 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate { fUsings = new String[usings.size()]; for (int i = 0; i < usings.size(); i++) { - fUsings[i] = (String) usings.get(i); + fUsings[i] = usings.get(i); } } } @@ -315,9 +313,9 @@ public class AddIncludeOnSelectionAction extends Action implements IUpdate { else if (pdomNames.size() == 1) { // we should use the IIndexName.getLocation here rather than getFileLocation - String fileName = ((DisplayName)pdomNames.get(0)).getName().getFileLocation().getFileName(); + String fileName = (pdomNames.get(0)).getName().getFileLocation().getFileName(); fRequiredIncludes = new IRequiredInclude[] {getRequiredInclude(fileName, getTranslationUnit())}; - IIndexBinding binding = ((DisplayName)pdomNames.get(0)).getBinding(); + IIndexBinding binding = (pdomNames.get(0)).getBinding(); if (binding instanceof ICPPBinding) { //find the enclosing namespace, if there's one diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java index fe10e6e3202..eeaf5808354 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java @@ -135,6 +135,7 @@ public class CContentOutlinerProvider extends BaseCElementContentProvider { /** * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ + @Override public void dispose() { super.dispose(); if (fListener != null) { @@ -150,6 +151,7 @@ public class CContentOutlinerProvider extends BaseCElementContentProvider { /* * @see org.eclipse.cdt.internal.ui.BaseCElementContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { boolean isTU = newInput instanceof ITranslationUnit; @@ -175,6 +177,7 @@ public class CContentOutlinerProvider extends BaseCElementContentProvider { /** * @see org.eclipse.cdt.internal.ui.BaseCElementContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object element) { Object[] children = null; // Use the deferred manager for the first time (when parsing) @@ -194,6 +197,7 @@ public class CContentOutlinerProvider extends BaseCElementContentProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren(Object element) { return super.hasChildren(element); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index 06b70d90f37..f2457491d3e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -347,6 +347,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { fTranslationUnit= unit; } + @Override protected MarkerAnnotation createMarkerAnnotation(IMarker marker) { String markerType= MarkerUtilities.getMarkerType(marker); if (markerType != null && markerType.startsWith(CMarkerAnnotation.C_MARKER_TYPE_PREFIX)) { @@ -359,6 +360,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* (non-Javadoc) * @see org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel#createPositionFromMarker(org.eclipse.core.resources.IMarker) */ + @Override protected Position createPositionFromMarker(IMarker marker) { int start= MarkerUtilities.getCharStart(marker); int end= MarkerUtilities.getCharEnd(marker); @@ -397,6 +399,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.jface.text.source.AnnotationModel#createAnnotationModelEvent() */ + @Override protected AnnotationModelEvent createAnnotationModelEvent() { return new TranslationUnitAnnotationModelEvent(this, getResource()); } @@ -638,6 +641,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see AnnotationModel#addAnnotation(Annotation, Position, boolean) */ + @Override @SuppressWarnings("unchecked") protected void addAnnotation(Annotation annotation, Position position, boolean fireModelChanged) throws BadLocationException { super.addAnnotation(annotation, position, fireModelChanged); @@ -661,6 +665,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see AnnotationModel#removeAllAnnotations(boolean) */ + @Override protected void removeAllAnnotations(boolean fireModelChanged) { super.removeAllAnnotations(fireModelChanged); synchronized (getLockObject()) { @@ -671,6 +676,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see AnnotationModel#removeAnnotation(Annotation, boolean) */ + @Override protected void removeAnnotation(Annotation annotation, boolean fireModelChanged) { Position position= getPosition(annotation); synchronized (getLockObject()) { @@ -759,6 +765,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#connect(java.lang.Object) */ + @Override public void connect(Object element) throws CoreException { super.connect(element); IDocument document= getDocument(element); @@ -796,6 +803,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createEmptyFileInfo() */ + @Override protected FileInfo createEmptyFileInfo() { return new TranslationUnitInfo(); } @@ -803,6 +811,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createAnnotationModel(org.eclipse.core.resources.IFile) */ + @Override protected IAnnotationModel createAnnotationModel(IFile file) { return new TranslationUnitAnnotationModel(file); } @@ -810,6 +819,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createFileInfo(java.lang.Object) */ + @Override protected FileInfo createFileInfo(Object element) throws CoreException { ITranslationUnit original = null; if (element instanceof IFileEditorInput) { @@ -884,6 +894,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#disposeFileInfo(java.lang.Object, * org.eclipse.ui.editors.text.TextFileDocumentProvider.FileInfo) */ + @Override protected void disposeFileInfo(Object element, FileInfo info) { if (info instanceof TranslationUnitInfo) { TranslationUnitInfo tuInfo = (TranslationUnitInfo) info; @@ -922,6 +933,7 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createSaveOperation(java.lang.Object, org.eclipse.jface.text.IDocument, boolean) */ + @Override protected DocumentProviderOperation createSaveOperation(final Object element, final IDocument document, final boolean overwrite) throws CoreException { //add a newline to the end of the document (if it is not already present) //----------------------------------------------------------------------- @@ -957,12 +969,14 @@ public class CDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#execute(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void execute(IProgressMonitor monitor) throws CoreException { commitWorkingCopy(monitor, element, (TranslationUnitInfo) info, overwrite); } /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider.DocumentProviderOperation#getSchedulingRule() */ + @Override public ISchedulingRule getSchedulingRule() { if (info.fElement instanceof IFileEditorInput) { IFile file= ((IFileEditorInput) info.fElement).getFile(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java index 207550232e8..00f8bf5d092 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java @@ -153,6 +153,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see ISourceViewer#configure(SourceViewerConfiguration) */ + @Override public void configure(SourceViewerConfiguration configuration) { // Prevent access to colors disposed in unconfigure(). StyledText textWidget= getTextWidget(); @@ -278,7 +279,8 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see org.eclipse.jface.text.source.SourceViewer#unconfigure() */ - public void unconfigure() { + @Override + public void unconfigure() { if (fOutlinePresenter != null) { fOutlinePresenter.uninstall(); fOutlinePresenter= null; @@ -348,6 +350,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see org.eclipse.jface.text.source.SourceViewer#createControl(org.eclipse.swt.widgets.Composite, int) */ + @Override protected void createControl(Composite parent, int styles) { // Use LEFT_TO_RIGHT unless otherwise specified. @@ -360,7 +363,8 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see org.eclipse.jface.text.ITextOperationTarget#doOperation(int) */ - public void doOperation(int operation) { + @Override + public void doOperation(int operation) { if (getTextWidget() == null) { return; @@ -381,7 +385,8 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see org.eclipse.jface.text.source.projection.ProjectionViewer#canDoOperation(int) */ - public boolean canDoOperation(int operation) { + @Override + public boolean canDoOperation(int operation) { switch (operation) { case SHOW_OUTLINE: return fOutlinePresenter != null; @@ -435,6 +440,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi *

* @since 4.0 */ + @Override protected void setVisibleDocument(IDocument document) { if (fIsSetVisibleDocumentDelayed) { fIsSetVisibleDocumentDelayed= false; @@ -457,6 +463,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi * untouched we reuse the given range as return value. *

*/ + @Override protected StyleRange modelStyleRange2WidgetStyleRange(StyleRange range) { IRegion region= modelRange2WidgetRange(new Region(range.start, range.length)); if (region != null) { @@ -471,6 +478,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see org.eclipse.jface.text.source.projection.ProjectionViewer#setVisibleRegion(int, int) */ + @Override public void setVisibleRegion(int start, int length) { // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=195808 if (!fWasProjectionMode && isProjectionMode()) { @@ -482,6 +490,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see org.eclipse.jface.text.source.projection.ProjectionViewer#resetVisibleRegion() */ + @Override public void resetVisibleRegion() { super.resetVisibleRegion(); // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=195808 @@ -506,6 +515,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * @see org.eclipse.jface.text.TextViewer#shift(boolean, boolean, boolean) */ + @Override protected void shift(boolean useDefaultPrefixes, boolean right, boolean ignoreWhitespace) { if (!useDefaultPrefixes) { // simple shift case @@ -594,7 +604,8 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi /* * work around for memory leak in TextViewer$WidgetCommand */ - protected void updateTextListeners(WidgetCommand cmd) { + @Override + protected void updateTextListeners(WidgetCommand cmd) { super.updateTextListeners(cmd); cmd.preservedText= null; cmd.event= null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java index 6f0d4edfffa..b658be052e6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java @@ -84,6 +84,7 @@ public class CSourceViewerDecorationSupport extends SourceViewerDecorationSuppor /* * @see org.eclipse.ui.texteditor.SourceViewerDecorationSupport#dispose() */ + @Override public void dispose() { super.dispose(); } @@ -91,6 +92,7 @@ public class CSourceViewerDecorationSupport extends SourceViewerDecorationSuppor /* * @see org.eclipse.ui.texteditor.SourceViewerDecorationSupport#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override protected void handlePreferenceStoreChanged(PropertyChangeEvent event) { String p = event.getProperty(); if (p.equals(fCLPEnableKey)) { @@ -209,6 +211,7 @@ public class CSourceViewerDecorationSupport extends SourceViewerDecorationSuppor /* * @see org.eclipse.ui.texteditor.SourceViewerDecorationSupport#install(org.eclipse.jface.preference.IPreferenceStore) */ + @Override public void install(IPreferenceStore store) { super.install(store); fPrefStore = store; @@ -223,6 +226,7 @@ public class CSourceViewerDecorationSupport extends SourceViewerDecorationSuppor /* * @see org.eclipse.ui.texteditor.SourceViewerDecorationSupport#uninstall() */ + @Override public void uninstall() { uninstallLineBackgroundPainter(); super.uninstall(); @@ -295,6 +299,7 @@ public class CSourceViewerDecorationSupport extends SourceViewerDecorationSuppor /* * @see org.eclipse.ui.texteditor.SourceViewerDecorationSupport#setCursorLinePainterPreferenceKeys(java.lang.String, java.lang.String) */ + @Override public void setCursorLinePainterPreferenceKeys(String enableKey, String colorKey) { // this is a dirty hack to override the original cursor line painter // and replace it with the generic BackgroundLinePainter diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java index aa7783d3b17..5b6e5aac1dc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java @@ -31,6 +31,7 @@ public class CStorageDocumentProvider 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) { CTextTools tools= CUIPlugin.getDefault().getTextTools(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java index 02379d6545c..f5f95a94238 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java @@ -145,6 +145,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.editors.text.StorageDocumentProvider#createDocument(java.lang.Object) */ + @Override protected IDocument createDocument(Object element) throws CoreException { IFile file= ResourceUtil.getFile(element); if (file != null) { @@ -158,12 +159,14 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.editors.text.StorageDocumentProvider#isModifiable(java.lang.Object) */ + @Override public boolean isModifiable(Object element) { return false; } /* * @see org.eclipse.ui.editors.text.StorageDocumentProvider#isReadOnly(java.lang.Object) */ + @Override public boolean isReadOnly(Object element) { return true; } @@ -178,6 +181,7 @@ public class DefaultBinaryFileEditor extends AbstractTextEditor { /* * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.source.IVerticalRuler, int) */ + @Override protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) { ISourceViewer sourceViewer= super.createSourceViewer(parent, ruler, styles); sourceViewer.setEditable(false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java index 9de435b7f38..c6a66575888 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java @@ -60,6 +60,7 @@ public class ExternalSearchAnnotationModel extends ResourceMarkerAnnotationModel fLocationAttribute= locationAttribute; } + @Override protected IMarker[] retrieveMarkers() throws CoreException { IMarker[] markers = null; if (getResource() != null) { @@ -68,6 +69,7 @@ public class ExternalSearchAnnotationModel extends ResourceMarkerAnnotationModel return markers; } + @Override protected boolean isAcceptable(IMarker marker) { boolean acceptable = false; String externalFileName = marker.getAttribute(fLocationAttribute, null); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java index e143e8203c6..1452d21c4b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java @@ -43,6 +43,7 @@ public class ExternalSearchDocumentProvider extends TextFileDocumentProvider { /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#createFileInfo(java.lang.Object) */ + @Override protected FileInfo createFileInfo(Object element) throws CoreException { final FileInfo info= super.createFileInfo(element); if (info != null && info.fModel == null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java index 256608d2fd6..ed6041719f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java @@ -31,17 +31,20 @@ public class GotoAnnotationAction extends TextEditorAction { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.GOTO_PREVIOUS_ERROR_ACTION); } + @Override public void run() { CEditor e= (CEditor) getTextEditor(); e.gotoAnnotation(fForward); } + @Override public void setEditor(ITextEditor editor) { if (editor instanceof CEditor) super.setEditor(editor); update(); } + @Override public void update() { setEnabled(getTextEditor() instanceof CEditor); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java index 082dc68d1fd..9bd7e499682 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java @@ -33,6 +33,7 @@ public class GotoMatchingBracketAction extends Action { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.GOTO_MATCHING_BRACKET_ACTION); } + @Override public void run() { fEditor.gotoMatchingBracket(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java index e8dfe9a8ef0..c8ce4108b31 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java @@ -102,6 +102,7 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp synchronized (fJobLock) { if (fUpdateJob == null) { fUpdateJob = new Job(CEditorMessages.getString("InactiveCodeHighlighting_job")) { //$NON-NLS-1$ + @Override protected IStatus run(final IProgressMonitor monitor) { IStatus result = Status.OK_STATUS; if (fTranslationUnit != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java index 75f44c92906..b4398b35dbe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java @@ -182,8 +182,6 @@ public final class IndentUtil { boolean indentInsideLineComments= indentInsideLineComments(project); String current= getCurrentIndent(document, lines.getStartLine(), indentInsideLineComments); StringBuffer correct= new StringBuffer(computeIndent(document, lines.getStartLine(), indenter, scanner)); - if (correct == null) - return result; // bail out int tabSize= CodeFormatterUtil.getTabWidth(project); StringBuffer addition= new StringBuffer(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java index 7f64adb4406..0d07bf65dfc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java @@ -46,6 +46,7 @@ public class LexicalSortingAction extends Action { valueChanged(checked, false); } + @Override public void run() { valueChanged(isChecked(), true); } @@ -67,6 +68,7 @@ public class LexicalSortingAction extends Action { return true; } + @Override public int category(Object obj) { if (obj instanceof ICElement) { ICElement elem= (ICElement)obj; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java index 62bac18bf6a..75eb59f5fa9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java @@ -78,6 +78,7 @@ public class OpenIncludeAction extends Action { fSelectionProvider= provider; } + @Override public void run() { IInclude include= getIncludeStatement(fSelectionProvider.getSelection()); if (include == null) { @@ -255,6 +256,7 @@ public class OpenIncludeAction extends Action { private IPath chooseFile(ArrayList filesFound) { ILabelProvider renderer= new LabelProvider() { + @Override public String getText(Object element) { if (element instanceof IPath) { IPath file= (IPath)element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java index 3b43533b24c..db8252fada1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java @@ -172,6 +172,7 @@ public class SemanticHighlightingManager implements IPropertyChangeListener { /* * @see org.eclipse.jface.text.Position#setLength(int) */ + @Override public void setLength(int length) { synchronized (fLock) { super.setLength(length); @@ -181,6 +182,7 @@ public class SemanticHighlightingManager implements IPropertyChangeListener { /* * @see org.eclipse.jface.text.Position#setOffset(int) */ + @Override public void setOffset(int offset) { synchronized (fLock) { super.setOffset(offset); @@ -190,6 +192,7 @@ public class SemanticHighlightingManager implements IPropertyChangeListener { /* * @see org.eclipse.jface.text.Position#delete() */ + @Override public void delete() { synchronized (fLock) { super.delete(); @@ -199,6 +202,7 @@ public class SemanticHighlightingManager implements IPropertyChangeListener { /* * @see org.eclipse.jface.text.Position#undelete() */ + @Override public void undelete() { synchronized (fLock) { super.undelete(); @@ -242,6 +246,7 @@ public class SemanticHighlightingManager implements IPropertyChangeListener { /* * @see org.eclipse.jface.text.Region#equals(java.lang.Object) */ + @Override public boolean equals(Object o) { return super.equals(o) && o instanceof HighlightedRange && fKey.equals(((HighlightedRange)o).getKey()); } @@ -249,6 +254,7 @@ public class SemanticHighlightingManager implements IPropertyChangeListener { /* * @see org.eclipse.jface.text.Region#hashCode() */ + @Override public int hashCode() { return super.hashCode() | fKey.hashCode(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java index 9fe84067bab..687e3f27192 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java @@ -193,6 +193,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return STATIC_FIELD; } @@ -200,6 +201,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(0, 0, 192); } @@ -207,6 +209,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -214,6 +217,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return true; } @@ -221,6 +225,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -228,6 +233,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_staticField"); //$NON-NLS-1$ } @@ -235,6 +241,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -265,6 +272,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return FIELD; } @@ -272,6 +280,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(0, 0, 192); } @@ -279,6 +288,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -286,6 +296,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -293,6 +304,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -300,6 +312,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_field"); //$NON-NLS-1$ } @@ -307,6 +320,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -331,6 +345,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return METHOD_DECLARATION; } @@ -338,6 +353,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -345,6 +361,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return true; } @@ -352,6 +369,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -359,6 +377,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -366,6 +385,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_methodDeclaration"); //$NON-NLS-1$ } @@ -373,6 +393,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -420,6 +441,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return STATIC_METHOD_INVOCATION; } @@ -427,6 +449,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -434,6 +457,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -441,6 +465,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return true; } @@ -448,6 +473,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -455,6 +481,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_staticMethodInvocation"); //$NON-NLS-1$ } @@ -462,6 +489,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -495,6 +523,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return METHOD; } @@ -502,6 +531,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -509,6 +539,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -516,6 +547,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -523,6 +555,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -530,6 +563,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_method"); //$NON-NLS-1$ } @@ -537,6 +571,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -562,6 +597,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return FUNCTION_DECLARATION; } @@ -569,6 +605,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -576,6 +613,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return true; } @@ -583,6 +621,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -590,6 +629,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -597,6 +637,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_functionDeclaration"); //$NON-NLS-1$ } @@ -604,6 +645,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -647,6 +689,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return FUNCTION; } @@ -654,6 +697,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -661,6 +705,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return true; } @@ -668,6 +713,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -675,6 +721,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -682,6 +729,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_function"); //$NON-NLS-1$ } @@ -689,6 +737,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -713,6 +762,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return LOCAL_VARIABLE_DECLARATION; } @@ -720,6 +770,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(128, 0, 0); } @@ -727,6 +778,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -734,6 +786,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -741,6 +794,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -748,6 +802,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_localVariableDeclaration"); //$NON-NLS-1$ } @@ -755,6 +810,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -791,6 +847,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return LOCAL_VARIABLE; } @@ -798,6 +855,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -805,6 +863,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -812,6 +871,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -819,6 +879,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -826,6 +887,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_localVariable"); //$NON-NLS-1$ } @@ -833,6 +895,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -884,6 +947,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return GLOBAL_VARIABLE; } @@ -891,6 +955,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -898,6 +963,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -905,6 +971,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return true; } @@ -912,6 +979,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -919,6 +987,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_globalVariable"); //$NON-NLS-1$ } @@ -926,6 +995,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -964,6 +1034,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return PARAMETER_VARIABLE; } @@ -971,6 +1042,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -978,6 +1050,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -985,6 +1058,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -992,6 +1066,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -999,6 +1074,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_parameterVariable"); //$NON-NLS-1$ } @@ -1006,6 +1082,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IBinding binding= token.getBinding(); if (binding instanceof IParameter) { @@ -1023,6 +1100,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return TEMPLATE_PARAMETER; } @@ -1030,6 +1108,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(100, 70, 50); } @@ -1037,6 +1116,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return true; } @@ -1044,6 +1124,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1051,6 +1132,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -1058,6 +1140,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_templateParameter"); //$NON-NLS-1$ } @@ -1065,6 +1148,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -1085,6 +1169,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return CLASS; } @@ -1092,6 +1177,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(0, 80, 50); } @@ -1099,6 +1185,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -1106,6 +1193,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1113,6 +1201,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -1120,6 +1209,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_classes"); //$NON-NLS-1$ } @@ -1127,6 +1217,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof ICPPASTQualifiedName || node instanceof ICPPASTTemplateId) { @@ -1150,6 +1241,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return ENUM; } @@ -1157,6 +1249,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(100, 70, 50); } @@ -1164,6 +1257,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -1171,6 +1265,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1178,6 +1273,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -1185,6 +1281,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_enums"); //$NON-NLS-1$ } @@ -1192,6 +1289,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -1212,6 +1310,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return MACRO_REFERENCE; } @@ -1219,6 +1318,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -1226,6 +1326,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -1233,6 +1334,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1240,6 +1342,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -1247,6 +1350,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_macroSubstitution"); //$NON-NLS-1$ } @@ -1254,6 +1358,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IBinding binding= token.getBinding(); if (binding instanceof IMacroBinding) { @@ -1274,6 +1379,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return MACRO_DEFINITION; } @@ -1281,6 +1387,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -1288,6 +1395,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -1295,6 +1403,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1302,6 +1411,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -1309,6 +1419,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_macroDefintion"); //$NON-NLS-1$ } @@ -1316,6 +1427,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IBinding binding= token.getBinding(); if (binding instanceof IMacroBinding) { @@ -1336,6 +1448,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return TYPEDEF; } @@ -1343,6 +1456,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(0, 80, 50); } @@ -1350,6 +1464,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -1357,6 +1472,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1364,6 +1480,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -1371,6 +1488,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_typeDef"); //$NON-NLS-1$ } @@ -1378,6 +1496,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -1402,6 +1521,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return NAMESPACE; } @@ -1409,6 +1529,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -1416,6 +1537,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -1423,6 +1545,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1430,6 +1553,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -1437,6 +1561,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_namespace"); //$NON-NLS-1$ } @@ -1444,6 +1569,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IBinding binding= token.getBinding(); if (binding instanceof ICPPNamespace) { @@ -1461,6 +1587,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return LABEL; } @@ -1468,6 +1595,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return RGB_BLACK; } @@ -1475,6 +1603,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -1482,6 +1611,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1489,6 +1619,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -1496,6 +1627,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_label"); //$NON-NLS-1$ } @@ -1503,6 +1635,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IBinding binding= token.getBinding(); if (binding instanceof ILabel) { @@ -1520,6 +1653,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return ENUMERATOR; } @@ -1527,6 +1661,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(0, 0, 192); } @@ -1534,6 +1669,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return false; } @@ -1541,6 +1677,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return true; } @@ -1548,6 +1685,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -1555,6 +1693,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_enumerator"); //$NON-NLS-1$ } @@ -1562,6 +1701,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { @@ -1586,6 +1726,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return PROBLEM; } @@ -1593,6 +1734,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(224, 0, 0); } @@ -1600,6 +1742,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return true; } @@ -1607,6 +1750,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isStrikethroughByDefault() */ + @Override public boolean isStrikethroughByDefault() { return false; } @@ -1614,6 +1758,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1621,6 +1766,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return false; } @@ -1628,6 +1774,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_problem"); //$NON-NLS-1$ } @@ -1635,6 +1782,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTProblem) { @@ -1659,6 +1807,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getPreferenceKey() */ + @Override public String getPreferenceKey() { return EXTERNAL_SDK; } @@ -1666,6 +1815,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextColor() */ + @Override public RGB getDefaultTextColor() { return new RGB(100, 40, 128); } @@ -1673,6 +1823,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDefaultTextStyleBold() */ + @Override public boolean isBoldByDefault() { return true; } @@ -1680,6 +1831,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isStrikethroughByDefault() */ + @Override public boolean isStrikethroughByDefault() { return false; } @@ -1687,6 +1839,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isItalicByDefault() */ + @Override public boolean isItalicByDefault() { return false; } @@ -1694,6 +1847,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#isEnabledByDefault() */ + @Override public boolean isEnabledByDefault() { return true; } @@ -1701,6 +1855,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#getDisplayName() */ + @Override public String getDisplayName() { return CEditorMessages.getString("SemanticHighlighting_externalSDK"); //$NON-NLS-1$ } @@ -1708,6 +1863,7 @@ public class SemanticHighlightings { /* * @see org.eclipse.cdt.internal.ui.editor.SemanticHighlighting#consumes(org.eclipse.cdt.internal.ui.editor.SemanticToken) */ + @Override public boolean consumes(SemanticToken token) { IASTNode node= token.getNode(); if (node instanceof IASTName) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java index 3384e607d41..0548fb321cb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java @@ -65,6 +65,7 @@ final class SpecificContentAssistAction extends Action implements IUpdate { /* * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { ITextEditor editor= getActiveEditor(); if (editor == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java index 96f134e3bf5..aa7554eac31 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java @@ -69,6 +69,7 @@ public final class ToggleCommentAction extends TextEditorAction { * Implementation of the IAction prototype. Checks if the selected * lines are all commented or not and uncomments/comments them respectively. */ + @Override public void run() { if (fOperationTarget == null || fDocumentPartitioning == null || fPrefixesMap == null) return; @@ -272,6 +273,7 @@ public final class ToggleCommentAction extends TextEditorAction { * ITextOperationTarget adapter, and sets the enabled state * accordingly. */ + @Override public void update() { super.update(); @@ -291,6 +293,7 @@ public final class ToggleCommentAction extends TextEditorAction { /* * @see TextEditorAction#setEditor(ITextEditor) */ + @Override public void setEditor(ITextEditor editor) { super.setEditor(editor); fOperationTarget= null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java index 0b058f0f7ee..f6343a9af20 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java @@ -49,6 +49,7 @@ public class ToggleMarkOccurrencesAction extends TextEditorAction implements IPr /* * @see IAction#actionPerformed */ + @Override public void run() { fStore.setValue(PreferenceConstants.EDITOR_MARK_OCCURRENCES, isChecked()); } @@ -56,6 +57,7 @@ public class ToggleMarkOccurrencesAction extends TextEditorAction implements IPr /* * @see TextEditorAction#update */ + @Override public void update() { ITextEditor editor= getTextEditor(); @@ -70,6 +72,7 @@ public class ToggleMarkOccurrencesAction extends TextEditorAction implements IPr /* * @see TextEditorAction#setEditor(ITextEditor) */ + @Override public void setEditor(ITextEditor editor) { super.setEditor(editor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java index 119279993af..181a72fbcc6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java @@ -51,6 +51,7 @@ public class TogglePresentationAction extends TextEditorAction implements IPrope /* * @see IAction#actionPerformed */ + @Override public void run() { ITextEditor editor= getTextEditor(); @@ -75,6 +76,7 @@ public class TogglePresentationAction extends TextEditorAction implements IPrope /* * @see TextEditorAction#update */ + @Override public void update() { ITextEditor editor= getTextEditor(); boolean checked= (editor != null && editor.showsHighlightRangeOnly()); @@ -85,6 +87,7 @@ public class TogglePresentationAction extends TextEditorAction implements IPrope /* * @see TextEditorAction#setEditor(ITextEditor) */ + @Override public void setEditor(ITextEditor editor) { super.setEditor(editor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java index d468399887c..48f55ffcf89 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java @@ -123,6 +123,7 @@ public class ToggleSourceAndHeaderAction extends TextEditorAction { /* * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTDeclarator) */ + @Override public int visit(IASTDeclarator declarator) { if (declarator instanceof IASTFunctionDeclarator) { IASTName name= declarator.getName(); @@ -198,6 +199,7 @@ public class ToggleSourceAndHeaderAction extends TextEditorAction { /* * @see org.eclipse.jface.action.Action#run() */ + @Override public void run() { IWorkingCopy currentUnit= getWorkingCopy(); if (currentUnit == null) { @@ -230,6 +232,7 @@ public class ToggleSourceAndHeaderAction extends TextEditorAction { /* * @see org.eclipse.ui.texteditor.TextEditorAction#update() */ + @Override public void update() { setEnabled(getWorkingCopy() != null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java index b47105fdde8..0e8a3218b2f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java @@ -67,6 +67,7 @@ public class TranslationUnitAnnotationModelEvent extends AnnotationModelEvent { /* * @see org.eclipse.jface.text.source.AnnotationModelEvent#annotationAdded(org.eclipse.jface.text.source.Annotation) */ + @Override public void annotationAdded(Annotation annotation) { super.annotationAdded(annotation); testIfProblemMarker(annotation); @@ -76,6 +77,7 @@ public class TranslationUnitAnnotationModelEvent extends AnnotationModelEvent { /* (non-Javadoc) * @see org.eclipse.jface.text.source.AnnotationModelEvent#annotationRemoved(org.eclipse.jface.text.source.Annotation, org.eclipse.jface.text.Position) */ + @Override public void annotationRemoved(Annotation annotation, Position position) { super.annotationRemoved(annotation, position); testIfProblemMarker(annotation); @@ -84,6 +86,7 @@ public class TranslationUnitAnnotationModelEvent extends AnnotationModelEvent { /* * @see org.eclipse.jface.text.source.AnnotationModelEvent#annotationRemoved(org.eclipse.jface.text.source.Annotation) */ + @Override public void annotationRemoved(Annotation annotation) { super.annotationRemoved(annotation); testIfProblemMarker(annotation); @@ -92,6 +95,7 @@ public class TranslationUnitAnnotationModelEvent extends AnnotationModelEvent { /* * @see org.eclipse.jface.text.source.AnnotationModelEvent#annotationChanged(org.eclipse.jface.text.source.Annotation) */ + @Override public void annotationChanged(Annotation annotation) { testIfProblemMarker(annotation); super.annotationChanged(annotation); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java index aced3370ae8..b151a43697b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java @@ -33,6 +33,7 @@ public class ASMEditorActionContributor extends TextEditorActionContributor { /* * @see org.eclipse.ui.editors.text.TextEditorActionContributor#init(org.eclipse.ui.IActionBars) */ + @Override public void init(IActionBars bars) { super.init(bars); bars.setGlobalActionHandler(ITextEditorActionDefinitionIds.TOGGLE_SHOW_SELECTED_ELEMENT_ONLY, fTogglePresentation); @@ -41,6 +42,7 @@ public class ASMEditorActionContributor extends TextEditorActionContributor { /* * @see org.eclipse.ui.editors.text.TextEditorActionContributor#setActiveEditor(org.eclipse.ui.IEditorPart) */ + @Override public void setActiveEditor(IEditorPart part) { super.setActiveEditor(part); internalSetActiveEditor(part); @@ -57,6 +59,7 @@ public class ASMEditorActionContributor extends TextEditorActionContributor { /* * @see org.eclipse.ui.editors.text.TextEditorActionContributor#dispose() */ + @Override public void dispose() { internalSetActiveEditor(null); super.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java index 69ef32302c3..f89402e7fa4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java @@ -33,6 +33,7 @@ public class AsmContentOutlinePage extends AbstractCModelOutlinePage { super("#ASMOutlineContext", editor); //$NON-NLS-1$ } + @Override protected OpenViewActionGroup createOpenViewActionGroup() { OpenViewActionGroup ovag= new OpenViewActionGroup(this); ovag.setEnableIncludeBrowser(false); @@ -41,6 +42,7 @@ public class AsmContentOutlinePage extends AbstractCModelOutlinePage { return ovag; } + @Override protected ActionGroup createCustomFiltersActionGroup() { return new CustomFiltersActionGroup("org.eclipse.cdt.ui.AsmOutlinePage", getTreeViewer()); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java index 82691b2a230..0dcd75cfb6f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java @@ -110,6 +110,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration * Constructor for AsmSourceViewerConfiguration. * @deprecated */ + @Deprecated public AsmSourceViewerConfiguration(AsmTextTools tools, IPreferenceStore store) { this(tools.getColorManager(), store, null, ICPartitions.C_PARTITIONING); } @@ -118,6 +119,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration * Constructor for AsmSourceViewerConfiguration. * @deprecated */ + @Deprecated public AsmSourceViewerConfiguration(ITextEditor editor, IPreferenceStore store) { this(CUIPlugin.getDefault().getAsmTextTools().getColorManager(), store, editor, ICPartitions.C_PARTITIONING); } @@ -208,6 +210,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration /* * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer) */ + @Override public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) { if (fDocumentPartitioning != null) return fDocumentPartitioning; @@ -217,6 +220,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration /* * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getPresentationReconciler(org.eclipse.jface.text.source.ISourceViewer) */ + @Override public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { PresentationReconciler reconciler= new PresentationReconciler(); @@ -253,6 +257,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration /* * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredContentTypes(org.eclipse.jface.text.source.ISourceViewer) */ + @Override public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { return new String[] { IDocument.DEFAULT_CONTENT_TYPE, @@ -266,6 +271,7 @@ public class AsmSourceViewerConfiguration extends TextSourceViewerConfiguration /* * @see org.eclipse.ui.editors.text.TextSourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer) */ + @Override public IReconciler getReconciler(ISourceViewer sourceViewer) { if (fTextEditor != null) { MonoReconciler reconciler= new MonoReconciler(new AsmReconcilingStrategy(fTextEditor), false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java index a80136735a4..74b71ab465b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java @@ -91,6 +91,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /** * Initializes this editor. */ + @Override protected void initializeEditor() { IPreferenceStore store= CUIPlugin.getDefault().getCombinedPreferenceStore(); // FIXME: Should this editor have a different preference store ? @@ -107,6 +108,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /* * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#collectContextMenuPreferencePages() */ + @Override protected String[] collectContextMenuPreferencePages() { // Add Assembly Editor relevant pages String[] parentPrefPageIds = super.collectContextMenuPreferencePages(); @@ -120,6 +122,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /* * @see org.eclipse.ui.editors.text.TextEditor#getAdapter(java.lang.Class) */ + @Override public Object getAdapter(Class adapter) { if (IContentOutlinePage.class.equals(adapter)) { return getOutlinePage(); @@ -130,6 +133,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /* * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#createPartControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createPartControl(Composite parent) { super.createPartControl(parent); @@ -142,6 +146,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /* * @see org.eclipse.ui.editors.text.TextEditor#dispose() */ + @Override public void dispose() { if (fOutlinePage != null) { fOutlinePage.dispose(); @@ -158,6 +163,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen * @see AbstractTextEditor#affectsTextPresentation(PropertyChangeEvent) * Pulled in from 2.0 */ + @Override protected boolean affectsTextPresentation(PropertyChangeEvent event) { SourceViewerConfiguration configuration = getSourceViewerConfiguration(); if (configuration instanceof AsmSourceViewerConfiguration) { @@ -169,6 +175,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /* * @see org.eclipse.ui.editors.text.TextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent) */ + @Override protected void handlePreferenceStoreChanged(PropertyChangeEvent event) { SourceViewerConfiguration configuration = getSourceViewerConfiguration(); if (configuration instanceof AsmSourceViewerConfiguration) { @@ -180,6 +187,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /* * @see org.eclipse.ui.editors.text.TextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager) */ + @Override protected void editorContextMenuAboutToShow(IMenuManager menu) { // marker for contributions to the top menu.add(new GroupMarker(ICommonMenuConstants.GROUP_TOP)); @@ -277,6 +285,7 @@ public class AsmTextEditor extends TextEditor implements ISelectionChangedListen /** * Get the StatusLineManager. */ + @Override protected IStatusLineManager getStatusLineManager() { IEditorActionBarContributor contributor = getEditorSite().getActionBarContributor(); if (contributor instanceof EditorActionBarContributor) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java index 1b8c86ffea5..666f8fa15e5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java @@ -27,6 +27,7 @@ public class ArchiveFilter extends ViewerFilter { /* (non-Javadoc) * Method declared on ViewerFilter. */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof IArchive) { if (! (parentElement instanceof IArchiveContainer)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java index 2a70dc26576..99832eceb70 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java @@ -26,6 +26,7 @@ public class ClosedProjectFilter extends ViewerFilter { /* * @see ViewerFilter */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { if (element instanceof ICElement) return ((ICElement)element).getCProject().getProject().isOpen(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java index 6a5a09c69a3..88929680e95 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java @@ -96,6 +96,7 @@ public class CustomFiltersDialog extends SelectionDialog { setShellStyle(getShellStyle() | SWT.RESIZE); } + @Override protected void configureShell(Shell shell) { setTitle(FilterMessages.getString("CustomFiltersDialog.title")); //$NON-NLS-1$ setMessage(FilterMessages.getString("CustomFiltersDialog.filterList.label")); //$NON-NLS-1$ @@ -108,6 +109,7 @@ public class CustomFiltersDialog extends SelectionDialog { * * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite) */ + @Override protected Control createDialogArea(Composite parent) { initializeDialogUnits(parent); // create a composite with standard margins and spacing @@ -143,6 +145,7 @@ public class CustomFiltersDialog extends SelectionDialog { fUserDefinedPatterns.setEnabled(fEnablePatterns); info.setEnabled(fEnablePatterns); fEnableUserDefinedPatterns.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean state= fEnableUserDefinedPatterns.getSelection(); fUserDefinedPatterns.setEnabled(state); @@ -231,6 +234,7 @@ public class CustomFiltersDialog extends SelectionDialog { Button selectButton= createButton(buttonComposite, IDialogConstants.SELECT_ALL_ID, label, false); SWTUtil.setButtonDimensionHint(selectButton); SelectionListener listener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fCheckBoxList.setAllChecked(true); fFilterDescriptorChangeHistory.clear(); @@ -246,6 +250,7 @@ public class CustomFiltersDialog extends SelectionDialog { Button deselectButton= createButton(buttonComposite, IDialogConstants.DESELECT_ALL_ID, label, false); SWTUtil.setButtonDimensionHint(deselectButton); listener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fCheckBoxList.setAllChecked(false); fFilterDescriptorChangeHistory.clear(); @@ -262,6 +267,7 @@ public class CustomFiltersDialog extends SelectionDialog { fCheckBoxList.setChecked(itemsToCheck.next(),true); } + @Override protected void okPressed() { if (fBuiltInFilters != null) { ArrayList result= new ArrayList(); @@ -277,9 +283,11 @@ public class CustomFiltersDialog extends SelectionDialog { private ILabelProvider createLabelPrivder() { return new LabelProvider() { + @Override public Image getImage(Object element) { return null; } + @Override public String getText(Object element) { if (element instanceof FilterDescriptor) return ((FilterDescriptor)element).getName(); @@ -291,6 +299,7 @@ public class CustomFiltersDialog extends SelectionDialog { // ---------- result handling ---------- + @Override protected void setResult(List newResult) { super.setResult(newResult); if (fUserDefinedPatterns.getText().length() > 0) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java index 50b997de61a..339ee8035d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java @@ -27,6 +27,7 @@ public class ExecutableFilter extends ViewerFilter { /* (non-Javadoc) * Method declared on ViewerFilter. */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof IBinary) { IBinary bin = (IBinary)element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java index 17439e709dd..a1d016abb13 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java @@ -47,6 +47,7 @@ public class FilterDescriptor implements Comparable { /** * @deprecated as of 3.0 use {@link FilterDescriptor#TARGET_ID_ATTRIBUTE} */ + @Deprecated private static final String VIEW_ID_ATTRIBUTE= "viewId"; //$NON-NLS-1$ private static final String TARGET_ID_ATTRIBUTE= "targetId"; //$NON-NLS-1$ private static final String CLASS_ATTRIBUTE= "class"; //$NON-NLS-1$ @@ -56,6 +57,7 @@ public class FilterDescriptor implements Comparable { /** * @deprecated use "enabled" instead */ + @Deprecated private static final String SELECTED_ATTRIBUTE= "selected"; //$NON-NLS-1$ private static FilterDescriptor[] fgFilterDescriptors; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/MacroDirectiveFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/MacroDirectiveFilter.java index 0ed9c062583..a8290851aff 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/MacroDirectiveFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/MacroDirectiveFilter.java @@ -23,6 +23,7 @@ public class MacroDirectiveFilter extends ViewerFilter { /* * @see ViewerFilter */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { return !(element instanceof IMacro); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java index 903b62bb2e4..11c6ec02f88 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java @@ -51,6 +51,7 @@ public class NamePatternFilter extends ViewerFilter { /* (non-Javadoc) * Method declared on ViewerFilter. */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { String matchName= null; if (element instanceof ICElement) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java index 58a976645e1..9051c5591fe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java @@ -33,6 +33,7 @@ public class NonCElementFilter extends ViewerFilter { * * @return Returns true if element should be included in filtered set */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { if (element instanceof ICElement) return true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java index d959ea38480..bae829aa3fe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java @@ -28,6 +28,7 @@ public class NonCProjectsFilter extends ViewerFilter { /* * @see ViewerFilter */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { if (element instanceof ICProject) { return true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java index 542bdd7d09b..b18681c3862 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java @@ -27,6 +27,7 @@ public class ObjectFilter extends ViewerFilter { /* (non-Javadoc) * Method declared on ViewerFilter. */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof IBinary) { IBinary bin = (IBinary)element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java index 0b9050d17a7..157fe27829d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java @@ -27,6 +27,7 @@ public class SharedFilter extends ViewerFilter { /* (non-Javadoc) * Method declared on ViewerFilter. */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (element instanceof IBinary) { IBinary bin = (IBinary)element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/UsingDirectiveFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/UsingDirectiveFilter.java index aa6002325bb..5a8cebc8541 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/UsingDirectiveFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/UsingDirectiveFilter.java @@ -23,6 +23,7 @@ public class UsingDirectiveFilter extends ViewerFilter { /* * @see ViewerFilter */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { return !(element instanceof IUsing); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java index 6a995749ae6..0b901a2453e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java @@ -105,6 +105,7 @@ public class CFunctionSummary implements IFunctionSummary { public boolean isStandard() { return std; } + @Override public String toString() { if (std) return "#include <" + iname + ">"; //$NON-NLS-1$ //$NON-NLS-2$ @@ -112,6 +113,7 @@ public class CFunctionSummary implements IFunctionSummary { return "#include \"" + iname + "\""; //$NON-NLS-1$ //$NON-NLS-2$ } } + @Override public String toString() { return " : " + getPrototype().getPrototypeString(false); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java index 922c62d0d54..c333b026072 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java @@ -163,6 +163,7 @@ public class CHelpBook implements ICHelpBook { } } + @Override public String toString() { return ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java index 2d3700d347b..5a4156d1bf6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java @@ -69,6 +69,7 @@ public class CHelpEntry { public IHelpResource[] getHelpResource() { return hts; } + @Override public String toString() { return ""; //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java index 8787c006e47..854f9be2422 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java @@ -32,6 +32,7 @@ public class CHelpTopic implements IHelpResource { public String getLabel() { return title; } + @Override public String toString() { return ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java index 20a9b24256f..44956c69468 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java @@ -52,6 +52,7 @@ public class IBFile { return fLocation; } + @Override public boolean equals(Object obj) { if (obj instanceof IBFile) { IBFile file = (IBFile) obj; @@ -61,6 +62,7 @@ public class IBFile { return super.equals(obj); } + @Override public int hashCode() { return CoreUtility.safeHashcode(fLocation) + 31* (CoreUtility.safeHashcode(fTU) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java index 0e3c6b96ac6..351e6c3229b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java @@ -48,6 +48,7 @@ public class IBHistoryAction extends Action { /* * @see Action#run() */ + @Override public void run() { fViewPart.setInput(fElement); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java index 6724a0e84af..0ff7cc42a63 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java @@ -34,6 +34,7 @@ public class IBHistoryDropDownAction extends Action implements IMenuCreator { fView= view; } + @Override public void run() { fView.setHistoryEntries(new ITranslationUnit[0]); fView.setInput(null); @@ -99,6 +100,7 @@ public class IBHistoryDropDownAction extends Action implements IMenuCreator { item.fill(parent, -1); } + @Override public void run() { (new IBHistoryListAction(fHierarchyView)).run(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java index 96304584782..4c60e427b67 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java @@ -36,6 +36,7 @@ public class IBSetInputJob extends Job { fDisplay= disp; } + @Override protected IStatus run(IProgressMonitor monitor) { if (CCorePlugin.getIndexManager().joinIndexer(IIndexManager.FOREVER, monitor)) { try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java index 7e45681d1f1..4153b8faa09 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java @@ -25,7 +25,8 @@ public class IBWorkingSetFilter extends ViewerFilter { fWorkingSetFilter= wsFilter; } - public boolean select(Viewer viewer, Object parentElement, Object element) { + @Override + public boolean select(Viewer viewer, Object parentElement, Object element) { if (parentElement instanceof IBNode && element instanceof IBNode) { IBNode node= (IBNode) element; if (!fWorkingSetFilter.isPartOfWorkingSet(node.getRepresentedTranslationUnit())) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java index bb976fa98d4..ca847e4774d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java @@ -39,10 +39,12 @@ public class OpenIncludeBrowserAction extends SelectionDispatchAction { setEnabled(fEditor != null && CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput()) != null); } + @Override public void run(ITextSelection sel) { IncludeBrowserUI.open(fEditor, sel); } + @Override public void run(IStructuredSelection selection) { if (!selection.isEmpty()) { Object selectedObject= selection.getFirstElement(); @@ -53,9 +55,11 @@ public class OpenIncludeBrowserAction extends SelectionDispatchAction { } } + @Override public void selectionChanged(ITextSelection sel) { } + @Override public void selectionChanged(IStructuredSelection selection) { if (selection.isEmpty()) { setEnabled(false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java index f6dfd5f3949..420427e708c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java @@ -41,6 +41,7 @@ public class CountNodeAction extends IndexAction { super(view, viewer, CUIPlugin.getResourceString("IndexView.CountSymbols.name")); //$NON-NLS-1$ } + @Override public boolean valid() { ISelection selection = viewer.getSelection(); if (!(selection instanceof IStructuredSelection)) @@ -59,6 +60,7 @@ public class CountNodeAction extends IndexAction { static final int DECLS = 4; static final int DEFS = 5; + @Override public void run() { final int[] count = new int[6]; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/DiscardExternalDefsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/DiscardExternalDefsAction.java index dc06d653111..e18847dbffa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/DiscardExternalDefsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/DiscardExternalDefsAction.java @@ -31,6 +31,7 @@ public class DiscardExternalDefsAction extends IndexAction { CPluginImages.setImageDescriptors(this, CPluginImages.T_LCL, "public_co.gif"); //$NON-NLS-1$ } + @Override public void run() { ISelection selection = viewer.getSelection(); if (!(selection instanceof IStructuredSelection)) @@ -38,6 +39,7 @@ public class DiscardExternalDefsAction extends IndexAction { indexView.toggleExternalDefs(); } + @Override public boolean valid() { return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java index dcf3a80afed..f5cf594eff3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java @@ -47,6 +47,7 @@ public class FindDeclarationsAction extends IndexAction { return null; } + @Override public void run() { IndexNode binding = getBindingNode(); if (binding != null) { @@ -64,6 +65,7 @@ public class FindDeclarationsAction extends IndexAction { } } + @Override public boolean valid() { return getBindingNode() != null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java index 6375f976fd4..66d774a97ab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java @@ -46,6 +46,7 @@ public class FindReferencesAction extends IndexAction { return null; } + @Override public void run() { IndexNode binding = getBindingNode(); if (binding != null) { @@ -63,6 +64,7 @@ public class FindReferencesAction extends IndexAction { } } + @Override public boolean valid() { return getBindingNode() != null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java index a035ece18ea..bfa3721ae61 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java @@ -58,6 +58,7 @@ import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; * @author Doug Schaefer */ public class IndexLabelProvider extends LabelProvider { + @Override public String getText(Object element) { if (element instanceof IndexNode) { return ((IndexNode) element).fText; @@ -65,6 +66,7 @@ public class IndexLabelProvider extends LabelProvider { return super.getText(element); } + @Override public Image getImage(Object element) { if (element instanceof IndexNode) { return ((IndexNode) element).fImage; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java index 03ef2698b70..8b874f7eb6f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java @@ -34,6 +34,7 @@ class IndexNode { return null; } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -43,6 +44,7 @@ class IndexNode { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java index ad55e2ed460..f18e9492ea5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java @@ -48,6 +48,7 @@ public class IndexViewSearchQuery extends PDOMSearchQuery { fName= name; } + @Override public IStatus runWithIndex(IIndex index, IProgressMonitor monitor) throws OperationCanceledException { try { if (CCoreInternals.getPDOMManager().getPDOM(fProject).getLastWriteAccess() == fLastWrite) { @@ -59,6 +60,7 @@ public class IndexViewSearchQuery extends PDOMSearchQuery { } } + @Override public String getLabel() { return super.getLabel() + " " + fName; //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java index fec40068609..677ad66ad74 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java @@ -61,6 +61,7 @@ public class OpenDefinitionAction extends IndexAction { return null; } + @Override public void run() { IndexNode bindingNode= getBindingNode(); if (bindingNode == null) { @@ -129,6 +130,7 @@ public class OpenDefinitionAction extends IndexAction { } } + @Override public boolean valid() { return getBindingNode() != null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/ToggleLinkingAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/ToggleLinkingAction.java index 750dc5dbc59..6edc204e973 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/ToggleLinkingAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/ToggleLinkingAction.java @@ -33,6 +33,7 @@ public class ToggleLinkingAction extends AbstractToggleLinkingAction { /** * Runs the action. */ + @Override public void run() { fCView.toggleLinking(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java index f67459310e1..7ca19e07c75 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java @@ -59,11 +59,13 @@ public abstract class ContentTypeMappingDialog extends Dialog { return fSelectedLanguageID; } + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(PreferencesMessages.ContentTypeMappingsDialog_title); } + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java index fa421ac9df8..9ceb2d34a12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java @@ -80,6 +80,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage { fLanguageIds = LanguageVerifier.computeAvailableLanguages(); } + @Override protected Control createContents(Composite parent) { IFile file = getFile(); IProject project = file.getProject(); @@ -105,6 +106,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage { Link link = new Link(fContents, SWT.NONE); link.setText(PreferencesMessages.FileLanguagesPropertyPage_description); link.addListener(SWT.Selection, new LanguageMappingLinkListener(parent.getShell(), project) { + @Override protected void refresh() { try { refreshMappings(); @@ -128,6 +130,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage { fTable.setHeaderVisible(true); fTable.setLinesVisible(true); fTable.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = PreferencesMessages.FileLanguagesPropertyPage_mappingTableTitle; } @@ -307,6 +310,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage { combo.select(0); } + @Override public boolean performOk() { try { if (!fHasChanges) { @@ -348,6 +352,7 @@ public class FileLanguageMappingPropertyPage extends PropertyPage { return (IFile) getElement().getAdapter(IFile.class); } + @Override protected void performDefaults() { super.performDefaults(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java index 0c810983dd9..fc678ad1dcc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java @@ -106,6 +106,7 @@ public abstract class LanguageMappingWidget { link.setText(description); link.addListener(SWT.Selection, new LanguageMappingLinkListener(fContents.getShell(), getElement()) { + @Override protected void refresh() { refreshMappings(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java index fe9148906d4..4becba3a8fd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java @@ -62,6 +62,7 @@ public class ProjectContentTypeMappingDialog extends ContentTypeMappingDialog { } } + @Override protected Control createDialogArea(Composite parent) { Composite area = new Composite(parent, SWT.NONE); area.setLayout(new GridLayout(2, false)); @@ -144,6 +145,7 @@ public class ProjectContentTypeMappingDialog extends ContentTypeMappingDialog { } } + @Override protected boolean isValidSelection() { return fContentType.getSelectionIndex() != -1 && fLanguage.getSelectionIndex() != -1 && fConfiguration.getSelectionIndex() != -1; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java index 86e1ee96ddc..1d4a05314d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java @@ -60,6 +60,7 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage { /** * @see PreferencePage#createContents(Composite) */ + @Override protected Control createContents(Composite parent) { fMappingWidget.setElement(getProject()); @@ -153,12 +154,14 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage { } } + @Override protected void performDefaults() { super.performDefaults(); fetchMappings(getProject()); fMappingWidget.refreshMappings(); } + @Override public boolean performOk() { try { if (!fMappingWidget.isChanged()) { @@ -176,6 +179,7 @@ public class ProjectLanguageMappingPropertyPage extends PropertyPage { } } + @Override public void dispose() { super.dispose(); LanguageManager.getInstance().unregisterLanguageChangeListener(fInheritedMappingsChangeListener); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java index 3c624d3f3f9..e9de8b3e10d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java @@ -67,6 +67,7 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget { return fConfigurationContentTypeMappings; } + @Override public Composite createContents(Composite parent, String description) { fContents = new Composite(parent, SWT.NONE); fContents.setLayout(new GridLayout(2, false)); @@ -82,6 +83,7 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget { fTable.setHeaderVisible(true); fTable.setLinesVisible(true); fTable.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = PreferencesMessages.ProjectLanguagesPropertyPage_mappingTableTitle; } @@ -198,6 +200,7 @@ public class ProjectLanguageMappingWidget extends LanguageMappingWidget { return filter; } + @Override public void refreshMappings() { if (fTable == null) { return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java index 27051a3cd0a..14f2d0194fc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java @@ -39,6 +39,7 @@ public class WorkspaceContentTypeMappingDialog extends ContentTypeMappingDialog fFilteredContentTypes = Collections.EMPTY_SET; } + @Override protected Control createDialogArea(Composite parent) { Composite area = new Composite(parent, SWT.NONE); area.setLayout(new GridLayout(2, false)); @@ -102,6 +103,7 @@ public class WorkspaceContentTypeMappingDialog extends ContentTypeMappingDialog fFilteredContentTypes = contentTypes; } + @Override protected boolean isValidSelection() { return fContentType.getSelectionIndex() != -1 && fLanguage.getSelectionIndex() != -1; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java index 10d7a0791c9..d6bf5f86579 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java @@ -39,6 +39,7 @@ public class WorkspaceLanguageMappingPreferencePage extends PreferencePage imple fMappingWidget = new WorkspaceLanguageMappingWidget(); } + @Override protected Control createContents(Composite parent) { try { fetchMappings(); @@ -67,6 +68,7 @@ public class WorkspaceLanguageMappingPreferencePage extends PreferencePage imple public void init(IWorkbench workbench) { } + @Override public boolean performOk() { try { if (!fMappingWidget.isChanged()) { @@ -86,6 +88,7 @@ public class WorkspaceLanguageMappingPreferencePage extends PreferencePage imple } } + @Override protected void performDefaults() { super.performDefaults(); try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java index e898b98f938..1257327097f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java @@ -49,6 +49,7 @@ public class WorkspaceLanguageMappingWidget extends LanguageMappingWidget { fContentTypeMappings = new TreeMap(); } + @Override public Composite createContents(Composite parent, String description) { fContents = new Composite(parent, SWT.NONE); fContents.setLayout(new GridLayout(2, false)); @@ -64,6 +65,7 @@ public class WorkspaceLanguageMappingWidget extends LanguageMappingWidget { fTable.setHeaderVisible(true); fTable.setLinesVisible(true); fTable.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = PreferencesMessages.WorkspaceLanguagesPreferencePage_mappingTableTitle; } @@ -138,6 +140,7 @@ public class WorkspaceLanguageMappingWidget extends LanguageMappingWidget { return fContents; } + @Override public void refreshMappings() { if (fTable == null) { return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java index 82dc9b5a7e8..36009808b0a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java @@ -78,16 +78,19 @@ public abstract class AbstractCNavigatorActionGroup extends ActionGroup { /* * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override public abstract void fillContextMenu(IMenuManager menu); /* * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ + @Override public abstract void fillActionBars(IActionBars actionBars); /* * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() */ + @Override public abstract void updateActionBars(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java index 733c14c929d..ff56dd068fb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java @@ -54,6 +54,7 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup { super(viewPart); } + @Override public void fillActionBars(IActionBars actionBars) { } @@ -70,6 +71,7 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup { * @param menu * context menu to add actions to */ + @Override public void fillContextMenu(IMenuManager menu) { IStructuredSelection selection= (IStructuredSelection) getContext().getSelection(); boolean isProjectSelection= true; @@ -138,11 +140,13 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup { return false; } + @Override protected void makeActions() { fCleanAction= new BuildAction(getViewPart().getSite(), IncrementalProjectBuilder.CLEAN_BUILD); fCleanAction.setText(CViewMessages.getString("CleanAction.label")); //$NON-NLS-1$ } + @Override public void updateActionBars() { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionProvider.java index 630d9efeb7b..8577d90e27f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionProvider.java @@ -31,6 +31,7 @@ public class CNavigatorBuildActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite) */ + @Override public void init(ICommonActionExtensionSite site) { ICommonViewerWorkbenchSite workbenchSite= null; if (site.getViewSite() instanceof ICommonViewerWorkbenchSite) { @@ -48,6 +49,7 @@ public class CNavigatorBuildActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#dispose() */ + @Override public void dispose() { if (fBuildGroup != null) { fBuildGroup.dispose(); @@ -59,6 +61,7 @@ public class CNavigatorBuildActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ + @Override public void fillActionBars(IActionBars actionBars) { if (fBuildGroup != null) { fBuildGroup.fillActionBars(actionBars); @@ -68,6 +71,7 @@ public class CNavigatorBuildActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override public void fillContextMenu(IMenuManager menu) { if (fBuildGroup != null) { fBuildGroup.fillContextMenu(menu); @@ -77,6 +81,7 @@ public class CNavigatorBuildActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext) */ + @Override public void setContext(ActionContext context) { super.setContext(context); if (fBuildGroup != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java index b73d2327299..967c6713ff2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java @@ -108,6 +108,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.cdt.ui.CElementContentProvider#dispose() */ + @Override public void dispose() { CUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(fPropertyChangeListener); // TLETODO [CN] use extension state model for view options persistence @@ -155,6 +156,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.cdt.ui.CElementContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { fRealInput= newInput; super.inputChanged(viewer, oldInput, findInputElement(newInput)); @@ -200,6 +202,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.cdt.internal.ui.BaseCElementContentProvider#getParent(java.lang.Object) */ + @Override public Object getParent(Object element) { Object parent= super.getParent(element); if (parent instanceof ICModel) { @@ -228,6 +231,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.cdt.internal.ui.BaseCElementContentProvider#getElements(java.lang.Object) */ + @Override public Object[] getElements(Object parent) { if (parent instanceof IWorkspaceRoot) { return ((IWorkspaceRoot)parent).getProjects(); @@ -240,6 +244,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.cdt.internal.ui.cview.CViewContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object element) { Object children[]; if (element instanceof IWorkspaceRoot) { @@ -255,6 +260,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I /* * @see org.eclipse.cdt.internal.ui.cview.CViewContentProvider#hasChildren(java.lang.Object) */ + @Override public boolean hasChildren(Object element) { if (element instanceof IProject) { IProject project= (IProject) element; @@ -431,9 +437,11 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I return false; } + @Override protected void postContainerRefresh(final IParent container, final ICProject cproject) { postRefreshable(new RefreshContainer(container, cproject.getProject())); } + @Override protected void postRefresh(final Object element) { if (element instanceof ICModel) { // don't refresh workspace root @@ -450,6 +458,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I } } + @Override protected void postAdd(final Object parent, final Object element) { if (parent instanceof ICModel) { if (element instanceof ICElement) { @@ -471,10 +480,12 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I } } + @Override protected void postRemove(final Object element) { postRefresh(internalGetParent(element)); } + @Override protected void postProjectStateChanged(final Object element) { if (element instanceof ICModel) { super.postProjectStateChanged(fRealInput); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java index fe100e5cef2..4ff76d51ec2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java @@ -33,6 +33,7 @@ public class CNavigatorDragAdapterAssistant extends CommonDragAdapterAssistant { /* * @see org.eclipse.ui.navigator.CommonDragAdapterAssistant#getSupportedTransferTypes() */ + @Override public Transfer[] getSupportedTransferTypes() { Transfer[] transfers= new Transfer[] { LocalSelectionTransfer.getTransfer() @@ -43,6 +44,7 @@ public class CNavigatorDragAdapterAssistant extends CommonDragAdapterAssistant { /* * @see org.eclipse.ui.navigator.CommonDragAdapterAssistant#setDragData(org.eclipse.swt.dnd.DragSourceEvent, org.eclipse.jface.viewers.IStructuredSelection) */ + @Override public boolean setDragData(DragSourceEvent event, IStructuredSelection selection) { if (selection != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java index e7f60cf7be6..89fa2f11fc2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java @@ -65,6 +65,7 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant { /* * @see org.eclipse.ui.navigator.CommonDropAdapterAssistant#isSupportedType(org.eclipse.swt.dnd.TransferData) */ + @Override public boolean isSupportedType(TransferData transferType) { return super.isSupportedType(transferType) || ResourceTransfer.getInstance().isSupportedType(transferType) @@ -74,6 +75,7 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant { /* * @see org.eclipse.ui.navigator.CommonDropAdapterAssistant#handleDrop(org.eclipse.ui.navigator.CommonDropAdapter, org.eclipse.swt.dnd.DropTargetEvent, java.lang.Object) */ + @Override public IStatus handleDrop(CommonDropAdapter dropAdapter, DropTargetEvent event, Object target) { @@ -162,6 +164,7 @@ public class CNavigatorDropAdapterAssistant extends CommonDropAdapterAssistant { /* * @see org.eclipse.ui.navigator.CommonDropAdapterAssistant#validateDrop(java.lang.Object, int, org.eclipse.swt.dnd.TransferData) */ + @Override public IStatus validateDrop(Object target, int operation, TransferData transferType) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java index bcf28544e29..97ac405ea30 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java @@ -58,6 +58,7 @@ public class CNavigatorEditActionGroup extends ActionGroup { makeActions(); } + @Override public void dispose() { if (clipboard != null) { clipboard.dispose(); @@ -66,6 +67,7 @@ public class CNavigatorEditActionGroup extends ActionGroup { super.dispose(); } + @Override public void fillContextMenu(IMenuManager menu) { IStructuredSelection selection = (IStructuredSelection) getContext() .getSelection(); @@ -87,6 +89,7 @@ public class CNavigatorEditActionGroup extends ActionGroup { } } + @Override public void fillActionBars(IActionBars actionBars) { if (textActionHandler == null) { @@ -133,6 +136,7 @@ public class CNavigatorEditActionGroup extends ActionGroup { deleteAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.DELETE); } + @Override public void updateActionBars() { IStructuredSelection selection = (IStructuredSelection) getContext() .getSelection(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java index b3428cd04d7..423d88ae2f0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java @@ -32,6 +32,7 @@ public class CNavigatorEditActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite) */ + @Override public void init(ICommonActionExtensionSite anActionSite) { fSite = anActionSite; fEditGroup = new CNavigatorEditActionGroup(fSite.getViewSite().getShell()); @@ -40,6 +41,7 @@ public class CNavigatorEditActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#dispose() */ + @Override public void dispose() { fEditGroup.dispose(); } @@ -47,6 +49,7 @@ public class CNavigatorEditActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ + @Override public void fillActionBars(IActionBars actionBars) { fEditGroup.fillActionBars(actionBars); } @@ -54,6 +57,7 @@ public class CNavigatorEditActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override public void fillContextMenu(IMenuManager menu) { fEditGroup.fillContextMenu(menu); } @@ -61,6 +65,7 @@ public class CNavigatorEditActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext) */ + @Override public void setContext(ActionContext context) { if (context != null) { // convert non-IResource to IResources on the fly @@ -74,6 +79,7 @@ public class CNavigatorEditActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() */ + @Override public void updateActionBars() { fEditGroup.updateActionBars(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java index 981e6a07b1e..5a2a2943dd0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java @@ -33,6 +33,7 @@ public class CNavigatorOpenActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite) */ + @Override public void init(ICommonActionExtensionSite site) { ICommonViewerWorkbenchSite workbenchSite = null; if (site.getViewSite() instanceof ICommonViewerWorkbenchSite) { @@ -50,6 +51,7 @@ public class CNavigatorOpenActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#dispose() */ + @Override public void dispose() { if (fOpenGroup != null) { fOpenGroup.dispose(); @@ -61,6 +63,7 @@ public class CNavigatorOpenActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ + @Override public void fillActionBars(IActionBars actionBars) { if (fOpenGroup != null) { fOpenGroup.updateActionBars(); @@ -74,6 +77,7 @@ public class CNavigatorOpenActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override public void fillContextMenu(IMenuManager menu) { if (fOpenGroup != null) { fOpenGroup.fillContextMenu(menu); @@ -83,6 +87,7 @@ public class CNavigatorOpenActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext) */ + @Override public void setContext(ActionContext context) { super.setContext(context); if (fOpenGroup != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java index 4cc749c8f7d..a5e551993f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java @@ -61,10 +61,12 @@ public class CNavigatorOpenEditorActionGroup extends AbstractCNavigatorActionGro super(viewPart); } + @Override protected void makeActions() { fOpenFileAction= new OpenCElementAction(getViewPart().getSite().getPage()); } + @Override public void fillContextMenu(IMenuManager menu) { IStructuredSelection celements= (IStructuredSelection) getContext().getSelection(); IStructuredSelection selection= SelectionConverter.convertSelectionToResources(celements); @@ -132,13 +134,15 @@ public class CNavigatorOpenEditorActionGroup extends AbstractCNavigatorActionGro /* * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ - public void fillActionBars(IActionBars actionBars) { + @Override + public void fillActionBars(IActionBars actionBars) { } /* * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() */ - public void updateActionBars() { + @Override + public void updateActionBars() { IStructuredSelection celements= (IStructuredSelection) getContext().getSelection(); fOpenFileAction.selectionChanged(celements); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java index 2a47124c58a..f15a014c311 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java @@ -29,6 +29,7 @@ public class CNavigatorOpenViewActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite) */ + @Override public void init(ICommonActionExtensionSite site) { ICommonViewerWorkbenchSite workbenchSite= null; if (site.getViewSite() instanceof ICommonViewerWorkbenchSite) { @@ -46,6 +47,7 @@ public class CNavigatorOpenViewActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#dispose() */ + @Override public void dispose() { if (fOpenViewActionGroup != null) { fOpenViewActionGroup.dispose(); @@ -57,6 +59,7 @@ public class CNavigatorOpenViewActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ + @Override public void fillActionBars(IActionBars actionBars) { if (fOpenViewActionGroup != null) { fOpenViewActionGroup.fillActionBars(actionBars); @@ -66,6 +69,7 @@ public class CNavigatorOpenViewActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override public void fillContextMenu(IMenuManager menu) { if (fOpenViewActionGroup != null) { ISelection selection = getContext().getSelection(); @@ -78,6 +82,7 @@ public class CNavigatorOpenViewActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext) */ + @Override public void setContext(ActionContext context) { super.setContext(context); if (fOpenViewActionGroup != null) { @@ -88,6 +93,7 @@ public class CNavigatorOpenViewActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() */ + @Override public void updateActionBars() { if (fOpenViewActionGroup != null) { fOpenViewActionGroup.updateActionBars(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java index 43f5b4a68d7..4e14f066228 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java @@ -32,6 +32,7 @@ public class CNavigatorProblemsLabelDecorator extends ProblemsLabelDecorator { /* * @see org.eclipse.cdt.internal.ui.viewsupport.ProblemsLabelDecorator#fireProblemsChanged(org.eclipse.core.resources.IResource[], boolean) */ + @Override protected void fireProblemsChanged(IResource[] changedResources, boolean isMarkerChange) { // performance: if the number of changed resources is large, it is faster diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java index 10c6d1c0ea1..2edae2027d1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java @@ -51,6 +51,7 @@ public class CNavigatorRefactorActionGroup extends ActionGroup { makeActions(); } + @Override public void fillContextMenu(IMenuManager menu) { IStructuredSelection selection = (IStructuredSelection)getContext().getSelection(); boolean anyResourceSelected = !selection.isEmpty() @@ -65,6 +66,7 @@ public class CNavigatorRefactorActionGroup extends ActionGroup { } } + @Override public void fillActionBars(IActionBars actionBars) { updateActionBars(); @@ -81,6 +83,7 @@ public class CNavigatorRefactorActionGroup extends ActionGroup { renameAction.setActionDefinitionId(IWorkbenchActionDefinitionIds.RENAME); } + @Override public void updateActionBars() { IStructuredSelection selection = (IStructuredSelection) getContext().getSelection(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorSearchActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorSearchActionProvider.java index 929b9cb4b25..1200b98e55f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorSearchActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorSearchActionProvider.java @@ -32,6 +32,7 @@ public class CNavigatorSearchActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.navigator.CommonActionProvider#init(org.eclipse.ui.navigator.ICommonActionExtensionSite) */ + @Override public void init(ICommonActionExtensionSite site) { ICommonViewerWorkbenchSite workbenchSite= null; if (site.getViewSite() instanceof ICommonViewerWorkbenchSite) { @@ -47,6 +48,7 @@ public class CNavigatorSearchActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#dispose() */ + @Override public void dispose() { if (fSearchGroup != null) { fSearchGroup.dispose(); @@ -58,6 +60,7 @@ public class CNavigatorSearchActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) */ + @Override public void fillActionBars(IActionBars actionBars) { if (fSearchGroup != null) { fSearchGroup.fillActionBars(actionBars); @@ -67,6 +70,7 @@ public class CNavigatorSearchActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ + @Override public void fillContextMenu(IMenuManager menu) { if (fSearchGroup != null) { ISelection selection = getContext().getSelection(); @@ -79,6 +83,7 @@ public class CNavigatorSearchActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext) */ + @Override public void setContext(ActionContext context) { super.setContext(context); if (fSearchGroup != null) { @@ -89,6 +94,7 @@ public class CNavigatorSearchActionProvider extends CommonActionProvider { /* * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() */ + @Override public void updateActionBars() { if (fSearchGroup != null) { fSearchGroup.updateActionBars(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java index 2b56bb83402..5a17e8bf444 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java @@ -44,6 +44,7 @@ public class OpenCElementAction extends OpenFileAction { /* * @see org.eclipse.ui.actions.OpenSystemEditorAction#run() */ + @Override public void run() { if (fOpenElement != null) { IEditorPart part; @@ -63,6 +64,7 @@ public class OpenCElementAction extends OpenFileAction { /* * @see org.eclipse.ui.actions.OpenSystemEditorAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) */ + @Override protected boolean updateSelection(IStructuredSelection selection) { fOpenElement = null; if (selection.size() == 1) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java index 23557e22844..559604c5fb7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java @@ -76,6 +76,7 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo private Set fSections= new HashSet(); private boolean fIsBeingManaged= false; private ExpansionAdapter fListener= new ExpansionAdapter() { + @Override public void expansionStateChanged(ExpansionEvent e) { ExpandableComposite source= (ExpandableComposite) e.getSource(); updateSectionStyle(source); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java index 60c3b9e7dd3..e5179cb9e82 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java @@ -61,6 +61,7 @@ public abstract class AbstractConfigurationBlockPreferencePage extends Preferenc /* * @see PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), getHelpId()); @@ -69,6 +70,7 @@ public abstract class AbstractConfigurationBlockPreferencePage extends Preferenc /* * @see PreferencePage#createContents(Composite) */ + @Override protected Control createContents(Composite parent) { fOverlayStore.load(); @@ -89,6 +91,7 @@ public abstract class AbstractConfigurationBlockPreferencePage extends Preferenc /* * @see PreferencePage#performOk() */ + @Override public boolean performOk() { fConfigurationBlock.performOk(); @@ -103,6 +106,7 @@ public abstract class AbstractConfigurationBlockPreferencePage extends Preferenc /* * @see PreferencePage#performDefaults() */ + @Override public void performDefaults() { fOverlayStore.loadDefaults(); @@ -114,6 +118,7 @@ public abstract class AbstractConfigurationBlockPreferencePage extends Preferenc /* * @see DialogPage#dispose() */ + @Override public void dispose() { fConfigurationBlock.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java index c87026b83eb..f1b402f3268 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java @@ -355,6 +355,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I /* * @see PreferencePage#performOk() */ + @Override public boolean performOk() { fOverlayStore.propagate(); CUIPlugin.getDefault().savePluginPreferences(); @@ -364,6 +365,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I /* * @see PreferencePage#performDefaults() */ + @Override protected void performDefaults() { fOverlayStore.loadDefaults(); initializeFields(); @@ -373,6 +375,7 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I /* * @see DialogPage#dispose() */ + @Override public void dispose() { if (fOverlayStore != null) { fOverlayStore.stop(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java index c17405c373c..5dd58801765 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java @@ -91,6 +91,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben /* * @see PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.APPEARANCE_PREFERENCE_PAGE); @@ -99,6 +100,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben /* * @see PreferencePage#createContents(Composite) */ + @Override protected Control createContents(Composite parent) { initializeDialogUnits(parent); int nColumns= 1; @@ -154,6 +156,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben /* * @see IPreferencePage#performOk() */ + @Override public boolean performOk() { IPreferenceStore prefs= getPreferenceStore(); prefs.setValue(PreferenceConstants.PREF_SHOW_CU_CHILDREN, fShowTUChildren.isSelected()); @@ -168,6 +171,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben /* * @see PreferencePage#performDefaults() */ + @Override protected void performDefaults() { IPreferenceStore prefs= getPreferenceStore(); fShowTUChildren.setSelection(prefs.getDefaultBoolean(PreferenceConstants.PREF_SHOW_CU_CHILDREN)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java index 51f6a4e6019..efa7d494ca2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java @@ -45,6 +45,7 @@ public class BuildConsolePreferencePage extends FieldEditorPreferencePage implem setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); } + @Override protected void createFieldEditors() { Composite parent = getFieldEditorParent(); BooleanFieldEditor clearConsole = new BooleanFieldEditor(PREF_CLEAR_CONSOLE, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java index 777e169cf8a..6218c723a18 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java @@ -196,6 +196,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock { /* * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { if (element instanceof String) return (String) element; @@ -472,6 +473,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock { return Dialog.convertHeightInCharsToPixels(fFontMetrics, chars); } + @Override public void initialize() { super.initialize(); @@ -479,6 +481,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock { fListViewer.setSelection(new StructuredSelection(fCodeCategory)); } + @Override public void performDefaults() { super.performDefaults(); @@ -495,6 +498,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.IPreferenceConfigurationBlock#dispose() */ + @Override public void dispose() { uninstallSemanticHighlighting(); fColorManager.dispose(); @@ -554,6 +558,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock { Link link= new Link(colorComposite, SWT.NONE); link.setText(PreferencesMessages.CEditorColoringConfigurationBlock_link); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(parent.getShell(), e.text, null, null); } @@ -591,6 +596,7 @@ class CEditorColoringConfigurationBlock extends AbstractConfigurationBlock { fListViewer.setLabelProvider(new ColorListLabelProvider()); fListViewer.setContentProvider(new ColorListContentProvider()); fListViewer.setSorter(new ViewerSorter() { + @Override public int category(Object element) { // don't sort the top level categories if (fCodeCategory.equals(element)) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java index 65dab2b4554..789f346d405 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java @@ -34,6 +34,7 @@ public class CEditorColoringPreferencePage extends AbstractConfigurationBlockPre /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() */ + @Override protected String getHelpId() { return ICHelpContextIds.C_EDITOR_COLORS_PREF_PAGE; } @@ -41,12 +42,14 @@ public class CEditorColoringPreferencePage extends AbstractConfigurationBlockPre /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() */ + @Override protected void setDescription() { String description= PreferencesMessages.CEditorPreferencePage_colors; setDescription(description); } + @Override protected Label createDescriptionLabel(Composite parent) { return null; } @@ -54,6 +57,7 @@ public class CEditorColoringPreferencePage extends AbstractConfigurationBlockPre /* * @see org.org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() */ + @Override protected void setPreferenceStore() { setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); } @@ -61,6 +65,7 @@ public class CEditorColoringPreferencePage extends AbstractConfigurationBlockPre /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new CEditorColoringConfigurationBlock(overlayPreferenceStore); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java index b9a006bdf40..80c6fd3d15c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java @@ -27,6 +27,7 @@ public final class CEditorHoverPreferencePage extends AbstractConfigurationBlock /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() */ + @Override protected String getHelpId() { return ICHelpContextIds.C_EDITOR_HOVERS_PAGE; } @@ -34,6 +35,7 @@ public final class CEditorHoverPreferencePage extends AbstractConfigurationBlock /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() */ + @Override protected void setDescription() { String description= PreferencesMessages.CEditorPreferencePage_hover_title; setDescription(description); @@ -42,11 +44,13 @@ public final class CEditorHoverPreferencePage extends AbstractConfigurationBlock /* * @see org.org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() */ + @Override protected void setPreferenceStore() { setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); } + @Override protected Label createDescriptionLabel(Composite parent) { return null; // no description for new look. } @@ -54,6 +58,7 @@ public final class CEditorHoverPreferencePage extends AbstractConfigurationBlock /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new CEditorHoverConfigurationBlock(this, overlayPreferenceStore); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java index e9158895a21..28e9e3828af 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java @@ -73,6 +73,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo super(); } + @Override protected OverlayPreferenceStore.OverlayKey[] createOverlayStoreKeys() { ArrayList overlayKeys = new ArrayList(); @@ -107,6 +108,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo /* * @see PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.C_EDITOR_PREF_PAGE); @@ -190,6 +192,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo foregroundColorButton.setLayoutData(gd); SelectionListener colorDefaultSelectionListener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean systemDefault= fAppearanceColorDefault.getSelection(); fAppearanceColorEditor.getButton().setEnabled(!systemDefault); @@ -211,11 +214,13 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo fAppearanceColorDefault.addSelectionListener(colorDefaultSelectionListener); fAppearanceColorList.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleAppearanceColorListSelection(); } }); foregroundColorButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { int i = fAppearanceColorList.getSelectionIndex(); String key = fAppearanceColorListModel[i][1]; @@ -270,6 +275,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo /* * @see PreferencePage#createContents(Composite) */ + @Override protected Control createContents(Composite parent) { fOverlayStore.load(); fOverlayStore.start(); @@ -310,6 +316,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo /* * @see org.eclipse.cdt.internal.ui.preferences.AbstractPreferencePage#performOk() */ + @Override public boolean performOk() { DocCommentOwnerManager.getInstance().setWorkspaceCommentOwner(fDocCommentOwnerComposite.getSelectedDocCommentOwner()); return super.performOk(); @@ -328,6 +335,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo /* * @see org.eclipse.cdt.internal.ui.preferences.AbstractPreferencePage#performDefaults() */ + @Override protected void performDefaults() { super.performDefaults(); initializeDefaultColors(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeAssociation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeAssociation.java index 4e5ace6fd1e..09cb7b6df93 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeAssociation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeAssociation.java @@ -26,6 +26,7 @@ public class CFileTypeAssociation { private int fType; private IContentType fContentType; + @Override public int hashCode() { final int PRIME = 31; int result = 1; @@ -35,6 +36,7 @@ public class CFileTypeAssociation { return result; } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java index 7e16d1e3e4e..eb97e629af9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java @@ -43,11 +43,13 @@ public class CFileTypeDialog extends Dialog { private String fPattern; private IContentType fType; + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); newShell.setText(PreferencesMessages.CFileTypeDialog_title); } + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); @@ -55,6 +57,7 @@ public class CFileTypeDialog extends Dialog { getOkayButton().setEnabled(getPatternFromControl().length() > 0); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); ((GridLayout) composite.getLayout()).numColumns = 2; @@ -158,6 +161,7 @@ public class CFileTypeDialog extends Dialog { return type; } + @Override protected void okPressed() { fPattern = getPatternFromControl(); fType = getTypeFromControl(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java index ac197c4baa7..9a30848ad4b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java @@ -78,6 +78,7 @@ public class CFileTypesPreferenceBlock { private Button fBtnRemove; private class AssocSorter extends ViewerSorter { + @Override public int category(Object element) { if (element instanceof CFileTypeAssociation) { CFileTypeAssociation assoc = (CFileTypeAssociation) element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java index 0c36537b22b..19ec15e3da9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java @@ -40,6 +40,7 @@ public class CFileTypesPreferencePage extends PreferencePage implements IWorkben /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Composite topPane = new Composite(parent, SWT.NONE); @@ -61,6 +62,7 @@ public class CFileTypesPreferencePage extends PreferencePage implements IWorkben /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { super.performDefaults(); } @@ -68,6 +70,7 @@ public class CFileTypesPreferencePage extends PreferencePage implements IWorkben /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { if (fPrefsBlock.performOk()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java index 2f65103352e..a08407397f5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java @@ -62,6 +62,7 @@ public class CFileTypesPropertyPage extends PropertyPage { return new IContentTypeManager.ContentTypeChangeEvent(source, context); } + @Override public boolean performOk() { boolean changed = super.performOk(); if (changed) { @@ -78,6 +79,7 @@ public class CFileTypesPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.CFileTypesPreferenceBlock#addAssociation(org.eclipse.core.runtime.preferences.IScopeContext, org.eclipse.core.runtime.content.IContentType, java.lang.String, int) */ + @Override protected void addAssociation(IScopeContext context, IContentType contentType, String spec, int type) { super.addAssociation(context, contentType, spec, type); // accumulate the events @@ -87,6 +89,7 @@ public class CFileTypesPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.CFileTypesPreferenceBlock#removeAssociation(org.eclipse.core.runtime.preferences.IScopeContext, org.eclipse.core.runtime.content.IContentType, java.lang.String, int) */ + @Override protected void removeAssociation(IScopeContext context, IContentType contentType, String spec, int type) { super.removeAssociation(context, contentType, spec, type); // accumulate the events @@ -107,6 +110,7 @@ public class CFileTypesPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Composite topPane = new Composite(parent, SWT.NONE); @@ -169,6 +173,7 @@ public class CFileTypesPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ + @Override protected void performDefaults() { fUseWorkspace.setSelection(true); fUseProject.setSelection(false); @@ -180,6 +185,7 @@ public class CFileTypesPropertyPage extends PropertyPage { /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { boolean useProjectContentTypes= fUseProject.getSelection(); IProject project = getProject(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java index f0de907ff4b..4ab99c75b67 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java @@ -38,6 +38,7 @@ import org.eclipse.ui.IWorkbenchPreferencePage; * @deprecated the one preference found on the page was moved to the * indexer preference page. */ +@Deprecated public class CParserPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { @@ -62,6 +63,7 @@ public class CParserPreferencePage extends PreferencePage implements /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { fOverlayStore.load(); fOverlayStore.start(); @@ -120,6 +122,7 @@ public class CParserPreferencePage extends PreferencePage implements /* * @see IPreferencePage#performOk() */ + @Override public boolean performOk() { Preferences prefs = CCorePlugin.getDefault().getPluginPreferences(); @@ -162,6 +165,7 @@ public class CParserPreferencePage extends PreferencePage implements /* * @see PreferencePage#performDefaults() */ + @Override protected void performDefaults() { fOverlayStore.loadDefaults(); initialize(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java index cc0e3a82b2e..a3faf0cac14 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java @@ -50,6 +50,7 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); } + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.C_PREF_PAGE); @@ -58,6 +59,7 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements /** * @see FieldEditorPreferencePage#createControl(Composite) */ + @Override protected void createFieldEditors() { Composite parent= getFieldEditorParent(); @@ -164,6 +166,7 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { if (!super.performOk()) return false; @@ -173,7 +176,8 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements return true; } - protected void performDefaults() { + @Override + protected void performDefaults() { super.performDefaults(); ACBuilder.setAllConfigBuild(false); b1.setSelection(true); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java index 28c818848a0..e636a3c7cbb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java @@ -61,11 +61,13 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { /* * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage.EditTemplateDialog#createViewer(org.eclipse.swt.widgets.Composite) */ + @Override protected SourceViewer createViewer(Composite parent) { IPreferenceStore store= CUIPlugin.getDefault().getCombinedPreferenceStore(); CSourceViewer viewer= new CSourceViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL, store); CTextTools tools= CUIPlugin.getDefault().getTextTools(); CSourceViewerConfiguration configuration= new CSourceViewerConfiguration(tools.getColorManager(), store, null, tools.getDocumentPartitioning()) { + @Override public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { ContentAssistant assistant= new ContentAssistant(); assistant.enableAutoActivation(true); @@ -100,6 +102,7 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { /* * @see PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.TEMPLATE_PREFERENCE_PAGE); @@ -108,6 +111,7 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { /* * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#getFormatterPreferenceKey() */ + @Override protected String getFormatterPreferenceKey() { return PreferenceConstants.TEMPLATES_USE_CODEFORMATTER; } @@ -115,6 +119,7 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { /* * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createTemplateEditDialog2(org.eclipse.jface.text.templates.Template, boolean, boolean) */ + @Override protected Template editTemplate(Template template, boolean edit, boolean isNameModifiable) { CEditTemplateDialog dialog= new CEditTemplateDialog(getShell(), template, edit, isNameModifiable, getContextTypeRegistry()); if (dialog.open() == Window.OK) { @@ -126,6 +131,7 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { /* * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { boolean ok= super.performOk(); CUIPlugin.getDefault().savePluginPreferences(); @@ -135,6 +141,7 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { /* * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createViewer(org.eclipse.swt.widgets.Composite) */ + @Override protected SourceViewer createViewer(Composite parent) { IPreferenceStore store= CUIPlugin.getDefault().getCombinedPreferenceStore(); CSourceViewer viewer= new CSourceViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL, store); @@ -155,6 +162,7 @@ public class CTemplatePreferencePage extends TemplatePreferencePage { control.setLayoutData(data); control.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { e.result = PreferencesMessages.TemplatePreferencePage_Viewer_preview; }}); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java index a8f3c4f15b1..90efbd6baf1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java @@ -117,6 +117,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { return getColumnText(element, 0); // needed to make the sorter work } @@ -344,6 +345,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { ScrolledPageContent scrolled= new ScrolledPageContent(parent, SWT.H_SCROLL | SWT.V_SCROLL); @@ -452,6 +454,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo Link link= new Link(composite, SWT.NONE | SWT.WRAP); link.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_key_binding_hint); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(getShell(), e.text, null, null); } @@ -523,6 +526,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo }); table.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleTableSelection(); } @@ -542,7 +546,8 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo fUpButton= new Button(composite, SWT.PUSH | SWT.CENTER); fUpButton.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_Up); fUpButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { int index= getSelectionIndex(); if (index != -1) { ((ModelElement) fModel.elements.get(index)).moveUp(); @@ -557,7 +562,8 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo fDownButton= new Button(composite, SWT.PUSH | SWT.CENTER); fDownButton.setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_Down); fDownButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { int index= getSelectionIndex(); if (index != -1) { ((ModelElement) fModel.elements.get(index)).moveDown(); @@ -593,6 +599,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#updateControls() */ + @Override protected void updateControls() { super.updateControls(); @@ -623,6 +630,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#processChanges(org.eclipse.ui.preferences.IWorkbenchPreferenceContainer) */ + @Override protected boolean processChanges(IWorkbenchPreferenceContainer container) { for (Iterator it= fModel.elements.iterator(); it.hasNext();) { ModelElement item= (ModelElement) it.next(); @@ -635,6 +643,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#validateSettings(org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock.Key, java.lang.String, java.lang.String) */ + @Override protected void validateSettings(Key changedKey, String oldValue, String newValue) { } @@ -649,6 +658,7 @@ final class CodeAssistAdvancedConfigurationBlock extends OptionsConfigurationBlo /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#dispose() */ + @Override public void dispose() { for (Iterator it= fImages.values().iterator(); it.hasNext();) { Image image= (Image) it.next(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java index f2711eee80b..554a1615d7e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java @@ -25,6 +25,7 @@ public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferenc private CodeAssistAdvancedConfigurationBlock fConfigurationBlock; + @Override public void createControl(Composite parent) { IWorkbenchPreferenceContainer container= (IWorkbenchPreferenceContainer) getContainer(); fConfigurationBlock= new CodeAssistAdvancedConfigurationBlock(getNewStatusChangedListener(), container); @@ -33,18 +34,22 @@ public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferenc PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.C_EDITOR_PREF_PAGE); } + @Override protected Control createPreferenceContent(Composite composite) { return fConfigurationBlock.createContents(composite); } + @Override protected boolean hasProjectSpecificOptions(IProject project) { return false; } + @Override protected String getPreferencePageID() { return "org.eclipse.cdt.ui.preferences.CodeAssistPreferenceAdvanced"; //$NON-NLS-1$ } + @Override protected String getPropertyPageID() { // no project settings supported return null; @@ -53,6 +58,7 @@ public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferenc /* * @see org.eclipse.jface.dialogs.DialogPage#dispose() */ + @Override public void dispose() { if (fConfigurationBlock != null) { fConfigurationBlock.dispose(); @@ -63,6 +69,7 @@ public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferenc /* * @see org.eclipse.jface.preference.IPreferencePage#performDefaults() */ + @Override protected void performDefaults() { super.performDefaults(); if (fConfigurationBlock != null) { @@ -73,6 +80,7 @@ public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferenc /* * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { if (fConfigurationBlock != null && !fConfigurationBlock.performOk()) { return false; @@ -83,6 +91,7 @@ public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferenc /* * @see org.eclipse.jface.preference.IPreferencePage#performApply() */ + @Override public void performApply() { if (fConfigurationBlock != null) { fConfigurationBlock.performApply(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java index 9dadb550140..a740a57a36f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java @@ -40,6 +40,7 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { //setDescription(PreferencesMessages.getString("CodeAssistPreferencePage.description")); //$NON-NLS-1$ } + @Override protected OverlayPreferenceStore.OverlayKey[] createOverlayStoreKeys() { ArrayList overlayKeys = new ArrayList(); @@ -66,6 +67,7 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { /* * @see PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.C_EDITOR_CONTENT_ASSIST_PREF_PAGE); @@ -74,6 +76,7 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { fOverlayStore.load(); fOverlayStore.start(); @@ -146,6 +149,7 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { /* (non-Javadoc) * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ + @Override public void init(IWorkbench workbench) { // TODO Auto-generated method stub } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java index 43cc5d0dc25..792ec6cd22c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java @@ -47,6 +47,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { IPreferencePageContainer container= getContainer(); IWorkingCopyManager workingCopyManager; @@ -65,6 +66,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#createPreferenceContent(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createPreferenceContent(Composite composite) { return fConfigurationBlock.createContents(composite); } @@ -72,6 +74,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#hasProjectSpecificOptions(org.eclipse.core.resources.IProject) */ + @Override protected boolean hasProjectSpecificOptions(IProject project) { return fConfigurationBlock.hasProjectSpecificOptions(project); } @@ -79,6 +82,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#enableProjectSpecificSettings(boolean) */ + @Override protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) { super.enableProjectSpecificSettings(useProjectSpecificSettings); if (fConfigurationBlock != null) { @@ -89,6 +93,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID() */ + @Override protected String getPreferencePageID() { return PREF_ID; } @@ -96,6 +101,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID() */ + @Override protected String getPropertyPageID() { return PROP_ID; } @@ -103,6 +109,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.dialogs.DialogPage#dispose() */ + @Override public void dispose() { if (fConfigurationBlock != null) { fConfigurationBlock.dispose(); @@ -113,6 +120,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.preference.IPreferencePage#performDefaults() */ + @Override protected void performDefaults() { if (fConfigurationBlock != null) { fConfigurationBlock.performDefaults(); @@ -123,6 +131,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { if (fConfigurationBlock != null && !fConfigurationBlock.performOk()) { return false; @@ -133,6 +142,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public void performApply() { if (fConfigurationBlock != null) { fConfigurationBlock.performApply(); @@ -143,6 +153,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#setElement(org.eclipse.core.runtime.IAdaptable) */ + @Override public void setElement(IAdaptable element) { super.setElement(element); setDescription(null); // no description for property page diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java index 5e0c82f0fb0..f99e53e8ab6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java @@ -149,6 +149,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object) */ + @Override public int category(Object element) { if (element == COMMENT_NODE) { return 1; @@ -208,6 +209,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { // if (element == COMMENT_NODE || element == CODE_NODE || element == FILE_NODE) { // return null; @@ -245,6 +247,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { if (element == COMMENT_NODE || element == CODE_NODE || element == FILE_NODE) { return (String) element; @@ -359,6 +362,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { fCodeTemplateTree.postSetSelection(new StructuredSelection(element)); } + @Override public boolean hasProjectSpecificOptions(IProject project) { if (super.hasProjectSpecificOptions(project)) return true; @@ -369,6 +373,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { return false; } + @Override protected Control createContents(Composite parent) { fPixelConverter= new PixelConverter(parent); @@ -397,6 +402,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#updateControls() */ + @Override protected void updateControls() { fGenerateComments.setSelection(getBooleanValue(PREF_GENERATE_COMMENTS)); } @@ -770,6 +776,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { Messages.format(PreferencesMessages.CodeTemplateBlock_export_exists_message, file.getAbsolutePath())); } + @Override public void performDefaults() { super.performDefaults(); fTemplateStore.restoreDefaults(); @@ -827,6 +834,7 @@ public class CodeTemplateBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#validateSettings(java.lang.String, java.lang.String) */ + @Override protected void validateSettings(Key changedKey, String oldValue, String newValue) { // no validation here } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java index 514473e1926..ef246f46ab2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java @@ -48,6 +48,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* * @see PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { IWorkbenchPreferenceContainer container= (IWorkbenchPreferenceContainer) getContainer(); fCodeTemplateConfigurationBlock= new CodeTemplateBlock(getNewStatusChangedListener(), getProject(), container); @@ -59,6 +60,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#createPreferenceContent(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createPreferenceContent(Composite composite) { return fCodeTemplateConfigurationBlock.createContents(composite); } @@ -66,6 +68,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#enableProjectSpecificSettings(boolean) */ + @Override protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) { super.enableProjectSpecificSettings(useProjectSpecificSettings); if (fCodeTemplateConfigurationBlock != null) { @@ -76,6 +79,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* * @see IPreferencePage#performOk() */ + @Override public boolean performOk() { if (fCodeTemplateConfigurationBlock != null) { return fCodeTemplateConfigurationBlock.performOk(useProjectSettings()); @@ -86,6 +90,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* * @see PreferencePage#performDefaults() */ + @Override protected void performDefaults() { super.performDefaults(); if (fCodeTemplateConfigurationBlock != null) { @@ -96,6 +101,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.DialogPage#dispose() */ + @Override public void dispose() { if (fCodeTemplateConfigurationBlock != null) { fCodeTemplateConfigurationBlock.dispose(); @@ -114,6 +120,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.jface.preference.IPreferencePage#performCancel() */ + @Override public boolean performCancel() { if (fCodeTemplateConfigurationBlock != null) { fCodeTemplateConfigurationBlock.performCancel(); @@ -124,6 +131,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#hasProjectSpecificOptions(org.eclipse.core.resources.IProject) */ + @Override protected boolean hasProjectSpecificOptions(IProject project) { return fCodeTemplateConfigurationBlock.hasProjectSpecificOptions(project); } @@ -131,6 +139,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID() */ + @Override protected String getPreferencePageID() { return PREF_ID; } @@ -138,6 +147,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID() */ + @Override protected String getPropertyPageID() { return null; // TODO project specific settings @@ -147,6 +157,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object) */ + @Override public void applyData(Object data) { if (data instanceof Map) { Object id= ((Map) data).get(DATA_SELECT_TEMPLATE); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java index b8ebe851a5b..7a561006725 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java @@ -105,6 +105,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo /* * @see SourceViewerConfiguration#getContentAssistant(ISourceViewer) */ + @Override public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { IPreferenceStore store= CUIPlugin.getDefault().getPreferenceStore(); @@ -135,6 +136,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo /* * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String, int) */ + @Override public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) { return new TemplateVariableTextHover(fProcessor); } @@ -142,6 +144,7 @@ public class CodeTemplateSourceViewerConfiguration extends SimpleCSourceViewerCo /* * @see org.eclipse.cdt.internal.ui.text.CSourceViewerConfiguration#getPresentationReconciler(org.eclipse.jface.text.source.ISourceViewer) */ + @Override public IPresentationReconciler getPresentationReconciler( ISourceViewer sourceViewer) { if (fProcessor.getContextType() instanceof CodeTemplateContextType) { return super.getPresentationReconciler(sourceViewer); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java index 23be0ab4e4c..7ba80b7ba21 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java @@ -137,6 +137,7 @@ class EditTemplateDialog extends StatusDialog { /** * @see Action#run() */ + @Override public void run() { if (fOperationCode != -1 && fOperationTarget != null) { fOperationTarget.doOperation(fOperationCode); @@ -215,6 +216,7 @@ class EditTemplateDialog extends StatusDialog { /* * @see org.eclipse.jface.dialogs.Dialog#isResizable() */ + @Override protected boolean isResizable() { return true; } @@ -222,6 +224,7 @@ class EditTemplateDialog extends StatusDialog { /* * @see org.eclipse.cdt.internal.ui.dialogs.StatusDialog#create() */ + @Override public void create() { super.create(); updateStatusAndButtons(); @@ -231,6 +234,7 @@ class EditTemplateDialog extends StatusDialog { /* * @see Dialog#createDialogArea(Composite) */ + @Override protected Control createDialogArea(Composite ancestor) { Composite parent= new Composite(ancestor, SWT.NONE); GridLayout layout= new GridLayout(); @@ -576,6 +580,7 @@ class EditTemplateDialog extends StatusDialog { return -1; } + @Override protected void okPressed() { String name= fNameText == null ? fTemplate.getName() : fNameText.getText(); boolean isAutoInsertable= fAutoInsertCheckbox != null && fAutoInsertCheckbox.getSelection(); @@ -610,6 +615,7 @@ class EditTemplateDialog extends StatusDialog { /* * @see org.eclipse.jface.window.Window#configureShell(Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, ICHelpContextIds.EDIT_TEMPLATE_DIALOG); @@ -650,6 +656,7 @@ class EditTemplateDialog extends StatusDialog { /* * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() */ + @Override protected IDialogSettings getDialogBoundsSettings() { String sectionName= getClass().getName() + "_dialogBounds"; //$NON-NLS-1$ IDialogSettings settings= CUIPlugin.getDefault().getDialogSettings(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java index 9643854d42f..3190450d528 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java @@ -220,6 +220,7 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { /* * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { return null; } @@ -227,6 +228,7 @@ class FoldingConfigurationBlock implements IPreferenceConfigurationBlock { /* * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { return ((CFoldingStructureProviderDescriptor) element).getName(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java index 57d75fdb3b1..ea7c697f607 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java @@ -27,6 +27,7 @@ public final class FoldingPreferencePage extends AbstractConfigurationBlockPrefe /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() */ + @Override protected String getHelpId() { return ICHelpContextIds.C_EDITOR_FOLDING_PAGE; } @@ -34,6 +35,7 @@ public final class FoldingPreferencePage extends AbstractConfigurationBlockPrefe /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() */ + @Override protected void setDescription() { String description= PreferencesMessages.CEditorPreferencePage_folding_title; setDescription(description); @@ -42,11 +44,13 @@ public final class FoldingPreferencePage extends AbstractConfigurationBlockPrefe /* * @see org.org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() */ + @Override protected void setPreferenceStore() { setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); } + @Override protected Label createDescriptionLabel(Composite parent) { return null; // no description for new look. } @@ -54,6 +58,7 @@ public final class FoldingPreferencePage extends AbstractConfigurationBlockPrefe /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new FoldingConfigurationBlock(overlayPreferenceStore); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java index 7d2a3bd9f4f..391b896f728 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java @@ -41,6 +41,7 @@ public class IndexerPreferencePage extends PreferencePage implements fCacheBlock= new CacheSizeBlock(this); } + @Override protected Control createContents(Composite parent) { GridLayout gl; Composite composite = new Composite(parent, SWT.NONE); @@ -85,6 +86,7 @@ public class IndexerPreferencePage extends PreferencePage implements throw new UnsupportedOperationException(); } + @Override public boolean performOk() { try { fOptionBlock.performApply(new NullProgressMonitor()); @@ -94,6 +96,7 @@ public class IndexerPreferencePage extends PreferencePage implements return true; } + @Override public void performDefaults() { fOptionBlock.performDefaults(); fStrategyBlock.performDefaults(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java index bbf977d21d5..babd4eabdf1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java @@ -48,7 +48,8 @@ public class IndexerStrategyBlock extends AbstractCOptionPage { setContainer(container); } - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { GridData gd; GridLayout gl; Composite composite = ControlFactory.createComposite(parent, 1); @@ -63,6 +64,7 @@ public class IndexerStrategyBlock extends AbstractCOptionPage { setControl(composite); SelectionListener updateEnablement= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateEnablement(); } @@ -108,6 +110,7 @@ public class IndexerStrategyBlock extends AbstractCOptionPage { fImmediateUpdateButton.setSelection(updatePolicy == IndexerPreferences.UPDATE_POLICY_IMMEDIATE); } + @Override public void performApply(IProgressMonitor monitor) throws CoreException { int updatePolicy; if (!fAutoUpdateButton.getSelection()) { @@ -131,7 +134,8 @@ public class IndexerStrategyBlock extends AbstractCOptionPage { prjDescMgr.setProjectDescriptionWorkspacePreferences(prefs, false, new NullProgressMonitor()); } - public void performDefaults() { + @Override + public void performDefaults() { initUpdatePolicy(IndexerPreferences.getDefaultUpdatePolicy()); fUseActiveBuildButton.setSelection(false); fUseFixedBuildConfig.setSelection(true); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java index 6294e7ab43c..f43ba797a1e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java @@ -103,6 +103,7 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock Link link= new Link(composite, SWT.NONE); link.setText(PreferencesMessages.MarkOccurrencesConfigurationBlock_link); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(parent.getShell(), e.text, null, null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java index 288cb0e01ed..8136045f92c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java @@ -28,6 +28,7 @@ public final class MarkOccurrencesPreferencePage extends AbstractConfigurationBl /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() */ + @Override protected String getHelpId() { return ICHelpContextIds.C_EDITOR_PREF_PAGE; } @@ -35,6 +36,7 @@ public final class MarkOccurrencesPreferencePage extends AbstractConfigurationBl /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() */ + @Override protected void setDescription() { String description= PreferencesMessages.MarkOccurrencesConfigurationBlock_title; setDescription(description); @@ -43,11 +45,13 @@ public final class MarkOccurrencesPreferencePage extends AbstractConfigurationBl /* * @see org.org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() */ + @Override protected void setPreferenceStore() { setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); } + @Override protected Label createDescriptionLabel(Composite parent) { return null; // no description for new look. } @@ -55,6 +59,7 @@ public final class MarkOccurrencesPreferencePage extends AbstractConfigurationBl /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new MarkOccurrencesConfigurationBlock(overlayPreferenceStore); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java index f9c78f9bb8d..c00e41a711a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java @@ -110,6 +110,7 @@ public abstract class OptionsConfigurationBlock { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { return fQualifier + '/' + fKey; } @@ -513,6 +514,7 @@ public abstract class OptionsConfigurationBlock { excomposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT)); excomposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, nColumns, 1)); excomposite.addExpansionListener(new ExpansionAdapter() { + @Override public void expansionStateChanged(ExpansionEvent e) { expandedStateChanged((ExpandableComposite) e.getSource()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariableDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariableDialog.java index 67cdcf9d4c1..6ee84085f43 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariableDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariableDialog.java @@ -169,6 +169,7 @@ public class PathEntryVariableDialog extends TitleAreaDialog { * * @see org.eclipse.jface.window.Window#configureShell(Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (newVariable) @@ -183,6 +184,7 @@ public class PathEntryVariableDialog extends TitleAreaDialog { * * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea */ + @Override protected Control createDialogArea(Composite parent) { // top level composite Composite parentComposite = (Composite) super.createDialogArea(parent); @@ -315,6 +317,7 @@ public class PathEntryVariableDialog extends TitleAreaDialog { fileButton.setFont(font); fileButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { selectFile(); } @@ -336,6 +339,7 @@ public class PathEntryVariableDialog extends TitleAreaDialog { folderButton.setFont(font); folderButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { selectFolder(); } @@ -418,6 +422,7 @@ public class PathEntryVariableDialog extends TitleAreaDialog { * * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar */ + @Override protected void createButtonsForButtonBar(Composite parent) { okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablePreferencePage.java index 6f3f349ef53..35bbbf78dfe 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablePreferencePage.java @@ -48,6 +48,7 @@ implements IWorkbenchPreferencePage { * * @see PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Font font = parent.getFont(); @@ -99,6 +100,7 @@ implements IWorkbenchPreferencePage { * Disposes the path variables group. * @see org.eclipse.jface.dialogs.IDialogPage#dispose() */ + @Override public void dispose() { pathEntryVariablesGroup.dispose(); super.dispose(); @@ -118,6 +120,7 @@ implements IWorkbenchPreferencePage { * * @see PreferencePage#performOk() */ + @Override public boolean performOk() { return pathEntryVariablesGroup.performOk(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablesGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablesGroup.java index 2d274caeddc..d95c0d6a9c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablesGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablesGroup.java @@ -213,6 +213,7 @@ public class PathEntryVariablesGroup { } variableTable = new Table(pageComponent, tableStyle); variableTable.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateEnabledState(); if (selectionListener != null) @@ -337,6 +338,7 @@ public class PathEntryVariablesGroup { addButton = new Button(groupComponent, SWT.PUSH); addButton.setText(PreferencesMessages.PathEntryVariablesBlock_addVariableButton); addButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { addNewVariable(); } @@ -347,6 +349,7 @@ public class PathEntryVariablesGroup { editButton = new Button(groupComponent, SWT.PUSH); editButton.setText(PreferencesMessages.PathEntryVariablesBlock_editVariableButton); editButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { editSelectedVariable(); } @@ -357,6 +360,7 @@ public class PathEntryVariablesGroup { removeButton = new Button(groupComponent, SWT.PUSH); removeButton.setText(PreferencesMessages.PathEntryVariablesBlock_removeVariableButton); removeButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { removeSelectedVariables(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java index 2e2aaca0d08..10b38b918c7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java @@ -70,14 +70,17 @@ public class PreferencesAccess { return new WorkingCopyScopeContext(fWorkingCopyManager, original); } + @Override public IScopeContext getDefaultScope() { return getWorkingCopyScopeContext(super.getDefaultScope()); } + @Override public IScopeContext getInstanceScope() { return getWorkingCopyScopeContext(super.getInstanceScope()); } + @Override public IScopeContext getProjectScope(IProject project) { return getWorkingCopyScopeContext(super.getProjectScope(project)); } @@ -85,6 +88,7 @@ public class PreferencesAccess { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PreferencesAccess#applyChanges() */ + @Override public void applyChanges() throws BackingStoreException { fWorkingCopyManager.applyChanges(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreviewSourceViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreviewSourceViewer.java index 74f0bd6b52a..8b5ec745942 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreviewSourceViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreviewSourceViewer.java @@ -28,6 +28,7 @@ import org.eclipse.ui.texteditor.AbstractTextEditor; /** * @deprecated Use {@link org.eclipse.cdt.internal.ui.editor.CSourceViewer} instead. */ +@Deprecated class PreviewSourceViewer extends SourceViewer implements IPropertyChangeListener { /** @@ -140,6 +141,7 @@ class PreviewSourceViewer extends SourceViewer implements IPropertyChangeListene /* * @see ISourceViewer#configure(SourceViewerConfiguration) */ + @Override public void configure(SourceViewerConfiguration configuration) { /* @@ -171,6 +173,7 @@ class PreviewSourceViewer extends SourceViewer implements IPropertyChangeListene * @see org.eclipse.jface.text.source.ISourceViewerExtension2#unconfigure() * @since 3.0 */ + @Override public void unconfigure() { if (fForegroundColor != null) { fForegroundColor.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java index 2b36a951bf4..4ef3098d6ed 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java @@ -65,6 +65,7 @@ public class ProjectSelectionDialog extends SelectionStatusDialog { fProjectsWithSpecifics= projectsWithSpecifics; fFilter= new ViewerFilter() { + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { return fProjectsWithSpecifics.contains(element); } @@ -75,6 +76,7 @@ public class ProjectSelectionDialog extends SelectionStatusDialog { /* (non-Javadoc) * Method declared on Dialog. */ + @Override protected Control createDialogArea(Composite parent) { // page group Composite composite= (Composite) super.createDialogArea(parent); @@ -151,6 +153,7 @@ public class ProjectSelectionDialog extends SelectionStatusDialog { /* (non-Javadoc) * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult() */ + @Override protected void computeResult() { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java index 8bdc0fe62aa..76a69c0f588 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java @@ -88,7 +88,8 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement return fData == null || !Boolean.TRUE.equals(fData.get(DATA_NO_LINK)); } - protected Label createDescriptionLabel(Composite parent) { + @Override + protected Label createDescriptionLabel(Composite parent) { fParentComposite= parent; if (isProjectPreferencePage()) { Composite composite= new Composite(parent, SWT.NONE); @@ -133,6 +134,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement /* * @see org.eclipse.jface.preference.IPreferencePage#createContents(Composite) */ + @Override protected Control createContents(Composite parent) { Composite composite= new Composite(parent, SWT.NONE); GridLayout layout= new GridLayout(); @@ -292,6 +294,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement /* * @see org.eclipse.jface.preference.IPreferencePage#performDefaults() */ + @Override protected void performDefaults() { if (useProjectSettings()) { enableProjectSpecificSettings(false); @@ -328,6 +331,7 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#applyData(java.lang.Object) */ + @Override public void applyData(Object data) { if (data instanceof Map) { fData= (Map) data; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java index 15b24b0e87a..616e11fdbc7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java @@ -50,6 +50,7 @@ public class ScrolledPageContent extends SharedScrolledComposite { /* (non-Javadoc) * @see org.eclipse.swt.widgets.Widget#dispose() */ + @Override public void dispose() { fToolkit.dispose(); super.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java index 2ca63eac5e9..3ed72b94815 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java @@ -205,6 +205,7 @@ class SmartTypingConfigurationBlock extends AbstractConfigurationBlock { gd.widthHint= 300; // don't get wider initially link.setLayoutData(gd); link.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(link.getShell(), "org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage", null, null); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java index f79700c6906..37c0d59e654 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java @@ -26,6 +26,7 @@ public final class SmartTypingPreferencePage extends AbstractConfigurationBlockP /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#getHelpId() */ + @Override protected String getHelpId() { return ICHelpContextIds.C_EDITOR_TYPING_PAGE; } @@ -33,6 +34,7 @@ public final class SmartTypingPreferencePage extends AbstractConfigurationBlockP /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setDescription() */ + @Override protected void setDescription() { String description= PreferencesMessages.CEditorPreferencePage_typing_tabTitle; setDescription(description); @@ -41,11 +43,13 @@ public final class SmartTypingPreferencePage extends AbstractConfigurationBlockP /* * @see org.org.eclipse.ui.internal.editors.text.AbstractConfigurationBlockPreferencePage#setPreferenceStore() */ + @Override protected void setPreferenceStore() { setPreferenceStore(CUIPlugin.getDefault().getPreferenceStore()); } + @Override protected Label createDescriptionLabel(Composite parent) { return null; // no description for new look. } @@ -53,6 +57,7 @@ public final class SmartTypingPreferencePage extends AbstractConfigurationBlockP /* * @see org.eclipse.ui.internal.editors.text.AbstractConfigureationBlockPreferencePage#createConfigurationBlock(org.eclipse.ui.internal.editors.text.OverlayPreferenceStore) */ + @Override protected IPreferenceConfigurationBlock createConfigurationBlock(OverlayPreferenceStore overlayPreferenceStore) { return new SmartTypingConfigurationBlock(overlayPreferenceStore); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java index baf5d8d2ec5..24d78eee37c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java @@ -269,6 +269,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { setValue(PREF_SPELLING_LOCALE, SpellCheckEngine.getDefaultLocale().toString()); } + @Override protected Combo addComboBox(Composite parent, String label, Key key, String[] values, String[] valueLabels, int indent) { ControlData data= new ControlData(key, values); @@ -305,6 +306,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(final Composite parent) { Composite composite= new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout()); @@ -390,6 +392,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { button.setText(PreferencesMessages.SpellingPreferencePage_browse_label); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(final SelectionEvent event) { handleBrowseButtonSelected(); } @@ -401,6 +404,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { button=new Button(buttons, SWT.PUSH); button.setText(PreferencesMessages.SpellingPreferencePage_variables); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleVariablesButtonSelected(); } @@ -494,6 +498,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { DialogPage fakePage= new DialogPage() { public void createControl(Composite c) { } + @Override public void setErrorMessage(String newMessage) { StatusInfo status= new StatusInfo(); if (newMessage != null) @@ -527,6 +532,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#performOk() */ + @Override public boolean performOk() { fEncodingEditor.store(); if (fEncodingEditor.presentsDefaultValue()) @@ -539,6 +545,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#performApply() */ + @Override public boolean performApply() { fEncodingEditor.store(); if (fEncodingEditor.presentsDefaultValue()) @@ -551,6 +558,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#performDefaults() */ + @Override public void performDefaults() { super.performDefaults(); @@ -584,6 +592,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#validateSettings(java.lang.String,java.lang.String) */ + @Override protected void validateSettings(final Key key, final String oldValue, final String newValue) { if (key == null || PREF_SPELLING_PROPOSAL_THRESHOLD.equals(key)) fThresholdStatus= validatePositiveNumber(getValue(PREF_SPELLING_PROPOSAL_THRESHOLD)); @@ -604,6 +613,7 @@ public class SpellingConfigurationBlock extends OptionsConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#updateCheckBox(org.eclipse.swt.widgets.Button) */ + @Override protected void updateCheckBox(Button curr) { super.updateCheckBox(curr); Event event= new Event(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java index 04b3ac84b70..e1d1443301a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java @@ -76,6 +76,7 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) */ + @Override public Image getImage(Object element) { return null; // JavaPluginImages.get(JavaPluginImages.IMG_OBJS_REFACTORING_INFO); } @@ -83,6 +84,7 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { return getColumnText(element, 0); } @@ -128,6 +130,7 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { } private static class TodoTaskSorter extends ViewerComparator { + @Override public int compare(Viewer viewer, Object e1, Object e2) { return getComparator().compare(((TodoTask) e1).name, ((TodoTask) e2).name); } @@ -234,6 +237,7 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { } } + @Override protected Control createContents(Composite parent) { setShell(parent.getShell()); @@ -269,6 +273,7 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { return markersComposite; } + @Override protected void validateSettings(Key changedKey, String oldValue, String newValue) { if (!areSettingsEnabled()) { return; @@ -317,6 +322,7 @@ public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.OptionsConfigurationBlock#updateControls() */ + @Override protected void updateControls() { unpackTodoTasks(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java index fc1d1762a51..d43c303b158 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java @@ -116,6 +116,7 @@ public class TodoTaskInputDialog extends StatusDialog { return task; } + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -161,6 +162,7 @@ public class TodoTaskInputDialog extends StatusDialog { /* * @see org.eclipse.jface.window.Window#configureShell(Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, ICHelpContextIds.TODO_TASK_INPUT_DIALOG); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java index 120d43ed513..372f710ad74 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java @@ -46,6 +46,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { IWorkbenchPreferenceContainer container = (IWorkbenchPreferenceContainer) getContainer(); fConfigurationBlock = new TodoTaskConfigurationBlock(getNewStatusChangedListener(), getProject(), container); @@ -62,6 +63,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#createPreferenceContent(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createPreferenceContent(Composite composite) { return fConfigurationBlock.createContents(composite); } @@ -69,6 +71,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#hasProjectSpecificOptions(org.eclipse.core.resources.IProject) */ + @Override protected boolean hasProjectSpecificOptions(IProject project) { return fConfigurationBlock.hasProjectSpecificOptions(project); } @@ -77,6 +80,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID() */ + @Override protected String getPreferencePageID() { return PREF_ID; } @@ -84,6 +88,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID() */ + @Override protected String getPropertyPageID() { // TODO: Project specific settings are not supported yet. // return PROP_ID; @@ -93,6 +98,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#enableProjectSpecificSettings(boolean) */ + @Override protected void enableProjectSpecificSettings(boolean useProjectSpecificSettings) { super.enableProjectSpecificSettings(useProjectSpecificSettings); if (fConfigurationBlock != null) { @@ -103,6 +109,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.preference.IPreferencePage#performDefaults() */ + @Override protected void performDefaults() { super.performDefaults(); if (fConfigurationBlock != null) { @@ -113,6 +120,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.preference.IPreferencePage#performOk() */ + @Override public boolean performOk() { if (fConfigurationBlock != null && !fConfigurationBlock.performOk()) { return false; @@ -123,6 +131,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* * @see org.eclipse.jface.preference.IPreferencePage#performApply() */ + @Override public void performApply() { if (fConfigurationBlock != null) { fConfigurationBlock.performApply(); @@ -132,6 +141,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.DialogPage#dispose() */ + @Override public void dispose() { if (fConfigurationBlock != null) { fConfigurationBlock.dispose(); @@ -142,6 +152,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#setElement(org.eclipse.core.runtime.IAdaptable) */ + @Override public void setElement(IAdaptable element) { super.setElement(element); setDescription(null); // no description for property page diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java index d20ec816018..07f58208203 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java @@ -67,11 +67,13 @@ public class WorkInProgressPreferencePage extends PreferencePage implements IWor /* * @see PreferencePage#createControl(Composite) */ + @Override public void createControl(Composite parent) { super.createControl(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), "WORK_IN_PROGRESS_PREFERENCE_PAGE"); //$NON-NLS-1$ } + @Override protected Control createContents(Composite parent) { initializeDialogUnits(parent); @@ -106,6 +108,7 @@ public class WorkInProgressPreferencePage extends PreferencePage implements IWor /* * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore() */ + @Override protected IPreferenceStore doGetPreferenceStore() { return CUIPlugin.getDefault().getPreferenceStore(); } @@ -113,6 +116,7 @@ public class WorkInProgressPreferencePage extends PreferencePage implements IWor /* * @see PreferencePage#performDefaults() */ + @Override protected void performDefaults() { IPreferenceStore store= getPreferenceStore(); for (int i= 0; i < fCheckBoxes.size(); i++) { @@ -137,6 +141,7 @@ public class WorkInProgressPreferencePage extends PreferencePage implements IWor /* * @see IPreferencePage#performOk() */ + @Override public boolean performOk() { IPreferenceStore store= getPreferenceStore(); for (int i= 0; i < fCheckBoxes.size(); i++) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java index 88a0cd9db63..4b7eaf878a7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java @@ -63,11 +63,13 @@ public class AlreadyExistsDialog extends StatusDialog { } + @Override public void create() { super.create(); setTitle(FormatterMessages.AlreadyExistsDialog_dialog_title); } + @Override public Control createDialogArea(Composite parent) { initializeComposite(parent); @@ -184,6 +186,7 @@ public class AlreadyExistsDialog extends StatusDialog { updateStatus(fOk); } + @Override protected void okPressed() { if (!getStatus().isOK()) return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java index af248e3dd12..19227bc68c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java @@ -120,6 +120,7 @@ public class BracesTabPage extends FormatterTabPage { super(modifyDialog, workingValues); } + @Override protected void doCreatePreferences(Composite composite, int numColumns) { final Group group= createGroup(numColumns, composite, FormatterMessages.BracesTabPage_group_brace_positions_title); @@ -153,10 +154,12 @@ public class BracesTabPage extends FormatterTabPage { arrayInitCheckBox.setEnabled(!arrayInitOption.hasValue(DefaultCodeFormatterConstants.END_OF_LINE)); } + @Override protected void initializePage() { fPreview.setPreviewText(PREVIEW); } + @Override protected CPreview doCreateCPreview(Composite parent) { fPreview= new TranslationUnitPreview(fWorkingValues, parent); return fPreview; @@ -178,7 +181,8 @@ public class BracesTabPage extends FormatterTabPage { } - protected void doUpdatePreview() { + @Override + protected void doUpdatePreview() { fPreview.update(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java index 73611ba0cea..0561718abbb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java @@ -101,18 +101,22 @@ public class CodeFormatterConfigurationBlock extends ProfileConfigurationBlock { fCustomCodeFormatterBlock= new CustomCodeFormatterBlock(project, access); } + @Override protected IProfileVersioner createProfileVersioner() { return new ProfileVersioner(); } + @Override protected ProfileStore createProfileStore(IProfileVersioner versioner) { return new FormatterProfileStore(versioner); } + @Override protected ProfileManager createProfileManager(List profiles, IScopeContext context, PreferencesAccess access, IProfileVersioner profileVersioner) { return new FormatterProfileManager(profiles, context, access, profileVersioner); } + @Override protected void configurePreview(Composite composite, int numColumns, ProfileManager profileManager) { fCustomCodeFormatterBlock.createContents(composite); @@ -132,13 +136,15 @@ public class CodeFormatterConfigurationBlock extends ProfileConfigurationBlock { new PreviewController(profileManager); } - protected ModifyDialog createModifyDialog(Shell shell, Profile profile, ProfileManager profileManager, ProfileStore profileStore, boolean newProfile) { + @Override + protected ModifyDialog createModifyDialog(Shell shell, Profile profile, ProfileManager profileManager, ProfileStore profileStore, boolean newProfile) { return new FormatterModifyDialog(shell, profile, profileManager, profileStore, newProfile, FORMATTER_DIALOG_PREFERENCE_KEY, DIALOGSTORE_LASTSAVELOADPATH); } /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ProfileConfigurationBlock#performApply() */ + @Override public void performApply() { if (fCustomCodeFormatterBlock != null) { fCustomCodeFormatterBlock.performOk(); @@ -149,6 +155,7 @@ public class CodeFormatterConfigurationBlock extends ProfileConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ProfileConfigurationBlock#performDefaults() */ + @Override public void performDefaults() { if (fCustomCodeFormatterBlock != null) { fCustomCodeFormatterBlock.performDefaults(); @@ -159,6 +166,7 @@ public class CodeFormatterConfigurationBlock extends ProfileConfigurationBlock { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ProfileConfigurationBlock#performOk() */ + @Override public boolean performOk() { if (fCustomCodeFormatterBlock != null) { fCustomCodeFormatterBlock.performOk(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java index 0ca0442a4aa..86be2443da6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java @@ -82,6 +82,7 @@ public class ControlStatementsTabPage extends FormatterTabPage { super(modifyDialog, workingValues); } + @Override protected void doCreatePreferences(Composite composite, int numColumns) { final Group generalGroup= createGroup(numColumns, composite, FormatterMessages.ControlStatementsTabPage_general_group_title); @@ -113,6 +114,7 @@ public class ControlStatementsTabPage extends FormatterTabPage { // createCheckboxPref(ifElseGroup, numColumns, FormatterMessages.ControlStatementsTabPage_if_else_group_keep_guardian_clause_on_one_line, DefaultCodeFormatterConstants.FORMATTER_KEEP_GUARDIAN_CLAUSE_ON_ONE_LINE, FALSE_TRUE); } + @Override protected void initializePage() { fPreview.setPreviewText(PREVIEW); } @@ -120,7 +122,8 @@ public class ControlStatementsTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doCreateCPreview(org.eclipse.swt.widgets.Composite) */ - protected CPreview doCreateCPreview(Composite parent) { + @Override + protected CPreview doCreateCPreview(Composite parent) { fPreview= new TranslationUnitPreview(fWorkingValues, parent); return fPreview; } @@ -128,7 +131,8 @@ public class ControlStatementsTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doUpdatePreview() */ - protected void doUpdatePreview() { + @Override + protected void doUpdatePreview() { super.doUpdatePreview(); fPreview.update(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java index 60fafb67034..c695af6dedb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java @@ -76,11 +76,13 @@ public class CreateProfileDialog extends StatusDialog { } + @Override public void create() { super.create(); setTitle(FormatterMessages.CreateProfileDialog_dialog_title); } + @Override public Control createDialogArea(Composite parent) { final int numColumns= 2; @@ -178,6 +180,7 @@ public class CreateProfileDialog extends StatusDialog { updateStatus(fOk); } + @Override protected void okPressed() { if (!getStatus().isOK()) return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java index a55a5749250..4018525e562 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java @@ -146,6 +146,7 @@ public class CustomCodeFormatterBlock extends Observable { fFormatterCombo.setFont(parent.getFont()); fFormatterCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fFormatterCombo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleFormatterChanged(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java index c1620507910..d2564e19512 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java @@ -23,6 +23,7 @@ public class FormatterModifyDialog extends ModifyDialog { super(parentShell, profile, profileManager, profileStore, newProfile, dialogPreferencesKey, lastSavePathKey); } + @Override protected void addPages(Map values) { addTabPage(FormatterMessages.ModifyDialog_tabpage_indentation_title, new IndentationTabPage(this, values)); addTabPage(FormatterMessages.ModifyDialog_tabpage_braces_title, new BracesTabPage(this, values)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java index 77511de9efa..4e790ea3f65 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java @@ -97,6 +97,7 @@ public class FormatterProfileManager extends ProfileManager { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager#getSelectedProfileId(org.eclipse.core.runtime.preferences.IScopeContext) */ + @Override protected String getSelectedProfileId(IScopeContext instanceScope) { String profileId= instanceScope.getNode(CUIPlugin.PLUGIN_ID).get(PROFILE_KEY, null); if (profileId == null) { @@ -119,7 +120,8 @@ public class FormatterProfileManager extends ProfileManager { /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.preferences.formatter.ProfileManager#getDefaultProfile() */ - public Profile getDefaultProfile() { + @Override + public Profile getDefaultProfile() { return getProfile(DEFAULT_PROFILE); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java index a681c855f83..8ea991b64b4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java @@ -37,6 +37,7 @@ public class FormatterProfileStore extends ProfileStore { /** * {@inheritDoc} */ + @Override public List readProfiles(IScopeContext scope) throws CoreException { final IEclipsePreferences node= scope.getNode(CUIPlugin.PLUGIN_ID); final String profilesValue= node.get(PREF_FORMATTER_PROFILES_OLD, null); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java index c187082b030..82f3b56106b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java @@ -37,6 +37,7 @@ public abstract class FormatterTabPage extends ModifyDialogTabPage { fDialogSettings= CUIPlugin.getDefault().getDialogSettings(); } + @Override protected Composite doCreatePreviewPane(Composite composite, int numColumns) { createLabel(numColumns - 1, composite, FormatterMessages.ModifyDialogTabPage_preview_label_text); @@ -45,6 +46,7 @@ public abstract class FormatterTabPage extends ModifyDialogTabPage { fShowInvisibleButton.setText(FormatterMessages.FormatterTabPage_ShowInvisibleCharacters_label); fShowInvisibleButton.setLayoutData(new GridData(SWT.RIGHT, SWT.TOP, true, false)); fShowInvisibleButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fPreview.showInvisibleCharacters(fShowInvisibleButton.getSelection()); fDialogSettings.put(SHOW_INVISIBLE_PREFERENCE_KEY, fShowInvisibleButton.getSelection()); @@ -69,6 +71,7 @@ public abstract class FormatterTabPage extends ModifyDialogTabPage { return fDialogSettings.getBoolean(SHOW_INVISIBLE_PREFERENCE_KEY); } + @Override protected void doUpdatePreview() { boolean showInvisible= isShowInvisible(); fPreview.showInvisibleCharacters(showInvisible); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java index bcc1d3c66a5..f8ad8d1de21 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java @@ -94,6 +94,7 @@ public class IndentationTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doCreatePreferences(org.eclipse.swt.widgets.Composite, int) */ + @Override protected void doCreatePreferences(Composite composite, int numColumns) { final Group generalGroup= createGroup(numColumns, composite, FormatterMessages.IndentationTabPage_general_group_title); @@ -144,6 +145,7 @@ public class IndentationTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#initializePage() */ + @Override public void initializePage() { fPreview.setPreviewText(PREVIEW); } @@ -151,7 +153,8 @@ public class IndentationTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doCreateCPreview(org.eclipse.swt.widgets.Composite) */ - protected CPreview doCreateCPreview(Composite parent) { + @Override + protected CPreview doCreateCPreview(Composite parent) { fPreview= new TranslationUnitPreview(fWorkingValues, parent); return fPreview; } @@ -159,7 +162,8 @@ public class IndentationTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doUpdatePreview() */ - protected void doUpdatePreview() { + @Override + protected void doUpdatePreview() { fPreview.update(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java index f8f6d9913e2..c0acfc7b8bc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java @@ -80,6 +80,7 @@ public class LineWrappingTabPage extends FormatterTabPage { this(null, null, _name); } + @Override public String toString() { return name; } @@ -601,6 +602,7 @@ public class LineWrappingTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doCreatePreferences(org.eclipse.swt.widgets.Composite, int) */ + @Override protected void doCreatePreferences(Composite composite, int numColumns) { final Group lineWidthGroup= createGroup(numColumns, composite, FormatterMessages.LineWrappingTabPage_width_indent); @@ -663,6 +665,7 @@ public class LineWrappingTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doCreatePreviewPane(org.eclipse.swt.widgets.Composite, int) */ + @Override protected Composite doCreatePreviewPane(Composite composite, int numColumns) { super.doCreatePreviewPane(composite, numColumns); @@ -684,7 +687,8 @@ public class LineWrappingTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doCreateCPreview(org.eclipse.swt.widgets.Composite) */ - protected CPreview doCreateCPreview(Composite parent) { + @Override + protected CPreview doCreateCPreview(Composite parent) { fPreview= new TranslationUnitPreview(fWorkingValues, parent); return fPreview; } @@ -692,22 +696,26 @@ public class LineWrappingTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#initializePage() */ + @Override protected void initializePage() { fCategoriesViewer.addSelectionChangedListener(fCategoryListener); fCategoriesViewer.addDoubleClickListener(fCategoryListener); fForceSplit.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { forceSplitChanged(fForceSplit.getSelection()); } }); fIndentStyleCombo.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { indentStyleChanged(((Combo)e.widget).getSelectionIndex()); } }); fWrappingStyleCombo.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { wrappingStyleChanged(((Combo)e.widget).getSelectionIndex()); } @@ -724,6 +732,7 @@ public class LineWrappingTabPage extends FormatterTabPage { /* * @see org.eclipse.cdt.internal.ui.preferences.formatter.ModifyDialogTabPage#doUpdatePreview() */ + @Override protected void doUpdatePreview() { final Object normalSetting= fWorkingValues.get(LINE_SPLIT); fWorkingValues.put(LINE_SPLIT, fPreviewPreferences.get(LINE_SPLIT)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java index 9c4d5be222a..ca50eb7e04f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java @@ -120,6 +120,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog protected abstract void addPages(Map values); + @Override public void create() { super.create(); int lastFocusNr= 0; @@ -137,6 +138,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog } } + @Override protected Control createDialogArea(Composite parent) { final Composite composite= (Composite)super.createDialogArea(parent); @@ -182,6 +184,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog return composite; } + @Override public void updateStatus(IStatus status) { if (status == null) { doValidate(); @@ -193,6 +196,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog /* (non-Javadoc) * @see org.eclipse.jface.window.Window#getInitialSize() */ + @Override protected Point getInitialSize() { Point initialSize= super.getInitialSize(); try { @@ -211,6 +215,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog /* (non-Javadoc) * @see org.eclipse.jface.window.Window#getInitialLocation(org.eclipse.swt.graphics.Point) */ + @Override protected Point getInitialLocation(Point initialSize) { try { return new Point(fDialogSettings.getInt(fKeyPreferredX), fDialogSettings.getInt(fKeyPreferredY)); @@ -219,6 +224,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog } } + @Override public boolean close() { final Rectangle shell= getShell().getBounds(); @@ -233,12 +239,14 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { applyPressed(); super.okPressed(); } - protected void buttonPressed(int buttonId) { + @Override + protected void buttonPressed(int buttonId) { if (buttonId == APPLAY_BUTTON_ID) { applyPressed(); setTitle(Messages.format(FormatterMessages.ModifyDialog_dialog_title, fProfile.getName())); @@ -294,7 +302,8 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog } } - protected void createButtonsForButtonBar(Composite parent) { + @Override + protected void createButtonsForButtonBar(Composite parent) { fApplyButton= createButton(parent, APPLAY_BUTTON_ID, FormatterMessages.ModifyDialog_apply_button, false); fApplyButton.setEnabled(false); @@ -321,6 +330,7 @@ public abstract class ModifyDialog extends StatusDialog implements IModifyDialog doValidate(); } + @Override protected void updateButtonsEnableState(IStatus status) { super.updateButtonsEnableState(status); if (fApplyButton != null && !fApplyButton.isDisposed()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java index 00b9ea5e355..3e171eb68ec 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java @@ -175,6 +175,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { updateWidget(); fCheckbox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { checkboxChecked(((Button)e.widget).getSelection()); } @@ -187,6 +188,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { notifyObservers(); } + @Override protected void updateWidget() { if (getKey() != null) { fCheckbox.setEnabled(getEnabled()); @@ -207,6 +209,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { checkboxChecked(checked); } + @Override public Control getControl() { return fCheckbox; } @@ -264,6 +267,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { updateWidget(); fCombo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { comboSelected(((Combo)e.widget).getSelectionIndex()); } @@ -276,6 +280,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { notifyObservers(fValues[index]); } + @Override protected void updateWidget() { if (getKey() != null) { fCombo.setEnabled(getEnabled()); @@ -300,6 +305,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { return value.equals(getPreferences().get(getKey())); } + @Override public Control getControl() { return fCombo; } @@ -419,6 +425,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { notifyObservers(); } + @Override protected void updateWidget() { final boolean hasKey= getKey() != null; @@ -440,6 +447,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { } } + @Override public Control getControl() { return fNumberText; } @@ -474,6 +482,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { fIndex= 0; } + @Override public void focusGained(FocusEvent e) { fDialogSettings.put(PREF_LAST_FOCUS_INDEX, ((Integer)fItemMap.get(e.widget)).intValue()); } @@ -528,6 +537,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { fMinimalHight= minimalHight; } + @Override public Point computeSize(Composite composite, int wHint, int hHint, boolean force) { if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) { return new Point(wHint, hHint); @@ -565,6 +575,7 @@ public abstract class ModifyDialogTabPage implements IModifyDialogTabPage { return new Point(x, y); } + @Override public void layout(Composite composite, boolean force) { Rectangle rect = composite.getClientArea(); Control[] children = composite.getChildren(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java index bffe6c0345c..f2fee670745 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java @@ -134,10 +134,12 @@ public abstract class ProfileManager extends Observable { fProfileKind= profileKind; } + @Override public String getName() { return fName; } + @Override public Profile rename(String name, ProfileManager manager) { final String trimmed= name.trim(); CustomProfile newProfile= new CustomProfile(trimmed, fSettings, fCurrentVersion, fProfileKind); @@ -145,13 +147,16 @@ public abstract class ProfileManager extends Observable { return newProfile; } + @Override public Map getSettings() { return fSettings; } + @Override public void setSettings(Map settings) { } + @Override public String getID() { return fID; } @@ -163,15 +168,18 @@ public abstract class ProfileManager extends Observable { return -1; } + @Override public boolean isProfileToSave() { return false; } + @Override public boolean isBuiltInProfile() { return true; } - public int getVersion() { + @Override + public int getVersion() { return fCurrentVersion; } @@ -194,10 +202,12 @@ public abstract class ProfileManager extends Observable { fKind= kind; } + @Override public String getName() { return fName; } + @Override public Profile rename(String name, ProfileManager manager) { final String trimmed= name.trim(); if (trimmed.equals(getName())) @@ -210,10 +220,12 @@ public abstract class ProfileManager extends Observable { return this; } + @Override public Map getSettings() { return fSettings; } + @Override public void setSettings(Map settings) { if (settings == null) throw new IllegalArgumentException(); @@ -223,6 +235,7 @@ public abstract class ProfileManager extends Observable { } } + @Override public String getID() { return ID_PREFIX + fName; } @@ -235,6 +248,7 @@ public abstract class ProfileManager extends Observable { return fManager; } + @Override public int getVersion() { return fVersion; } @@ -253,6 +267,7 @@ public abstract class ProfileManager extends Observable { return 1; } + @Override public boolean isProfileToSave() { return true; } @@ -269,6 +284,7 @@ public abstract class ProfileManager extends Observable { super(oldName, options, version, profileKind); } + @Override public Profile rename(String name, ProfileManager manager) { CustomProfile profile= new CustomProfile(name.trim(), getSettings(), getVersion(), getKind()); @@ -276,18 +292,22 @@ public abstract class ProfileManager extends Observable { return profile; } + @Override public String getID() { return SHARED_PROFILE; } + @Override public final int compareTo(Object o) { return 1; } + @Override public boolean isProfileToSave() { return false; } + @Override public boolean isSharedProfile() { return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java index a7eddf0ab82..6bfc6535ff2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java @@ -80,6 +80,7 @@ public class ProfileStore { private Map fSettings; private String fKind; + @Override public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { if (qName.equals(XML_NODE_SETTING)) { @@ -110,6 +111,7 @@ public class ProfileStore { } } + @Override public void endElement(String uri, String localName, String qName) { if (qName.equals(XML_NODE_PROFILE)) { fProfiles.add(new CustomProfile(fName, fSettings, fVersion, fKind)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java index 64e71aded3f..dd6d75a89cf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java @@ -51,7 +51,8 @@ public class SnippetPreview extends CPreview { fSnippets= new ArrayList(); } - protected void doFormatPreview() { + @Override + protected void doFormatPreview() { if (fSnippets.isEmpty()) { fPreviewDocument.set(""); //$NON-NLS-1$ return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java index e8b9d9c1ce4..bc362045b88 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java @@ -45,7 +45,8 @@ public class TranslationUnitPreview extends CPreview { super(workingValues, parent); } - protected void doFormatPreview() { + @Override + protected void doFormatPreview() { if (fPreviewText == null) { fPreviewDocument.set(""); //$NON-NLS-1$ return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java index e32ae191841..d5f618a1a21 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java @@ -68,7 +68,8 @@ public final class WhiteSpaceOptions { return fParent; } - public final String toString() { + @Override + public final String toString() { return fName; } @@ -86,7 +87,8 @@ public final class WhiteSpaceOptions { super(parent, workingValues, messageKey); } - public void setChecked(boolean checked) { + @Override + public void setChecked(boolean checked) { for (final Iterator iter = fChildren.iterator(); iter.hasNext();) ((Node)iter.next()).setChecked(checked); } @@ -95,7 +97,8 @@ public final class WhiteSpaceOptions { fChildren.add(child); } - public List getSnippets() { + @Override + public List getSnippets() { final ArrayList snippets= new ArrayList(fChildren.size()); for (Iterator iter= fChildren.iterator(); iter.hasNext();) { final List childSnippets= ((Node)iter.next()).getSnippets(); @@ -108,7 +111,8 @@ public final class WhiteSpaceOptions { return snippets; } - public void getCheckedLeafs(List list) { + @Override + public void getCheckedLeafs(List list) { for (Iterator iter= fChildren.iterator(); iter.hasNext();) { ((Node)iter.next()).getCheckedLeafs(list); } @@ -130,7 +134,8 @@ public final class WhiteSpaceOptions { fSnippets.add(snippet); } - public void setChecked(boolean checked) { + @Override + public void setChecked(boolean checked) { fWorkingValues.put(fKey, checked ? CCorePlugin.INSERT : CCorePlugin.DO_NOT_INSERT); } @@ -138,11 +143,13 @@ public final class WhiteSpaceOptions { return CCorePlugin.INSERT.equals(fWorkingValues.get(fKey)); } - public List getSnippets() { + @Override + public List getSnippets() { return fSnippets; } - public void getCheckedLeafs(List list) { + @Override + public void getCheckedLeafs(List list) { if (getChecked()) list.add(this); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java index df2099a0739..29747e41d3e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java @@ -390,7 +390,8 @@ public class WhiteSpaceTabPage extends FormatterTabPage { fJavaElementComponent= new JavaElementComponent(); } - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { final int index= fSwitchCombo.getSelectionIndex(); if (index == 0) { fDialogSettings.put(PREF_VIEW_KEY, false); @@ -459,20 +460,24 @@ public class WhiteSpaceTabPage extends FormatterTabPage { fSwitchComponent= new SwitchComponent(); } + @Override protected void doCreatePreferences(Composite composite, int numColumns) { fSwitchComponent.createContents(numColumns, composite); } + @Override protected void initializePage() { fSwitchComponent.initialize(); } - protected CPreview doCreateCPreview(Composite parent) { + @Override + protected CPreview doCreateCPreview(Composite parent) { fPreview= new SnippetPreview(fWorkingValues, parent); return fPreview; } - protected void doUpdatePreview() { + @Override + protected void doUpdatePreview() { super.doUpdatePreview(); fPreview.update(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java index 9f82028ce52..3d155ae41d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java @@ -669,7 +669,7 @@ public class ASTManager { IASTDeclaration decl= null; if( method instanceof CPPMethod ) decl = ((CPPMethod)method).getPrimaryDeclaration(); - else if( decl instanceof CPPImplicitMethod ) + else if( method instanceof CPPImplicitMethod ) decl = ((CPPImplicitMethod)method).getPrimaryDeclaration(); IASTDeclSpecifier spec= null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTSpecificNameVisitor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTSpecificNameVisitor.java index fca955cfebb..54a5fd95fce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTSpecificNameVisitor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTSpecificNameVisitor.java @@ -22,7 +22,8 @@ public abstract class ASTSpecificNameVisitor extends ASTNameVisitor { fSearchForName= name; } - final public int visitName(IASTName name) { + @Override + final public int visitName(IASTName name) { String nameStr= name.toString(); if (nameStr != null) { final int len= nameStr.length(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java index ea4bb9ddd7b..2da77457499 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java @@ -43,10 +43,12 @@ public class CountLabelProvider extends LabelProvider { return fLabelProvider; } + @Override public Image getImage(Object element) { return fLabelProvider.getImage(element); } + @Override public String getText(Object element) { int c = fPage.getInput().getMatchCount(element); @@ -57,6 +59,7 @@ public class CountLabelProvider extends LabelProvider { return fLabelProvider.getText(element) + " "+ Messages.format(CSearchMessages.CSearchResultCollector_matches, matchCount); //$NON-NLS-1$ } + @Override public void dispose() { fLabelProvider.dispose(); super.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IOccurrencesFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IOccurrencesFinder.java index 37c7f02c981..947dfd84014 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IOccurrencesFinder.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IOccurrencesFinder.java @@ -50,6 +50,7 @@ public interface IOccurrencesFinder { return fDescription; } + @Override public String toString() { return "[" + fOffset + " / " + fLength + "] " + fDescription; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java index 8f657c7118a..8b85cba45d3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java @@ -38,6 +38,7 @@ public class PDOMSearchElementQuery extends PDOMSearchQuery { this.element = element; } + @Override public IStatus runWithIndex(IIndex index, IProgressMonitor monitor) throws OperationCanceledException { try { if (element instanceof ICElement) { @@ -52,6 +53,7 @@ public class PDOMSearchElementQuery extends PDOMSearchQuery { } } + @Override public String getLabel() { if (element instanceof ICElement) return super.getLabel() + " " + ((ICElement)element).getElementName(); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java index ec7eb91decc..23560d356ed 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java @@ -338,6 +338,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { // Pattern combo patternCombo = new Combo( result, SWT.SINGLE | SWT.BORDER ); patternCombo.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { //handlePatternSelected(); } @@ -360,6 +361,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { gd= new GridData(); caseSensitiveButton.setLayoutData(gd); caseSensitiveButton.addSelectionListener( new SelectionAdapter() { + @Override public void widgetSelected( SelectionEvent e ) { // isCaseSensitive = caseSensitiveButton.getSelection(); setPerformActionEnabled(); @@ -395,6 +397,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { result.setLayout(layout); SelectionAdapter searchForSelectionAdapter = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { Button me = (Button)event.widget; if (me == searchForButtons[searchAllButtonIndex]) { @@ -466,6 +469,7 @@ public class PDOMSearchPage extends DialogPage implements ISearchPage { return searchSettings; } + @Override public void setVisible(boolean visible) { if (visible) { if (firstTime) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java index 4d2324b60d1..56442172a69 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java @@ -68,6 +68,7 @@ public class DeclarationsSearchGroup extends ActionGroup { /* * Method declared on ActionGroup. */ + @Override public void fillContextMenu(IMenuManager menu) { super.fillContextMenu(menu); @@ -133,6 +134,7 @@ public class DeclarationsSearchGroup extends ActionGroup { /* * Overrides method declared in ActionGroup */ + @Override public void dispose() { fFindDeclarationsAction= null; fFindDeclarationsProjectAction=null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java index ef58bce8625..db41f4fdb4e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java @@ -44,14 +44,17 @@ public class FindDeclarationsAction extends FindAction { setToolTipText(tooltip); } + @Override protected ICElement[] getScope() { return null; } + @Override protected String getScopeDescription() { return CSearchMessages.WorkspaceScope; } + @Override protected int getLimitTo() { return PDOMSearchQuery.FIND_DECLARATIONS_DEFINITIONS; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java index db3af6fefd6..602a5600ef3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java @@ -34,6 +34,7 @@ public class FindDeclarationsInWorkingSetAction extends FindInWorkingSetAction { workingSets); } + @Override protected int getLimitTo() { return PDOMSearchQuery.FIND_DECLARATIONS_DEFINITIONS; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java index 073dcb91c7d..f5833ec80e9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java @@ -47,6 +47,7 @@ public class FindDeclarationsProjectAction extends FindAction { setToolTipText(tooltip); } + @Override protected ICElement[] getScope() { ICProject project = null; if (fEditor != null) { @@ -65,10 +66,12 @@ public class FindDeclarationsProjectAction extends FindAction { return project != null ? new ICElement[] { project } : null; } + @Override protected String getScopeDescription() { return CSearchMessages.ProjectScope; } + @Override protected int getLimitTo() { return PDOMSearchQuery.FIND_DECLARATIONS_DEFINITIONS; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java index c61e85b35ab..55478e8b5a0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java @@ -47,6 +47,7 @@ public abstract class FindInWorkingSetAction extends FindAction { fWorkingSets= workingSets; } + @Override final public void run() { IWorkingSet[] initial= fWorkingSets; if (fWorkingSets == null) { @@ -59,10 +60,12 @@ public abstract class FindInWorkingSetAction extends FindAction { fWorkingSets= initial; } + @Override final protected String getScopeDescription() { return scopeDescription; } + @Override final protected ICElement[] getScope() { if (fWorkingSets == null) { return new ICElement[0]; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java index 4cb444b5262..96f49241490 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java @@ -42,14 +42,17 @@ public class FindRefsAction extends FindAction { setToolTipText(tooltip); } + @Override protected String getScopeDescription() { return CSearchMessages.WorkspaceScope; } + @Override protected ICElement[] getScope() { return null; } + @Override protected int getLimitTo() { return PDOMSearchQuery.FIND_REFERENCES; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java index 18ebaecb766..78516f9062d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java @@ -34,6 +34,7 @@ public class FindRefsInWorkingSetAction extends FindInWorkingSetAction { workingSets); } + @Override protected int getLimitTo() { return PDOMSearchQuery.FIND_REFERENCES; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java index 634954d0528..979813eeeb8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java @@ -47,6 +47,7 @@ public class FindRefsProjectAction extends FindAction { setToolTipText(tooltip); } + @Override protected ICElement[] getScope() { ICProject project = null; if (fEditor != null) { @@ -65,10 +66,12 @@ public class FindRefsProjectAction extends FindAction { return project != null ? new ICElement[] { project } : null; } + @Override protected String getScopeDescription() { return CSearchMessages.ProjectScope; } + @Override protected int getLimitTo() { return PDOMSearchQuery.FIND_REFERENCES; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java index 8a1a1c23624..2192c3af92e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java @@ -60,6 +60,7 @@ public class ReferencesSearchGroup extends ActionGroup { /* * Method declared on ActionGroup. */ + @Override public void fillContextMenu(IMenuManager menu) { super.fillContextMenu(menu); @@ -108,6 +109,7 @@ public class ReferencesSearchGroup extends ActionGroup { /* * Overrides method declared in ActionGroup */ + @Override public void dispose() { fFindRefsAction= null; fFindRefsProjectAction=null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java index 2183aecfe26..7857d11e536 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java @@ -52,6 +52,7 @@ public class SelectionSearchGroup extends ActionGroup { /* * Method declared on ActionGroup. */ + @Override public void fillContextMenu(IMenuManager menu) { super.fillContextMenu(menu); @@ -83,6 +84,7 @@ public class SelectionSearchGroup extends ActionGroup { /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#dispose() */ + @Override public void dispose() { if (fDeclarationsSearchGroup != null) { fDeclarationsSearchGroup.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java index de42211bdce..99536b743f1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java @@ -36,18 +36,22 @@ public class WorkingSetFindAction extends FindAction { setText(string); } + @Override protected String getScopeDescription() { return findAction.getScopeDescription(); } + @Override protected ICElement[] getScope() { return findAction.getScope(); } + @Override protected int getLimitTo() { return findAction.getLimitTo(); } + @Override public void run() { findAction.run(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java index 31c9aaab485..212baa9d44b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java @@ -65,6 +65,7 @@ public abstract class AbstractCScanner extends BufferedRuleBasedScanner implemen /* * @see org.eclipse.jface.text.rules.RuleBasedScanner#nextToken() */ + @Override public IToken nextToken() { fTokenStore.ensureTokensInitialised(); return super.nextToken(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java index 07ae9fd6411..f5b3d2b5ae9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java @@ -132,6 +132,7 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo /* * @see org.eclipse.jface.dialogs.PopupDialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { initializeColors(); Control contents= super.createContents(parent); @@ -139,6 +140,7 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo return contents; } + @Override protected void applyBackgroundColor(Color color, Control control) { super.applyBackgroundColor(fBackgroundColor, control); } @@ -150,6 +152,7 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo * @return The control representing the main content. * */ + @Override protected Control createDialogArea(Composite parent) { CompareConfiguration compareConfig= new CompareConfiguration(); compareConfig.setLeftEditable(false); @@ -260,6 +263,7 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo /* * @see org.eclipse.jface.dialogs.PopupDialog#fillDialogMenu(IMenuManager) */ + @Override protected void fillDialogMenu(IMenuManager dialogMenu) { super.fillDialogMenu(dialogMenu); fillViewMenu(dialogMenu); @@ -287,6 +291,7 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo close(); } + @Override protected Point getInitialLocation(Point initialSize) { if (!restoresSize()) { Point size = new Point(400, 400); @@ -392,6 +397,7 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo /* * @see org.eclipse.jface.dialogs.PopupDialog#getFocusControl() */ + @Override protected Control getFocusControl() { return fCompareViewerControl; } @@ -428,6 +434,7 @@ public abstract class AbstractCompareViewerInformationControl extends PopupDialo /* * @see org.eclipse.jface.dialogs.PopupDialog#getDialogSettings() */ + @Override protected IDialogSettings getDialogSettings() { String sectionName= getId(); if (sectionName == null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java index 38950814d4f..eefb7925f51 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java @@ -79,6 +79,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements /* * Method declared on ViewerFilter. */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { StringMatcher matcher= getMatcher(); if (matcher == null || !(viewer instanceof TreeViewer)) @@ -155,6 +156,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements * @return The control representing the main content. * */ + @Override protected Control createDialogArea(Composite parent) { fTreeViewer= createTreeViewer(parent, fTreeStyle); @@ -212,6 +214,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements }); tree.addMouseListener(new MouseAdapter() { + @Override public void mouseUp(MouseEvent e) { if (tree.getSelectionCount() < 1) @@ -459,6 +462,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements * @see org.eclipse.jface.dialogs.PopupDialog#fillDialogMenu(IMenuManager) * */ + @Override protected void fillDialogMenu(IMenuManager dialogMenu) { super.fillDialogMenu(dialogMenu); fillViewMenu(dialogMenu); @@ -612,6 +616,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements /* * @see org.eclipse.jface.dialogs.PopupDialog#getDialogSettings() */ + @Override protected IDialogSettings getDialogSettings() { String sectionName= getId(); @@ -625,6 +630,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements /* * Overridden to insert the filter text into the title and menu area. */ + @Override protected Control createTitleMenuArea(Composite parent) { fViewMenuButtonComposite= (Composite) super.createTitleMenuArea(parent); @@ -643,6 +649,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements * if there is no header specified. * */ + @Override protected Control createTitleControl(Composite parent) { if (hasHeader()) { return super.createTitleControl(parent); @@ -654,6 +661,7 @@ public abstract class AbstractInformationControl extends PopupDialog implements /* * @see org.eclipse.jface.dialogs.PopupDialog#setTabOrder(org.eclipse.swt.widgets.Composite) */ + @Override protected void setTabOrder(Composite composite) { if (hasHeader()) { composite.setTabList(new Control[] { fFilterText, fTreeViewer.getTree() }); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java index 22251c5e44d..9b65f64309c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java @@ -125,6 +125,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog /* * @see org.eclipse.jface.dialogs.PopupDialog#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { Control contents= super.createContents(parent); for (Iterator it= fColorExclusionControls.iterator(); it.hasNext(); ) { @@ -141,6 +142,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog * @return The control representing the main content. * */ + @Override protected Control createDialogArea(Composite parent) { fSourceViewer= createSourceViewer(parent, fTextStyle); @@ -183,6 +185,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog /* * @see org.eclipse.jface.dialogs.PopupDialog#createInfoTextArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createInfoTextArea(Composite parent) { Control infoText= super.createInfoTextArea(parent); fColorExclusionControls.add(infoText); @@ -192,6 +195,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog /* * @see org.eclipse.jface.dialogs.PopupDialog#createTitleControl(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createTitleControl(Composite parent) { Control titleText= super.createTitleControl(parent); fColorExclusionControls.add(titleText); @@ -201,6 +205,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog /* * @see org.eclipse.jface.dialogs.PopupDialog#getBackgroundColorExclusions() */ + @Override protected List getBackgroundColorExclusions() { List exclusions= super.getBackgroundColorExclusions(); exclusions.addAll(fColorExclusionControls); @@ -210,6 +215,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog /* * @see org.eclipse.jface.dialogs.PopupDialog#getForegroundColorExclusions() */ + @Override protected List getForegroundColorExclusions() { List exclusions= super.getForegroundColorExclusions(); exclusions.addAll(fColorExclusionControls); @@ -286,6 +292,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog /* * @see org.eclipse.jface.dialogs.PopupDialog#fillDialogMenu(IMenuManager) */ + @Override protected void fillDialogMenu(IMenuManager dialogMenu) { super.fillDialogMenu(dialogMenu); fillViewMenu(dialogMenu); @@ -313,6 +320,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog close(); } + @Override protected Point getInitialLocation(Point initialSize) { if (!restoresLocation()) { Point size = new Point(400, 400); @@ -419,6 +427,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog /* * @see org.eclipse.jface.dialogs.PopupDialog#getFocusControl() */ + @Override protected Control getFocusControl() { return fSourceViewer.getTextWidget(); } @@ -455,6 +464,7 @@ public abstract class AbstractSourceViewerInformationControl extends PopupDialog /* * @see org.eclipse.jface.dialogs.PopupDialog#getDialogSettings() */ + @Override protected IDialogSettings getDialogSettings() { String sectionName= getId(); if (sectionName == null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java index 002cdc22e9f..4c5c7f27bf0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java @@ -601,8 +601,6 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { // indent the first pasted line String current= IndentUtil.getCurrentIndent(temp, l, indentInsideLineComments); StringBuffer correct= new StringBuffer(IndentUtil.computeIndent(temp, l, indenter, scanner)); - if (correct == null) - return; // bail out insertLength= subtractIndent(correct, current, addition); // workaround for bug 181139 @@ -1117,6 +1115,7 @@ public class CAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy { /* * @see org.eclipse.jface.text.IAutoEditStrategy#customizeDocumentCommand(IDocument, DocumentCommand) */ + @Override public void customizeDocumentCommand(IDocument d, DocumentCommand c) { if (!c.doit) return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBraceRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBraceRule.java index ebcd662fca5..d12e7fcb3f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBraceRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBraceRule.java @@ -32,7 +32,8 @@ public class CBraceRule extends SingleCharRule /** * @see org.eclipse.cdt.internal.ui.text.SingleCharRule#isRuleChar(int) */ - protected boolean isRuleChar(int ch) + @Override + protected boolean isRuleChar(int ch) { return ch == '{' || ch == '}' || ch == '[' || ch == ']' || ch == '(' || ch == ')'; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java index 1326f401cd1..7e6831410e0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java @@ -73,6 +73,7 @@ public class CBreakIterator extends BreakIterator { } static final class Whitespace extends Run { + @Override protected boolean isValid(char ch) { return Character.isWhitespace(ch) && ch != '\n' && ch != '\r'; } @@ -87,6 +88,7 @@ public class CBreakIterator extends BreakIterator { /* * @see org.eclipse.cdt.internal.ui.text.CBreakIterator.Run#init() */ + @Override protected void init() { super.init(); fState= INIT; @@ -95,6 +97,7 @@ public class CBreakIterator extends BreakIterator { /* * @see org.eclipse.cdt.internal.ui.text.CBreakIterator.Run#consume(char) */ + @Override protected boolean consume(char ch) { if (!isValid(ch) || fState == EXIT) return false; @@ -112,6 +115,7 @@ public class CBreakIterator extends BreakIterator { } } + @Override protected boolean isValid(char ch) { return ch == '\n' || ch == '\r'; } @@ -121,6 +125,7 @@ public class CBreakIterator extends BreakIterator { /* * @see org.eclipse.cdt.internal.ui.text.CBreakIterator.Run#isValid(char) */ + @Override protected boolean isValid(char ch) { return Character.isJavaIdentifierPart(ch); } @@ -157,6 +162,7 @@ public class CBreakIterator extends BreakIterator { /* * @see org.eclipse.cdt.internal.ui.text.CBreakIterator.Run#init() */ + @Override protected void init() { super.init(); fState= S_INIT; @@ -165,6 +171,7 @@ public class CBreakIterator extends BreakIterator { /* * @see org.eclipse.cdt.internal.ui.text.CBreakIterator.Run#consumes(char) */ + @Override protected boolean consume(char ch) { int kind= getKind(ch); fState= MATRIX[fState][kind]; @@ -206,6 +213,7 @@ public class CBreakIterator extends BreakIterator { /* * @see org.eclipse.cdt.internal.ui.text.CBreakIterator.Run#isValid(char) */ + @Override protected boolean isValid(char ch) { return Character.isJavaIdentifierPart(ch); } @@ -215,6 +223,7 @@ public class CBreakIterator extends BreakIterator { /* * @see org.eclipse.cdt.internal.ui.text.CBreakIterator.Run#isValid(char) */ + @Override protected boolean isValid(char ch) { return !Character.isWhitespace(ch) && !Character.isJavaIdentifierPart(ch); } @@ -247,6 +256,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#current() */ + @Override public int current() { return fIndex; } @@ -254,6 +264,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#first() */ + @Override public int first() { fIndex= fIterator.first(); return fIndex; @@ -262,6 +273,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#following(int) */ + @Override public int following(int offset) { // work around too eager IAEs in standard implementation if (offset == getText().getEndIndex()) @@ -331,6 +343,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#getText() */ + @Override public CharacterIterator getText() { return fIterator.getText(); } @@ -338,6 +351,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#isBoundary(int) */ + @Override public boolean isBoundary(int offset) { if (offset == getText().getBeginIndex()) return true; @@ -348,6 +362,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#last() */ + @Override public int last() { fIndex= fIterator.last(); return fIndex; @@ -356,6 +371,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#next() */ + @Override public int next() { fIndex= following(fIndex); return fIndex; @@ -364,6 +380,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#next(int) */ + @Override public int next(int n) { return fIterator.next(n); } @@ -371,6 +388,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#preceding(int) */ + @Override public int preceding(int offset) { if (offset == getText().getBeginIndex()) return DONE; @@ -395,6 +413,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#previous() */ + @Override public int previous() { fIndex= preceding(fIndex); return fIndex; @@ -403,6 +422,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#setText(java.lang.String) */ + @Override public void setText(String newText) { setText((CharSequence) newText); } @@ -420,6 +440,7 @@ public class CBreakIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#setText(java.text.CharacterIterator) */ + @Override public void setText(CharacterIterator newText) { if (newText instanceof CharSequence) { fText= (CharSequence) newText; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeReader.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeReader.java index ac779760165..131f65162c4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeReader.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeReader.java @@ -74,6 +74,7 @@ public class CCodeReader extends SingleCharReader { /* * @see Reader#close() */ + @Override public void close() throws IOException { fDocument= null; } @@ -81,6 +82,7 @@ public class CCodeReader extends SingleCharReader { /* * @see SingleCharReader#read() */ + @Override public int read() throws IOException { try { return fForward ? readForwards() : readBackwards(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java index abeb6828808..0f40cbf8779 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java @@ -63,6 +63,7 @@ public class CCompositeReconcilingStrategy extends CompositeReconcilingStrategy /* * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion, org.eclipse.jface.text.IRegion) */ + @Override public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) { IProblemRequestorExtension e= getProblemRequestorExtension(); if (e != null) { @@ -80,6 +81,7 @@ public class CCompositeReconcilingStrategy extends CompositeReconcilingStrategy /* * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion) */ + @Override public void reconcile(IRegion partition) { IProblemRequestorExtension e= getProblemRequestorExtension(); if (e != null) { @@ -97,6 +99,7 @@ public class CCompositeReconcilingStrategy extends CompositeReconcilingStrategy /* * @see org.eclipse.jface.text.reconciler.CompositeReconcilingStrategy#initialReconcile() */ + @Override public void initialReconcile() { IProblemRequestorExtension e = getProblemRequestorExtension(); if (e != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java index c0b04441b79..8ecb186fca6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java @@ -49,6 +49,7 @@ public class CFormattingStrategy extends ContextBasedFormattingStrategy { /* * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#format() */ + @Override public void format() { super.format(); @@ -80,6 +81,7 @@ public class CFormattingStrategy extends ContextBasedFormattingStrategy { /* * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext) */ + @Override public void formatterStarts(final IFormattingContext context) { super.formatterStarts(context); @@ -90,6 +92,7 @@ public class CFormattingStrategy extends ContextBasedFormattingStrategy { /* * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStops() */ + @Override public void formatterStops() { super.formatterStops(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java index c7a7a22a1a5..a9f5fdd3d18 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java @@ -95,6 +95,7 @@ public final class CHeuristicScanner implements Symbols { /* * @see org.eclipse.cdt.internal.ui.text.CHeuristicScanner.StopCondition#stop(char) */ + @Override public boolean stop(char ch, int position, boolean forward) { return !Character.isWhitespace(ch); } @@ -109,6 +110,7 @@ public final class CHeuristicScanner implements Symbols { /* * @see org.eclipse.cdt.internal.ui.text.CHeuristicScanner.StopCondition#stop(char) */ + @Override public boolean stop(char ch, int position, boolean forward) { return super.stop(ch, position, true) && isDefaultPartition(position); } @@ -116,6 +118,7 @@ public final class CHeuristicScanner implements Symbols { /* * @see org.eclipse.cdt.internal.ui.text.CHeuristicScanner.StopCondition#nextPosition(int, boolean) */ + @Override public int nextPosition(int position, boolean forward) { ITypedRegion partition= getPartition(position); if (fPartition.equals(partition.getType())) @@ -141,6 +144,7 @@ public final class CHeuristicScanner implements Symbols { /* * @see org.eclipse.cdt.internal.ui.text.CHeuristicScanner.StopCondition#stop(char) */ + @Override public boolean stop(char ch, int position, boolean forward) { return !Character.isJavaIdentifierPart(ch); } @@ -155,6 +159,7 @@ public final class CHeuristicScanner implements Symbols { /* * @see org.eclipse.cdt.internal.ui.text.CHeuristicScanner.StopCondition#stop(char) */ + @Override public boolean stop(char ch, int position, boolean forward) { return super.stop(ch, position, true) || !isDefaultPartition(position); } @@ -162,6 +167,7 @@ public final class CHeuristicScanner implements Symbols { /* * @see org.eclipse.cdt.internal.ui.text.CHeuristicScanner.StopCondition#nextPosition(int, boolean) */ + @Override public int nextPosition(int position, boolean forward) { ITypedRegion partition= getPartition(position); if (fPartition.equals(partition.getType())) @@ -208,6 +214,7 @@ public final class CHeuristicScanner implements Symbols { /* * @see org.eclipse.cdt.internal.ui.text.CHeuristicScanner.StopCondition#stop(char, int) */ + @Override public boolean stop(char ch, int position, boolean forward) { return Arrays.binarySearch(fChars, ch) >= 0 && isDefaultPartition(position); } @@ -215,6 +222,7 @@ public final class CHeuristicScanner implements Symbols { /* * @see org.eclipse.cdt.internal.ui.text.CHeuristicScanner.StopCondition#nextPosition(int, boolean) */ + @Override public int nextPosition(int position, boolean forward) { ITypedRegion partition= getPartition(position); if (fPartition.equals(partition.getType())) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COperatorRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COperatorRule.java index 25a58933456..b54509e37e0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COperatorRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COperatorRule.java @@ -31,7 +31,8 @@ public class COperatorRule extends SingleCharRule /** * @see org.eclipse.cdt.internal.ui.text.SingleCharRule#isRuleChar(int) */ - public boolean isRuleChar(int ch) + @Override + public boolean isRuleChar(int ch) { return (ch == ';' || ch == '.' || ch == ':' || ch == '=' || ch == '-' || ch == '+' || ch == '\\' || ch == '*' || ch == '!' || ch == '%' diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java index 663a8b8fbbb..ba27bb47d4c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java @@ -74,7 +74,8 @@ public class COutlineInformationControl extends AbstractInformationControl { /** * {@inheritDoc} */ - protected TreeViewer createTreeViewer(Composite parent, int treeStyle) { + @Override + protected TreeViewer createTreeViewer(Composite parent, int treeStyle) { TreeViewer treeViewer = new ProblemTreeViewer(parent, treeStyle); final Tree tree = treeViewer.getTree(); tree.setLayoutData(new GridData(GridData.FILL_BOTH)); @@ -91,6 +92,7 @@ public class COutlineInformationControl extends AbstractInformationControl { /* * @see org.eclipse.cdt.internal.ui.text.AbstractInformationControl#getId() */ + @Override protected String getId() { return "org.eclipse.cdt.internal.ui.text.QuickOutline"; //$NON-NLS-1$ } @@ -98,6 +100,7 @@ public class COutlineInformationControl extends AbstractInformationControl { /** * {@inheritDoc} */ + @Override public void setInput(Object information) { if (information == null || information instanceof String) { inputChanged(null, null); @@ -114,6 +117,7 @@ public class COutlineInformationControl extends AbstractInformationControl { /* * @see org.eclipse.jdt.internal.ui.text.AbstractInformationControl#fillViewMenu(org.eclipse.jface.action.IMenuManager) */ + @Override protected void fillViewMenu(IMenuManager viewMenu) { super.fillViewMenu(viewMenu); @@ -127,6 +131,7 @@ public class COutlineInformationControl extends AbstractInformationControl { return true; } + @Override public int category(Object obj) { if (obj instanceof ICElement) { ICElement elem= (ICElement)obj; @@ -221,7 +226,8 @@ public class COutlineInformationControl extends AbstractInformationControl { /* * @see org.eclipse.jface.action.Action#run() */ - public void run() { + @Override + public void run() { final boolean on= isChecked(); fOutlineViewer.setComparator(on ? fSorter : null); getDialogSettings().put(STORE_LEXICAL_SORTING_CHECKED, on); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java index 338072a0deb..19e4fbb4e49 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java @@ -39,6 +39,7 @@ public class CPairMatcher extends DefaultCharacterPairMatcher { } /* @see ICharacterPairMatcher#match(IDocument, int) */ + @Override public IRegion match(IDocument document, int offset) { try { return performMatch(document, offset); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java index c98f61b59d8..f995e828c40 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java @@ -73,6 +73,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { if (!monitor.isCanceled()) { fCode.run(); @@ -165,6 +166,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.swt.events.ShellListener#shellActivated(org.eclipse.swt.events.ShellEvent) */ + @Override public void shellActivated(ShellEvent e) { if (!fControl.isDisposed() && fControl.isVisible()) { if (hasCModelChanged()) @@ -176,6 +178,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.swt.events.ShellListener#shellDeactivated(org.eclipse.swt.events.ShellEvent) */ + @Override public void shellDeactivated(ShellEvent e) { if (!fControl.isDisposed() && fControl.getShell() == e.getSource()) { setEditorActive(false); @@ -303,6 +306,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.jface.text.reconciler.IReconciler#install(org.eclipse.jface.text.ITextViewer) */ + @Override public void install(ITextViewer textViewer) { super.install(textViewer); @@ -331,6 +335,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.jface.text.reconciler.IReconciler#uninstall() */ + @Override public void uninstall() { fTriggerReconcilerJob.cancel(); @@ -364,6 +369,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.jface.text.reconciler.AbstractReconciler#forceReconciling() */ + @Override protected void forceReconciling() { if (!fInitialProcessDone) return; @@ -373,6 +379,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.jface.text.reconciler.AbstractReconciler#aboutToBeReconciled() */ + @Override protected void aboutToBeReconciled() { CCompositeReconcilingStrategy strategy= (CCompositeReconcilingStrategy)getReconcilingStrategy(IDocument.DEFAULT_CONTENT_TYPE); strategy.aboutToBeReconciled(); @@ -381,6 +388,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.jface.text.reconciler.MonoReconciler#initialProcess() */ + @Override protected void initialProcess() { super.initialProcess(); fInitialProcessDone= true; @@ -392,6 +400,7 @@ public class CReconciler extends MonoReconciler { /* * @see org.eclipse.jface.text.reconciler.MonoReconciler#process(org.eclipse.jface.text.reconciler.DirtyRegion) */ + @Override protected void process(DirtyRegion dirtyRegion) { fIsReconciling= true; setCModelChanged(false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java index 6632d9deed5..5a019090b86 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java @@ -250,7 +250,8 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /** * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getPresentationReconciler(org.eclipse.jface.text.source.ISourceViewer) */ - public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { + @Override + public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { CPresentationReconciler reconciler= new CPresentationReconciler(); reconciler.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer)); @@ -353,6 +354,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /* * @see SourceViewerConfiguration#getContentAssistant(ISourceViewer) */ + @Override public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { if (getEditor() == null) { return null; @@ -412,6 +414,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getQuickAssistAssistant(org.eclipse.jface.text.source.ISourceViewer) * @since 5.0 */ + @Override public IQuickAssistAssistant getQuickAssistAssistant(ISourceViewer sourceViewer) { if (getEditor() != null) return new CCorrectionAssistant(getEditor()); @@ -421,6 +424,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /* * @see org.eclipse.ui.editors.text.TextSourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer) */ + @Override public IReconciler getReconciler(ISourceViewer sourceViewer) { if (fTextEditor != null) { //Delay changed and non-incremental reconciler used due to @@ -439,6 +443,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /* * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAutoEditStrategies(org.eclipse.jface.text.source.ISourceViewer, java.lang.String) */ + @Override public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) { String partitioning= getConfiguredDocumentPartitioning(sourceViewer); @@ -463,6 +468,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /** * @see SourceViewerConfiguration#getDoubleClickStrategy(ISourceViewer, String) */ + @Override public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) { if (ICPartitions.C_MULTI_LINE_COMMENT.equals(contentType) || ICPartitions.C_SINGLE_LINE_COMMENT.equals(contentType)) { @@ -487,6 +493,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /** * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getDefaultPrefixes(ISourceViewer, String) */ + @Override public String[] getDefaultPrefixes(ISourceViewer sourceViewer, String contentType) { return new String[] { "//", "" }; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -494,6 +501,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /* * @see SourceViewerConfiguration#getIndentPrefixes(ISourceViewer, String) */ + @Override public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) { ICProject project= getCProject(); final int tabWidth= CodeFormatterUtil.getTabWidth(project); @@ -582,6 +590,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /* * @see SourceViewerConfiguration#getTabWidth(ISourceViewer) */ + @Override public int getTabWidth(ISourceViewer sourceViewer) { return CodeFormatterUtil.getTabWidth(getCProject()); } @@ -614,8 +623,10 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /** * @see SourceViewerConfiguration#getAnnotationHover(ISourceViewer) */ + @Override public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) { return new HTMLAnnotationHover() { + @Override protected boolean isIncluded(Annotation annotation) { return isShowInVerticalRuler(annotation); } @@ -626,6 +637,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { * @see SourceViewerConfiguration#getConfiguredTextHoverStateMasks(ISourceViewer, String) * @since 2.1 */ + @Override public int[] getConfiguredTextHoverStateMasks(ISourceViewer sourceViewer, String contentType) { CEditorTextHoverDescriptor[] hoverDescs= CUIPlugin.getDefault().getCEditorTextHoverDescriptors(); int stateMasks[]= new int[hoverDescs.length]; @@ -655,6 +667,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String, int) * @since 2.1 */ + @Override public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) { CEditorTextHoverDescriptor[] hoverDescs= CUIPlugin.getDefault().getCEditorTextHoverDescriptors(); int i= 0; @@ -670,6 +683,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /* * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String) */ + @Override public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) { return getTextHover(sourceViewer, contentType, ITextViewerExtension2.DEFAULT_HOVER_STATE_MASK); } @@ -677,6 +691,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /** * @see SourceViewerConfiguration#getConfiguredContentTypes(ISourceViewer) */ + @Override public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { return new String[] { IDocument.DEFAULT_CONTENT_TYPE, @@ -693,6 +708,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /** * @see SourceViewerConfiguration#getContentFormatter(ISourceViewer) */ + @Override public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) { final MultiPassContentFormatter formatter = @@ -722,6 +738,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { * @see SourceViewerConfiguration#getHoverControlCreator(ISourceViewer) * @since 2.0 */ + @Override public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) { return getInformationControlCreator(sourceViewer, true); } @@ -759,6 +776,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { * @see SourceViewerConfiguration#getInformationPresenter(ISourceViewer) * @since 2.0 */ + @Override public IInformationPresenter getInformationPresenter(ISourceViewer sourceViewer) { InformationPresenter presenter= new InformationPresenter(getInformationPresenterControlCreator(sourceViewer)); presenter.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer)); @@ -811,6 +829,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /* * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer) */ + @Override public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) { if (fDocumentPartitioning != null) return fDocumentPartitioning; @@ -955,6 +974,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { /* * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkDetectorTargets(org.eclipse.jface.text.source.ISourceViewer) */ + @Override protected Map getHyperlinkDetectorTargets(ISourceViewer sourceViewer) { Map targets= super.getHyperlinkDetectorTargets(sourceViewer); targets.put("org.eclipse.cdt.ui.cCode", fTextEditor); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java index d1653bee20c..aeb50bf5c1d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java @@ -176,6 +176,7 @@ public class CStringAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy /* * @see org.eclipse.jface.text.IAutoIndentStrategy#customizeDocumentCommand(IDocument, DocumentCommand) */ + @Override public void customizeDocumentCommand(IDocument document, DocumentCommand command) { try { if (command.length != 0 || command.text == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java index 624846c332d..9309253df91 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java @@ -59,6 +59,7 @@ public class CStringDoubleClickSelector extends CDoubleClickSelector { /* * @see ITextDoubleClickStrategy#doubleClicked(ITextViewer) */ + @Override public void doubleClicked(ITextViewer textViewer) { int offset= textViewer.getSelectedRange().x; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java index 2298f05bfc8..28d527206dd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java @@ -44,6 +44,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#first() */ + @Override public int first() { fIndex= fIterator.first(); return fIndex; @@ -52,6 +53,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#last() */ + @Override public int last() { fIndex= fIterator.last(); return fIndex; @@ -60,6 +62,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#next(int) */ + @Override public int next(int n) { int next= 0; while (--n > 0 && next != DONE) { @@ -71,6 +74,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#next() */ + @Override public int next() { fIndex= following(fIndex); return fIndex; @@ -79,6 +83,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#previous() */ + @Override public int previous() { fIndex= preceding(fIndex); return fIndex; @@ -88,6 +93,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#preceding(int) */ + @Override public int preceding(int offset) { int first= fIterator.preceding(offset); if (isWhitespace(first, offset)) { @@ -101,6 +107,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#following(int) */ + @Override public int following(int offset) { int first= fIterator.following(offset); if (eatFollowingWhitespace(offset, first)) { @@ -184,6 +191,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#current() */ + @Override public int current() { return fIndex; } @@ -191,6 +199,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#getText() */ + @Override public CharacterIterator getText() { return fIterator.getText(); } @@ -207,6 +216,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#setText(java.text.CharacterIterator) */ + @Override public void setText(CharacterIterator newText) { fIterator.setText(newText); first(); @@ -215,6 +225,7 @@ public class CWordIterator extends BreakIterator { /* * @see com.ibm.icu.text.BreakIterator#setText(java.lang.String) */ + @Override public void setText(String newText) { setText((CharSequence) newText); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/DocumentCharacterIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/DocumentCharacterIterator.java index ab16c74ca3d..1208eaf5763 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/DocumentCharacterIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/DocumentCharacterIterator.java @@ -169,6 +169,7 @@ public class DocumentCharacterIterator implements CharacterIterator, CharSequenc /* * @see java.text.CharacterIterator#clone() */ + @Override public Object clone() { try { return super.clone(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java index 9274c99b1be..6965b4f9c1b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java @@ -34,6 +34,7 @@ public class FastCPartitioner extends FastPartitioner { super(scanner, legalContentTypes); } + @Override public ITypedRegion getPartition(int offset, boolean preferOpenPartitions) { if (preferOpenPartitions && offset == fDocument.getLength() && offset > 0) { ITypedRegion region = super.getPartition(offset - 1, false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTML2TextReader.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTML2TextReader.java index 7e0b3a0e15a..644df51c336 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTML2TextReader.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTML2TextReader.java @@ -73,6 +73,7 @@ public class HTML2TextReader extends SubstitutionTextReader { fTextPresentation= presentation; } + @Override public int read() throws IOException { int c= super.read(); if (c != -1) @@ -99,6 +100,7 @@ public class HTML2TextReader extends SubstitutionTextReader { /** * @see SubstitutionTextReader#computeSubstitution(int) */ + @Override protected String computeSubstitution(int c) throws IOException { if (c == '<') return processHTMLTag(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java index 4dd5bde4710..b3d30e7e888 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java @@ -28,6 +28,7 @@ public class HTMLAnnotationHover extends DefaultAnnotationHover { /* * Formats a message as HTML text. */ + @Override protected String formatSingleMessage(String message) { StringBuffer buffer= new StringBuffer(); HTMLPrinter.addPageProlog(buffer); @@ -39,6 +40,7 @@ public class HTMLAnnotationHover extends DefaultAnnotationHover { /* * Formats several message as HTML text. */ + @Override protected String formatMultipleMessages(List messages) { StringBuffer buffer= new StringBuffer(); HTMLPrinter.addPageProlog(buffer); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java index 52f207f5199..6928972a73e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java @@ -77,6 +77,7 @@ public class PreprocessorRule extends WordRule { /* * @see org.eclipse.jface.text.rules.WordRule#addWord(java.lang.String, org.eclipse.jface.text.rules.IToken) */ + @Override public void addWord(String word, IToken token) { if (word.charAt(0) == '#') { word= word.substring(1); @@ -87,6 +88,7 @@ public class PreprocessorRule extends WordRule { /* * @see IRule#evaluate */ + @Override public IToken evaluate(ICharacterScanner scanner) { int c; int nCharsToRollback = 0; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SequenceCharacterIterator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SequenceCharacterIterator.java index dab41167e9d..f395e8a16b1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SequenceCharacterIterator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SequenceCharacterIterator.java @@ -156,6 +156,7 @@ public class SequenceCharacterIterator implements CharacterIterator { /* * @see java.text.CharacterIterator#clone() */ + @Override public Object clone() { try { return super.clone(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java index 2673cfb2212..4a9e78214f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java @@ -56,6 +56,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getAutoEditStrategies(ISourceViewer, String) */ + @Override public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) { return null; } @@ -63,6 +64,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getAnnotationHover(ISourceViewer) */ + @Override public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) { return null; } @@ -70,6 +72,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getOverviewRulerAnnotationHover(ISourceViewer) */ + @Override public IAnnotationHover getOverviewRulerAnnotationHover(ISourceViewer sourceViewer) { return null; } @@ -77,6 +80,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getConfiguredTextHoverStateMasks(ISourceViewer, String) */ + @Override public int[] getConfiguredTextHoverStateMasks(ISourceViewer sourceViewer, String contentType) { return null; } @@ -84,6 +88,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String, int) */ + @Override public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) { return null; } @@ -91,6 +96,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String) */ + @Override public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) { return null; } @@ -98,6 +104,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getContentFormatter(ISourceViewer) */ + @Override public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) { if (fConfigureFormatter) return super.getContentFormatter(sourceViewer); @@ -108,6 +115,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getInformationControlCreator(ISourceViewer) */ + @Override public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) { return null; } @@ -115,6 +123,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getInformationPresenter(ISourceViewer) */ + @Override public IInformationPresenter getInformationPresenter(ISourceViewer sourceViewer) { return null; } @@ -122,6 +131,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see SourceViewerConfiguration#getHyperlinkDetectors(ISourceViewer) */ + @Override public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) { return null; } @@ -129,6 +139,7 @@ public class SimpleCSourceViewerConfiguration extends CSourceViewerConfiguration /* * @see CSourceViewerConfiguration#getOutlinePresenter(ISourceViewer) */ + @Override public IInformationPresenter getOutlinePresenter(ISourceViewer sourceViewer) { return null; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java index ce3c2746e5d..f88466e1a48 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java @@ -20,12 +20,14 @@ public abstract class SingleCharReader extends Reader { /** * @see Reader#read() */ + @Override public abstract int read() throws IOException; /** * @see Reader#read(char[],int,int) */ + @Override public int read(char cbuf[], int off, int len) throws IOException { int end= off + len; for (int i= off; i < end; i++) { @@ -44,7 +46,8 @@ public abstract class SingleCharReader extends Reader { /** * @see Reader#ready() */ - public boolean ready() throws IOException { + @Override + public boolean ready() throws IOException { return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java index c79afdc63c5..e027e657886 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java @@ -45,6 +45,7 @@ public final class SingleTokenCScanner extends AbstractCScanner { /** * setRange -- sets the range to be scanned */ + @Override public void setRange(IDocument document, int offset, int length) { super.setRange(document, offset, length); @@ -58,6 +59,7 @@ public final class SingleTokenCScanner extends AbstractCScanner { * * @return the next token in the document */ + @Override public IToken nextToken() { fTokenOffset = position; @@ -69,6 +71,7 @@ public final class SingleTokenCScanner extends AbstractCScanner { return Token.EOF; } + @Override public int getTokenLength() { return size; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java index d21858ba93a..93341c3e679 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java @@ -91,6 +91,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#read() */ + @Override public int read() throws IOException { int c; do { @@ -114,13 +115,15 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#ready() */ - public boolean ready() throws IOException { + @Override + public boolean ready() throws IOException { return fReader.ready(); } /** * @see Reader#close() */ + @Override public void close() throws IOException { fReader.close(); } @@ -128,6 +131,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader { /** * @see Reader#reset() */ + @Override public void reset() throws IOException { fReader.reset(); fWasWhiteSpace= true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java index bc6e976708d..7ac5daf6cc2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java @@ -58,6 +58,7 @@ public class AbstractAnnotationHover extends AbstractCEditorTextHover { /* * @see ITextHover#getHoverInfo(ITextViewer, IRegion) */ + @Override public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { if (getEditor() == null) @@ -99,6 +100,7 @@ public class AbstractAnnotationHover extends AbstractCEditorTextHover { /* * @see IJavaEditorTextHover#setEditor(IEditorPart) */ + @Override public void setEditor(IEditorPart editor) { if (editor instanceof CEditor) super.setEditor(editor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java index 2827c1390b1..f713d927440 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java @@ -88,6 +88,7 @@ public class BestMatchHover extends AbstractCEditorTextHover { /* * @see ITextHover#getHoverInfo(ITextViewer, IRegion) */ + @Override public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { checkTextHovers(); @@ -112,6 +113,7 @@ public class BestMatchHover extends AbstractCEditorTextHover { /* * @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) */ + @Override public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) { checkTextHovers(); @@ -145,6 +147,7 @@ public class BestMatchHover extends AbstractCEditorTextHover { * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator() * @since 3.0 */ + @Override public IInformationControlCreator getHoverControlCreator() { if (fBestHover instanceof ITextHoverExtension) return ((ITextHoverExtension)fBestHover).getHoverControlCreator(); @@ -156,6 +159,7 @@ public class BestMatchHover extends AbstractCEditorTextHover { * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator() * @since 3.0 */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { // this is wrong, but left here for backwards compatibility if (fBestHover instanceof IInformationProviderExtension2) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java index 05600e19a7e..c95d3a49b88 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java @@ -42,6 +42,7 @@ public class CDocHover extends AbstractCEditorTextHover { /* (non-Javadoc) * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) */ + @Override public String getHoverInfo(ITextViewer viewer, IRegion region) { String expression = null; @@ -116,6 +117,7 @@ public class CDocHover extends AbstractCEditorTextHover { /* (non-Javadoc) * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int) */ + @Override public IRegion getHoverRegion(ITextViewer viewer, int offset) { Point selectedRange = viewer.getSelectedRange(); if (selectedRange.x >= 0 && diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java index a61974b10e1..0dae58e800e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java @@ -167,12 +167,14 @@ public class CEditorTextHoverDescriptor implements Comparable { return Boolean.valueOf(fElement.getAttribute(ACTIVATE_PLUG_IN_ATTRIBUTE)).booleanValue(); } + @Override public boolean equals(Object obj) { if (obj == null || !obj.getClass().equals(this.getClass()) || getId() == null) return false; return getId().equals(((CEditorTextHoverDescriptor)obj).getId()); } + @Override public int hashCode() { return getId().hashCode(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java index 4f0f4aed8f5..01c92501e87 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java @@ -38,6 +38,7 @@ public class CEditorTextHoverProxy extends AbstractCEditorTextHover { /* * @see ICEditorTextHover#setEditor(IEditorPart) */ + @Override public void setEditor(IEditorPart editor) { super.setEditor(editor); @@ -52,6 +53,7 @@ public class CEditorTextHoverProxy extends AbstractCEditorTextHover { /* * @see ITextHover#getHoverRegion(ITextViewer, int) */ + @Override public IRegion getHoverRegion(ITextViewer textViewer, int offset) { if (ensureHoverCreated()) return fHover.getHoverRegion(textViewer, offset); @@ -62,6 +64,7 @@ public class CEditorTextHoverProxy extends AbstractCEditorTextHover { /* * @see ITextHover#getHoverInfo(ITextViewer, IRegion) */ + @Override public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { if (ensureHoverCreated()) return fHover.getHoverInfo(textViewer, hoverRegion); @@ -74,6 +77,7 @@ public class CEditorTextHoverProxy extends AbstractCEditorTextHover { * @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) * @since 5.0 */ + @Override public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) { if (ensureHoverCreated()) { if (fHover instanceof ITextHoverExtension2) @@ -106,6 +110,7 @@ public class CEditorTextHoverProxy extends AbstractCEditorTextHover { * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator() * @since 3.0 */ + @Override public IInformationControlCreator getHoverControlCreator() { if (ensureHoverCreated() && (fHover instanceof ITextHoverExtension)) return ((ITextHoverExtension)fHover).getHoverControlCreator(); @@ -116,6 +121,7 @@ public class CEditorTextHoverProxy extends AbstractCEditorTextHover { /* * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator() */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { if (ensureHoverCreated()) { // this is wrong, but left here for backwards compatibility diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java index fadcc21a843..32a40bf411a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java @@ -40,6 +40,7 @@ public class CInformationProvider implements IInformationProvider, IInformationP * Default control creator. */ private static final class ControlCreator extends AbstractReusableInformationControlCreator { + @Override public IInformationControl doCreateInformationControl(Shell parent) { return new DefaultInformationControl(parent); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java index 9bb17b057dc..3eb865eee1b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java @@ -127,6 +127,7 @@ class CMacroCompareViewer extends CMergeViewer { /* * @see org.eclipse.cdt.internal.ui.compare.AbstractMergeViewer#handleDispose(org.eclipse.swt.events.DisposeEvent) */ + @Override protected void handleDispose(DisposeEvent event) { fLeftViewer.removeTextPresentationListener(fLeftHighlighter); fRightViewer.removeTextPresentationListener(fRightHighlighter); @@ -134,6 +135,7 @@ class CMacroCompareViewer extends CMergeViewer { super.handleDispose(event); } + @Override protected IToolBarManager getToolBarManager(Composite parent) { // no toolbar return null; @@ -142,6 +144,7 @@ class CMacroCompareViewer extends CMergeViewer { /* * @see org.eclipse.cdt.internal.ui.compare.AbstractMergeViewer#configureTextViewer(org.eclipse.jface.text.TextViewer) */ + @Override protected void configureTextViewer(TextViewer textViewer) { super.configureTextViewer(textViewer); @@ -161,6 +164,7 @@ class CMacroCompareViewer extends CMergeViewer { /* * @see org.eclipse.compare.contentmergeviewer.TextMergeViewer#createTokenComparator(java.lang.String) */ + @Override protected ITokenComparator createTokenComparator(String line) { return new NullTokenComparator(); } @@ -178,6 +182,7 @@ class CMacroCompareViewer extends CMergeViewer { /* * @see org.eclipse.jface.viewers.ContentViewer#setInput(java.lang.Object) */ + @Override public void setInput(Object input) { fLeftViewer.setRedraw(false); fRightViewer.setRedraw(false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java index 449327dc9fc..eb6b147d257 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java @@ -43,6 +43,7 @@ public class CMacroExpansionControl extends AbstractSourceViewerInformationContr /* * @see org.eclipse.cdt.internal.ui.text.AbstractSourceViewerInformationControl#hasHeader() */ + @Override protected boolean hasHeader() { return true; } @@ -50,6 +51,7 @@ public class CMacroExpansionControl extends AbstractSourceViewerInformationContr /* * @see org.eclipse.cdt.internal.ui.text.AbstractSourceViewerInformationControl#getId() */ + @Override protected String getId() { return "org.eclipse.cdt.ui.text.hover.CMacroExpansion"; //$NON-NLS-1$ } @@ -70,6 +72,7 @@ public class CMacroExpansionControl extends AbstractSourceViewerInformationContr /* * @see org.eclipse.jface.text.IInformationControlExtension5#getInformationPresenterControlCreator() */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return new IInformationControlCreator() { public IInformationControl createInformationControl(Shell parent) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java index 7fe51ee771b..f33d375c9e3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java @@ -136,6 +136,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo /* * @see org.eclipse.cdt.internal.ui.text.AbstractSourceViewerInformationControl#hasHeader() */ + @Override protected boolean hasHeader() { return true; } @@ -143,6 +144,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo /* * @see org.eclipse.cdt.internal.ui.text.AbstractCompareViewerInformationControl#createCompareViewerControl(org.eclipse.swt.widgets.Composite, int, org.eclipse.compare.CompareConfiguration) */ + @Override protected CompareViewerControl createCompareViewerControl(Composite parent, int style, CompareConfiguration compareConfig) { Splitter splitter= new Splitter(parent, SWT.VERTICAL); splitter.setLayoutData(new GridData(GridData.FILL_BOTH)); @@ -155,6 +157,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo /* * @see org.eclipse.cdt.internal.ui.text.AbstractCompareViewerInformationControl#createContentViewer(org.eclipse.swt.widgets.Composite, org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.CompareConfiguration) */ + @Override protected Viewer createContentViewer(Composite parent, ICompareInput input, CompareConfiguration cc) { fMacroCompareViewer= new CMacroCompareViewer(parent, SWT.NULL, cc); if (fInput != null) { @@ -216,19 +219,22 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo protected void registerCommandHandlers() { IHandler backwardHandler= new AbstractHandler() { - public Object execute(ExecutionEvent event) throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { backward(); return null; } }; IHandler forwardHandler= new AbstractHandler() { - public Object execute(ExecutionEvent event) throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { forward(); return null; } }; IHandler gotoDefinitionHandler= new AbstractHandler() { - public Object execute(ExecutionEvent event) throws ExecutionException { + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { gotoMacroDefinition(); return null; } @@ -252,6 +258,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo /* * @see org.eclipse.cdt.internal.ui.text.AbstractCompareViewerInformationControl#fillViewMenu(org.eclipse.jface.action.IMenuManager) */ + @Override protected void fillViewMenu(IMenuManager viewMenu) { super.fillViewMenu(viewMenu); final CommandContributionItemParameter params= new CommandContributionItemParameter( @@ -319,6 +326,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo /* * @see org.eclipse.jface.dialogs.PopupDialog#close() */ + @Override public boolean close() { unregisterCommandHandlers(); return super.close(); @@ -327,6 +335,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo /* * @see org.eclipse.cdt.internal.ui.text.AbstractCompareViewerInformationControl#getId() */ + @Override protected String getId() { return "org.eclipse.cdt.ui.text.hover.CMacroExpansionExploration"; //$NON-NLS-1$ } @@ -334,6 +343,7 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo /* * @see org.eclipse.cdt.internal.ui.text.AbstractCompareViewerInformationControl#setInput(java.lang.Object) */ + @Override public void setInput(Object input) { if (input instanceof CMacroExpansionInput) { setMacroExpansionInput((CMacroExpansionInput) input); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionHover.java index 6cbc096a0a9..68f30a97c4a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionHover.java @@ -33,6 +33,7 @@ public class CMacroExpansionHover extends AbstractCEditorTextHover { private Reference fCache; + @Override public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { Object hoverInfo= getHoverInfo2(textViewer, hoverRegion); return hoverInfo != null ? hoverInfo.toString() : null; @@ -41,6 +42,7 @@ public class CMacroExpansionHover extends AbstractCEditorTextHover { /* * @see org.eclipse.cdt.internal.ui.text.c.hover.AbstractCEditorTextHover#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion) */ + @Override public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) { CMacroExpansionInput input= CMacroExpansionInput.create(getEditor(), hoverRegion, false); return input; @@ -49,6 +51,7 @@ public class CMacroExpansionHover extends AbstractCEditorTextHover { /* * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator() */ + @Override public IInformationControlCreator getHoverControlCreator() { return new IInformationControlCreator() { public IInformationControl createInformationControl(Shell parent) { @@ -60,6 +63,7 @@ public class CMacroExpansionHover extends AbstractCEditorTextHover { /* * @see org.eclipse.cdt.internal.ui.text.c.hover.AbstractCEditorTextHover#getInformationPresenterControlCreator() */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return new IInformationControlCreator() { public IInformationControl createInformationControl(Shell parent) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java index 222f461663a..3126f445618 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java @@ -801,6 +801,7 @@ public class CSourceHover extends AbstractCEditorTextHover { private String searchInIndex(final ITranslationUnit tUnit, IRegion textRegion) { final ComputeSourceRunnable computer= new ComputeSourceRunnable(tUnit, textRegion); Job job= new Job(CHoverMessages.CSourceHover_jobTitle) { + @Override protected IStatus run(IProgressMonitor monitor) { return ASTProvider.getASTProvider().runOnAST(tUnit, ASTProvider.WAIT_ACTIVE_ONLY, monitor, computer); } @@ -855,6 +856,7 @@ public class CSourceHover extends AbstractCEditorTextHover { * @see IInformationProviderExtension2#getInformationPresenterControlCreator() * @since 3.0 */ + @Override public IInformationControlCreator getInformationPresenterControlCreator() { return new IInformationControlCreator() { public IInformationControl createInformationControl(Shell parent) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java index d71ff3f484b..7dc16f6c915 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java @@ -666,6 +666,7 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro /* * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return fIdString.hashCode(); } @@ -673,6 +674,7 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro /* * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object other) { if(!(other instanceof ICCompletionProposal)) return false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java index 9e5fb52012f..32647ae46f8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java @@ -261,6 +261,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont return fIsAutoActivated; } + @Override public void dispose() { if (fIndex != null) { fIndex.releaseReadLock(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java index 63c652c97cb..e346031556e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java @@ -136,6 +136,7 @@ public class CContentAssistProcessor extends ContentAssistProcessor { /* * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator() */ + @Override public IContextInformationValidator getContextInformationValidator() { if (fValidator == null) { fValidator= new CParameterListValidator(); @@ -146,6 +147,7 @@ public class CContentAssistProcessor extends ContentAssistProcessor { /* * @see org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistProcessor#filterAndSort(java.util.List, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected List filterAndSortProposals(List proposals, IProgressMonitor monitor, ContentAssistInvocationContext context) { IProposalFilter filter = getCompletionFilter(); ICCompletionProposal[] proposalsInput= new ICCompletionProposal[proposals.size()]; @@ -219,6 +221,7 @@ public class CContentAssistProcessor extends ContentAssistProcessor { return filter; } + @Override protected List filterAndSortContextInformation(List contexts, IProgressMonitor monitor) { return contexts; @@ -227,6 +230,7 @@ public class CContentAssistProcessor extends ContentAssistProcessor { /* * @see org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistProcessor#createContext(org.eclipse.jface.text.ITextViewer, int) */ + @Override protected ContentAssistInvocationContext createContext(ITextViewer viewer, int offset, boolean isCompletion) { return new CContentAssistInvocationContext(viewer, offset, fEditor, isCompletion, isAutoActivated()); } @@ -234,6 +238,7 @@ public class CContentAssistProcessor extends ContentAssistProcessor { /* * @see org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistProcessor#verifyAutoActivation(org.eclipse.jface.text.ITextViewer, int) */ + @Override protected boolean verifyAutoActivation(ITextViewer viewer, int offset) { IDocument doc= viewer.getDocument(); if (doc == null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CProposalContextInformation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CProposalContextInformation.java index 00333729c60..0ad06bd12c5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CProposalContextInformation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CProposalContextInformation.java @@ -58,6 +58,7 @@ public class CProposalContextInformation implements IContextInformation, IContex /* * @see IContextInformation#equals(Object) */ + @Override public boolean equals(Object object) { if (object instanceof IContextInformation) { IContextInformation contextInformation= (IContextInformation) object; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java index c5a3b3d4276..3b329b8d091 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java @@ -345,11 +345,13 @@ public final class CompletionProposalComputerRegistry { String message= status.getMessage(); // inlined from MessageDialog.openError MessageDialog dialog = new MessageDialog(CUIPlugin.getActiveWorkbenchShell(), title, null /* default image */, message, MessageDialog.ERROR, new String[] { IDialogConstants.OK_LABEL }, 0) { - protected Control createCustomArea(Composite parent) { + @Override + protected Control createCustomArea(Composite parent) { Link link= new Link(parent, SWT.NONE); link.setText(avoidHint); link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(getShell(), "org.eclipse.cdt.ui.preferences.CodeAssistPreferenceAdvanced", null, null).open(); //$NON-NLS-1$ } }); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java index 7f0811e9daa..4201c3ead67 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java @@ -36,6 +36,7 @@ public final class ContentAssistHandler extends AbstractHandler { /* * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { ITextEditor editor= getActiveEditor(); if (editor == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java index 4387f6f5686..409bbb4df7d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java @@ -490,6 +490,7 @@ public class ContentAssistProcessor implements IContentAssistProcessor { /* * @see org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog#createCustomArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createCustomArea(Composite composite) { // wrap link and checkbox in one composite without space Composite parent= new Composite(composite, SWT.NONE); @@ -509,7 +510,8 @@ public class ContentAssistProcessor implements IContentAssistProcessor { Link link= new Link(linkComposite, SWT.NONE); link.setText(linkMessage); link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { setReturnCode(settingsId); close(); } @@ -527,6 +529,7 @@ public class ContentAssistProcessor implements IContentAssistProcessor { /* * @see org.eclipse.jface.dialogs.MessageDialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { Button[] buttons= new Button[2]; buttons[0]= createButton(parent, restoreId, restoreButtonLabel, false); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java index 8b0329746b4..dc9f8d0e1f3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java @@ -32,6 +32,7 @@ import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; public class HelpCompletionProposalComputer extends ParsingBasedProposalComputer { + @Override protected List computeCompletionProposals( CContentAssistInvocationContext cContext, IASTCompletionNode completionNode, String prefix) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java index cd99d50c4d4..3ca36f22593 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java @@ -37,6 +37,7 @@ import org.eclipse.cdt.internal.ui.viewsupport.CElementImageProvider; public class KeywordCompletionProposalComputer extends ParsingBasedProposalComputer implements ICompletionProposalComputer { + @Override protected List computeCompletionProposals( CContentAssistInvocationContext context, IASTCompletionNode completionNode, String prefix) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java index 4c786fc4110..d870f58527d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java @@ -114,6 +114,7 @@ public class CCorrectionAssistant extends QuickAssistAssistant { /* (non-Javadoc) * @see org.eclipse.jface.text.contentassist.IContentAssistant#install(org.eclipse.jface.text.ITextViewer) */ + @Override public void install(ISourceViewer sourceViewer) { super.install(sourceViewer); fViewer= sourceViewer; @@ -127,6 +128,7 @@ public class CCorrectionAssistant extends QuickAssistAssistant { /* (non-Javadoc) * @see org.eclipse.jface.text.contentassist.ContentAssistant#uninstall() */ + @Override public void uninstall() { if (fLightBulbUpdater != null) { fLightBulbUpdater.uninstall(); @@ -144,6 +146,7 @@ public class CCorrectionAssistant extends QuickAssistAssistant { * * @see IQuickAssistAssistant#showPossibleQuickAssists() */ + @Override public String showPossibleQuickAssists() { fPosition= null; fCurrentAnnotations= null; @@ -306,6 +309,7 @@ public class CCorrectionAssistant extends QuickAssistAssistant { /* * @see org.eclipse.jface.text.contentassist.ContentAssistant#possibleCompletionsClosed() */ + @Override protected void possibleCompletionsClosed() { super.possibleCompletionsClosed(); restorePosition(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java index 7a19d360a1f..f0860ac63f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java @@ -330,6 +330,7 @@ public class CCorrectionProcessor implements IQuickAssistProcessor { fLocations= locations; } + @Override public void safeRun(ContributedProcessorDescriptor desc) throws Exception { IQuickFixProcessor curr= (IQuickFixProcessor) desc.getProcessor(fContext.getTranslationUnit()); if (curr != null) { @@ -354,6 +355,7 @@ public class CCorrectionProcessor implements IQuickAssistProcessor { fProposals= proposals; } + @Override public void safeRun(ContributedProcessorDescriptor desc) throws Exception { IQuickFixProcessor curr= (IQuickFixProcessor) desc.getProcessor(fContext.getTranslationUnit()); if (curr != null) { @@ -380,6 +382,7 @@ public class CCorrectionProcessor implements IQuickAssistProcessor { return fHasAssists; } + @Override public void safeRun(ContributedProcessorDescriptor desc) throws Exception { IQuickAssistProcessor processor= (IQuickAssistProcessor) desc.getProcessor(fContext.getTranslationUnit()); if (processor != null && processor.canAssist(fContext)) { @@ -403,6 +406,7 @@ public class CCorrectionProcessor implements IQuickAssistProcessor { return fHasCorrections; } + @Override public void safeRun(ContributedProcessorDescriptor desc) throws Exception { IQuickFixProcessor processor= (IQuickFixProcessor) desc.getProcessor(fCu); if (processor != null && processor.hasCorrections(fCu, fProblemId)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java index 59bfbf75df2..5065bda4df1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java @@ -55,7 +55,8 @@ public class CSelectAnnotationRulerAction extends SelectMarkerRulerAction { fStore= CUIPlugin.getDefault().getCombinedPreferenceStore(); } - public void run() { + @Override + public void run() { // is there an equivalent preference for the C Editor? // if (fStore.getBoolean(PreferenceConstants.EDITOR_ANNOTATION_ROLL_OVER)) // return; @@ -66,7 +67,8 @@ public class CSelectAnnotationRulerAction extends SelectMarkerRulerAction { /* * @see org.eclipse.jface.action.IAction#runWithEvent(org.eclipse.swt.widgets.Event) */ - public void runWithEvent(Event event) { + @Override + public void runWithEvent(Event event) { if (fHasCorrection) { ITextOperationTarget operation= (ITextOperationTarget) fTextEditor.getAdapter(ITextOperationTarget.class); final int opCode= ISourceViewer.QUICK_ASSIST; @@ -84,7 +86,8 @@ public class CSelectAnnotationRulerAction extends SelectMarkerRulerAction { * (non-Javadoc) * @see org.eclipse.ui.texteditor.SelectMarkerRulerAction#update() */ - public void update() { + @Override + public void update() { findCAnnotation(); setEnabled(true); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java index a7d1c785647..9055319027d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java @@ -22,7 +22,8 @@ public class CSelectRulerAction extends AbstractRulerActionDelegate { /* * @see AbstractRulerActionDelegate#createAction(ITextEditor, IVerticalRulerInfo) */ - protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) { + @Override + protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) { return new CSelectAnnotationRulerAction(CEditorMessages.getResourceBundle(), "CSelectAnnotationRulerAction.", editor, rulerInfo); //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java index 11d3529ae0e..07972889f3e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java @@ -58,6 +58,7 @@ public class CorrectionCommandHandler extends AbstractHandler { /* (non-Javadoc) * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) */ + @Override public Object execute(ExecutionEvent event) throws ExecutionException { ISelection selection= fEditor.getSelectionProvider().getSelection(); ITranslationUnit cu= CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(fEditor.getEditorInput()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java index be7da40c887..f9410e19418 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java @@ -100,6 +100,7 @@ public class ProblemLocation implements IProblemLocation { return fMarkerType; } + @Override public String toString() { StringBuffer buf= new StringBuffer(); buf.append("Id: ").append(getErrorCode(fId)).append('\n'); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentMultilineProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentMultilineProposalComputer.java index 17cc0dfc67e..fa15ccd89f7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentMultilineProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentMultilineProposalComputer.java @@ -14,6 +14,7 @@ import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; public class DocCommentMultilineProposalComputer extends AbstractDocCommentProposalComputer { + @Override protected IDocCommentViewerConfiguration getConfiguration(IDocCommentOwner owner) { return owner.getMultilineConfiguration(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSinglelineProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSinglelineProposalComputer.java index 5ee2b639ab3..a30b69f7a02 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSinglelineProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSinglelineProposalComputer.java @@ -14,6 +14,7 @@ import org.eclipse.cdt.ui.text.doctools.IDocCommentOwner; import org.eclipse.cdt.ui.text.doctools.IDocCommentViewerConfiguration; public class DocCommentSinglelineProposalComputer extends AbstractDocCommentProposalComputer { + @Override protected IDocCommentViewerConfiguration getConfiguration(IDocCommentOwner owner) { return owner.getSinglelineConfiguration(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java index 9492777a4ba..4bef3cba616 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java @@ -37,6 +37,7 @@ public class DocCommentSpellDictionary extends AbstractSpellDictionary { /* * @see org.eclipse.cdt.internal.ui.text.spelling.engine.AbstractSpellDictionary#getName() */ + @Override protected final URL getURL() { return null; } @@ -44,6 +45,7 @@ public class DocCommentSpellDictionary extends AbstractSpellDictionary { /* * @see org.eclipse.cdt.ui.text.spelling.engine.AbstractSpellDictionary#load(java.net.URL) */ + @Override protected synchronized boolean load(final URL url) { unload(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java index 5039f25da4d..8f85c9afb48 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java @@ -140,6 +140,7 @@ public class EditorReopener implements IDocCommentOwnershipListener { private void reopenEditors(final IWorkbenchWindow window, final IEditorPart[] editorParts) throws CoreException { WorkbenchJob job= new WorkbenchJob(Messages.EditorReopener_ReopenJobStart) { + @Override public IStatus runInUIThread(IProgressMonitor monitor) { IEditorPart oldActive= window.getActivePage().getActiveEditor(); IEditorPart newActive= null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java index 771c905f73a..1e9d0922db3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java @@ -124,6 +124,7 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi fStatements = statements; } + @Override public int visit(IASTStatement statement) { ++fLevel; // if it's not part of the displayed - file, we don't need it @@ -216,11 +217,13 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi } } + @Override public int leave(IASTStatement statement) { --fLevel; return PROCESS_CONTINUE; } + @Override public int visit(IASTDeclaration declaration) { if (!declaration.isPartOfTranslationUnitFile()) return PROCESS_SKIP;// we neither need its descendants @@ -234,6 +237,7 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi return PROCESS_CONTINUE; } + @Override public int leave(IASTDeclaration declaration) { if (declaration instanceof IASTFunctionDefinition) { fFunction= ""; //$NON-NLS-1$ @@ -531,6 +535,7 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi /* * @see java.lang.Object#toString() */ + @Override public String toString() { return "CProjectionAnnotation:\n" + //$NON-NLS-1$ "\tkey: \t"+ fKey + "\n" + //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java index 6e81b20cebe..c7a2c712ab4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java @@ -46,6 +46,7 @@ public class CSpellingEngine extends SpellingEngine { /* * @see org.eclipse.cdt.internal.ui.text.spelling.SpellingEngine#check(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IRegion[], org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker, org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void check(IDocument document, IRegion[] regions, ISpellChecker checker, ISpellingProblemCollector collector, IProgressMonitor monitor) { ISpellEventListener listener= new SpellEventListener(collector, document); boolean isIgnoringStringLiterals= SpellingPreferences.isIgnoreStringLiterals(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java index 2fc57143629..0d8cce3f001 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java @@ -62,6 +62,7 @@ public class CSpellingProblem extends SpellingProblem { /* * @see org.eclipse.ui.texteditor.spelling.SpellingProblem#getOffset() */ + @Override public int getOffset() { return fSpellEvent.getBegin(); } @@ -69,6 +70,7 @@ public class CSpellingProblem extends SpellingProblem { /* * @see org.eclipse.ui.texteditor.spelling.SpellingProblem#getLength() */ + @Override public int getLength() { return fSpellEvent.getEnd() - fSpellEvent.getBegin() + 1; } @@ -76,6 +78,7 @@ public class CSpellingProblem extends SpellingProblem { /* * @see org.eclipse.ui.texteditor.spelling.SpellingProblem#getMessage() */ + @Override public String getMessage() { if (isSentenceStart() && isDictionaryMatch()) return Messages.bind(Messages.Spelling_error_case_label, fSpellEvent.getWord()); @@ -86,6 +89,7 @@ public class CSpellingProblem extends SpellingProblem { /* * @see org.eclipse.ui.texteditor.spelling.SpellingProblem#getProposals() */ + @Override public ICompletionProposal[] getProposals() { String[] arguments= getArguments(); if (arguments == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java index 616d4dd1fe6..c2ddec47937 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java @@ -112,6 +112,7 @@ public class CSpellingReconcileStrategy extends SpellingReconcileStrategy { /* * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#reconcile(org.eclipse.jface.text.IRegion) */ + @Override public void reconcile(IRegion region) { if (fRequestor != null && isSpellingEnabled()) super.reconcile(region); @@ -124,6 +125,7 @@ public class CSpellingReconcileStrategy extends SpellingReconcileStrategy { /* * @see org.eclipse.ui.texteditor.spelling.SpellingReconcileStrategy#createSpellingProblemCollector() */ + @Override protected ISpellingProblemCollector createSpellingProblemCollector() { return new SpellingProblemCollector(); } @@ -131,6 +133,7 @@ public class CSpellingReconcileStrategy extends SpellingReconcileStrategy { /* * @see org.eclipse.ui.texteditor.spelling.SpellingReconcileStrategy#getContentType() */ + @Override protected IContentType getContentType() { return CXX_CONTENT_TYPE; } @@ -138,6 +141,7 @@ public class CSpellingReconcileStrategy extends SpellingReconcileStrategy { /* * @see org.eclipse.jface.text.reconciler.IReconcilingStrategy#setDocument(org.eclipse.jface.text.IDocument) */ + @Override public void setDocument(IDocument document) { super.setDocument(document); updateProblemRequester(); @@ -154,6 +158,7 @@ public class CSpellingReconcileStrategy extends SpellingReconcileStrategy { /* * @see org.eclipse.ui.texteditor.spelling.SpellingReconcileStrategy#getAnnotationModel() */ + @Override protected IAnnotationModel getAnnotationModel() { final IDocumentProvider documentProvider= fEditor.getDocumentProvider(); if (documentProvider == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingService.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingService.java index 2a0c0661ffa..0e6fe924867 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingService.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingService.java @@ -43,6 +43,7 @@ public class CSpellingService extends SpellingService { return fInstance; } + @Override public void check(final IDocument document, final IRegion[] regions, final SpellingContext context, final ISpellingProblemCollector collector, final IProgressMonitor monitor) { try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/ChangeCaseProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/ChangeCaseProposal.java index d1263b0a9a5..6076a2fb350 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/ChangeCaseProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/ChangeCaseProposal.java @@ -39,6 +39,7 @@ public class ChangeCaseProposal extends WordCorrectionProposal { /* * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString() */ + @Override public String getDisplayString() { return Messages.Spelling_case_label; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java index baf4acbbbcd..9e91d9f2570 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java @@ -32,6 +32,7 @@ public class TaskTagDictionary extends AbstractSpellDictionary implements IPrope /* * @see org.eclipse.cdt.internal.ui.text.spelling.engine.AbstractSpellDictionary#getName() */ + @Override protected final URL getURL() { return null; } @@ -39,6 +40,7 @@ public class TaskTagDictionary extends AbstractSpellDictionary implements IPrope /* * @see org.eclipse.cdt.ui.text.spelling.engine.AbstractSpellDictionary#load(java.net.URL) */ + @Override protected synchronized boolean load(final URL url) { final Plugin plugin= CCorePlugin.getDefault(); if (plugin != null) { @@ -59,6 +61,7 @@ public class TaskTagDictionary extends AbstractSpellDictionary implements IPrope /* * @see org.eclipse.cdt.ui.text.spelling.engine.ISpellDictionary#unload() */ + @Override public synchronized void unload() { final Plugin plugin= CCorePlugin.getDefault(); if (plugin != null) @@ -89,6 +92,7 @@ public class TaskTagDictionary extends AbstractSpellDictionary implements IPrope /* * @see org.eclipse.cdt.internal.ui.text.spelling.engine.AbstractSpellDictionary#stripNonLetters(java.lang.String) */ + @Override protected String stripNonLetters(String word) { return word; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java index b50ad739f92..82b46f6ff73 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java @@ -29,6 +29,7 @@ public class TextSpellingEngine extends SpellingEngine { /* * @see org.eclipse.cdt.internal.ui.text.spelling.SpellingEngine#check(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IRegion[], org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellChecker, org.eclipse.ui.texteditor.spelling.ISpellingProblemCollector, org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void check(IDocument document, IRegion[] regions, ISpellChecker checker, ISpellingProblemCollector collector, IProgressMonitor monitor) { ISpellEventListener listener= new SpellEventListener(collector, document); try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java index 29d70b9b134..6142366097a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java @@ -80,6 +80,7 @@ public final class WordCompletionProposalComputer implements ICompletionProposal /* * @see org.eclipse.cdt.internal.ui.text.java.JavaCompletionProposal#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent) */ + @Override public boolean validate(IDocument doc, int validate_offset, DocumentEvent event) { return offset == validate_offset; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/LocaleSensitiveSpellDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/LocaleSensitiveSpellDictionary.java index d7aaf50b2aa..f742bd9b797 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/LocaleSensitiveSpellDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/LocaleSensitiveSpellDictionary.java @@ -49,6 +49,7 @@ public class LocaleSensitiveSpellDictionary extends AbstractSpellDictionary { /* * @see org.eclipse.cdt.internal.ui.text.spelling.engine.AbstractSpellDictionary#getURL() */ + @Override protected final URL getURL() throws MalformedURLException { return new URL(fLocation, fLocale.toString() + ".dictionary"); //$NON-NLS-1$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java index f64821834a2..88c7f9e8634 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java @@ -40,6 +40,7 @@ public class PersistentSpellDictionary extends AbstractSpellDictionary { /* * @see org.eclipse.cdt.ui.text.spelling.engine.AbstractSpellDictionary#acceptsWords() */ + @Override public boolean acceptsWords() { return true; } @@ -47,6 +48,7 @@ public class PersistentSpellDictionary extends AbstractSpellDictionary { /* * @see org.eclipse.cdt.internal.ui.text.spelling.engine.ISpellDictionary#addWord(java.lang.String) */ + @Override public void addWord(final String word) { if (isCorrect(word)) return; @@ -89,6 +91,7 @@ public class PersistentSpellDictionary extends AbstractSpellDictionary { /* * @see org.eclipse.cdt.internal.ui.text.spelling.engine.AbstractSpellDictionary#getURL() */ + @Override protected final URL getURL() { return fLocation; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/RankedWordProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/RankedWordProposal.java index ad34766cddd..480f3da11cf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/RankedWordProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/RankedWordProposal.java @@ -53,6 +53,7 @@ public class RankedWordProposal implements Comparable { /* * @see java.lang.Object#equals(java.lang.Object) */ + @Override public final boolean equals(Object object) { if (object instanceof RankedWordProposal) return object.hashCode() == hashCode(); @@ -81,6 +82,7 @@ public class RankedWordProposal implements Comparable { /* * @see java.lang.Object#hashCode() */ + @Override public final int hashCode() { return fText.hashCode(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java index fa2a502c500..46f040cb31e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java @@ -67,6 +67,7 @@ public class TemplateEngine { /* * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator() */ + @Override public IInformationControlCreator getInformationControlCreator() { return new IInformationControlCreator() { public IInformationControl createInformationControl(Shell parent) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java index ebf41b4cc87..0024adcce0f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java @@ -37,6 +37,7 @@ public class TemplateVariableProcessor implements IContentAssistProcessor { return proposal0.getDisplayString().compareTo(proposal1.getDisplayString()); } + @Override public boolean equals(Object arg0) { return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java index 4aead521eeb..c31a411cd1d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java @@ -39,10 +39,12 @@ public class OpenTypeHierarchyAction extends SelectionDispatchAction { setEnabled(fEditor != null && CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(editor.getEditorInput()) != null); } + @Override public void run(ITextSelection sel) { TypeHierarchyUI.open(fEditor, sel); } + @Override public void run(IStructuredSelection selection) { if (!selection.isEmpty()) { Object selectedObject= selection.getFirstElement(); @@ -53,9 +55,11 @@ public class OpenTypeHierarchyAction extends SelectionDispatchAction { } } + @Override public void selectionChanged(ITextSelection sel) { } + @Override public void selectionChanged(IStructuredSelection selection) { if (selection.isEmpty()) { setEnabled(false); @@ -72,6 +76,7 @@ public class OpenTypeHierarchyAction extends SelectionDispatchAction { } } + @SuppressWarnings("unchecked") private Object getAdapter(Object object, Class desiredClass) { if (desiredClass.isInstance(object)) { return object; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java index ed4c08376dd..64cd6091df6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java @@ -56,7 +56,7 @@ public class THDropTargetListener implements DropTargetListener { private ICElement checkLocalSelection() { ISelection sel= LocalSelectionTransfer.getTransfer().getSelection(); if (sel instanceof IStructuredSelection) { - for (Iterator iter = ((IStructuredSelection)sel).iterator(); iter.hasNext();) { + for (Iterator iter = ((IStructuredSelection)sel).iterator(); iter.hasNext();) { Object element = iter.next(); if (element instanceof ICElement) { return (ICElement) element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java index 54f04031050..91194de53b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java @@ -96,9 +96,9 @@ class THGraph { while (!stack.isEmpty()) { THGraphNode node= stack.remove(stack.size()-1); - List out= node.getOutgoing(); - for (Iterator iterator = out.iterator(); iterator.hasNext();) { - THGraphEdge edge= (THGraphEdge) iterator.next(); + List out= node.getOutgoing(); + for (Iterator iterator = out.iterator(); iterator.hasNext();) { + THGraphEdge edge= iterator.next(); node= edge.getEndNode(); if (node == from) { return true; @@ -109,9 +109,9 @@ class THGraph { } } // check if edge is already there. - List out= from.getOutgoing(); - for (Iterator iterator = out.iterator(); iterator.hasNext();) { - THGraphEdge edge = (THGraphEdge) iterator.next(); + List out= from.getOutgoing(); + for (Iterator iterator = out.iterator(); iterator.hasNext();) { + THGraphEdge edge = iterator.next(); if (edge.getEndNode() == to) { return true; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java index eba799e00af..1b3ece2cae2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java @@ -52,6 +52,7 @@ public class THHistoryAction extends Action { /* * @see Action#run() */ + @Override public void run() { fViewPart.setInput(fElement, null); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java index 4e9ced3b325..b94368e2f62 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java @@ -34,6 +34,7 @@ public class THHistoryDropDownAction extends Action implements IMenuCreator { fView= view; } + @Override public void run() { fView.setHistoryEntries(new ICElement[0]); fView.setInput(null, null); @@ -99,6 +100,7 @@ public class THHistoryDropDownAction extends Action implements IMenuCreator { item.fill(parent, -1); } + @Override public void run() { (new THHistoryListAction(fHierarchyView)).run(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java index 969993652b8..21732c05416 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java @@ -121,7 +121,7 @@ public class THHistoryListAction extends Action { private void doSelectionChanged() { StatusInfo status= new StatusInfo(); - List selected= fHistoryList.getSelectedElements(); + List selected= fHistoryList.getSelectedElements(); if (selected.size() != 1) { status.setError(""); //$NON-NLS-1$ fResult= null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java index 17260cd2e56..bc0f8a9c888 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java @@ -48,10 +48,12 @@ public class THInformationControl extends AbstractInformationControl implements super(parent, shellStyle, treeStyle, ICEditorActionDefinitionIds.OPEN_QUICK_TYPE_HIERARCHY, true); } + @Override protected boolean hasHeader() { return true; } + @Override protected TreeViewer createTreeViewer(Composite parent, int style) { Display display= getShell().getDisplay(); fModel= new THHierarchyModel(this, display); @@ -76,6 +78,7 @@ public class THInformationControl extends AbstractInformationControl implements } } + @Override public void setInput(Object input) { if (input instanceof ICElement[]) { ICElement[] splitInput= (ICElement[]) input; @@ -96,10 +99,12 @@ public class THInformationControl extends AbstractInformationControl implements } } + @Override protected String getId() { return "org.eclipse.cdt.internal.ui.typehierarchy.QuickHierarchy"; //$NON-NLS-1$ } + @Override protected Object getSelectedElement() { THNode node= selectionToNode(fHierarchyTreeViewer.getSelection()); if (node != null) { @@ -119,7 +124,7 @@ public class THInformationControl extends AbstractInformationControl implements private THNode selectionToNode(ISelection selection) { if (selection instanceof IStructuredSelection) { IStructuredSelection ss= (IStructuredSelection) selection; - for (Iterator iter = ss.iterator(); iter.hasNext(); ) { + for (Iterator iter = ss.iterator(); iter.hasNext(); ) { Object cand= iter.next(); if (cand instanceof THNode) { return (THNode) cand; @@ -129,6 +134,7 @@ public class THInformationControl extends AbstractInformationControl implements return null; } + @Override public void widgetDisposed(DisposeEvent event) { fDisposed= true; super.widgetDisposed(event); @@ -159,6 +165,7 @@ public class THInformationControl extends AbstractInformationControl implements return null; } + @Override protected void selectFirstMatch() { Tree tree= fHierarchyTreeViewer.getTree(); Object element= findElement(tree.getItems()); @@ -177,11 +184,9 @@ public class THInformationControl extends AbstractInformationControl implements if (fStringMatcher == null) return element; - if (element != null) { - String label= fHierarchyLabelProvider.getText(element); - if (fStringMatcher.match(label)) - return element; - } + String label= fHierarchyLabelProvider.getText(element); + if (fStringMatcher.match(label)) + return element; } element= findElement(items[i].getItems()); if (element != null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java index 51a301ec2e8..f9e71e53aa8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java @@ -481,6 +481,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter { parent.setTopCenter(memberToolBar); memberToolBar.getAccessible().addAccessibleListener(new AccessibleAdapter() { + @Override public void getName(AccessibleEvent e) { if (e.childID != ACC.CHILDID_SELF) { ToolItem item = memberToolBar.getItem(e.childID); @@ -977,7 +978,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter { private ICElement selectionToElement(ISelection selection) { if (selection instanceof IStructuredSelection) { IStructuredSelection ss= (IStructuredSelection) selection; - for (Iterator iter = ss.iterator(); iter.hasNext(); ) { + for (Iterator iter = ss.iterator(); iter.hasNext(); ) { Object cand= iter.next(); if (cand instanceof ICElement) { return (ICElement) cand; @@ -996,7 +997,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter { private THNode selectionToNode(ISelection selection) { if (selection instanceof IStructuredSelection) { IStructuredSelection ss= (IStructuredSelection) selection; - for (Iterator iter = ss.iterator(); iter.hasNext(); ) { + for (Iterator iter = ss.iterator(); iter.hasNext(); ) { Object cand= iter.next(); if (cand instanceof THNode) { return (THNode) cand; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java index 9aba5bf59ea..d71edbdb112 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java @@ -165,9 +165,7 @@ public class TypeHierarchyUI { } } finally { - if (index != null) { - index.releaseReadLock(); - } + index.releaseReadLock(); } } catch (CoreException e) { @@ -198,9 +196,7 @@ public class TypeHierarchyUI { } } finally { - if (index != null) { - index.releaseReadLock(); - } + index.releaseReadLock(); } } catch (CoreException e) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java index a930543a468..2b12bd948a1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java @@ -43,6 +43,7 @@ public class BusyIndicatorRunnableContext implements IRunnableContext { super(name); fRunnable= runnable; } + @Override public void run() { try { fRunnable.run(new NullProgressMonitor()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java index f11cfc16b11..e2dea59cff8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java @@ -35,6 +35,7 @@ public class DeleteIProblemMarkerAction extends ActionDelegate implements IObjec /** * @see ActionDelegate#run(IAction) */ + @Override public void run(IAction action) { if (selection != null) { @@ -71,6 +72,7 @@ public class DeleteIProblemMarkerAction extends ActionDelegate implements IObjec public void setActivePart(IAction action, IWorkbenchPart targetPart) { } + @Override public void selectionChanged(IAction action, ISelection selection) { boolean enable = false; if (selection instanceof IStructuredSelection) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java index f99296e257b..858517bf4c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java @@ -34,6 +34,7 @@ public class DeleteTaskAction extends ActionDelegate implements IObjectActionDel /** * @see ActionDelegate#run(IAction) */ + @Override public void run(IAction action) { // Add your code here to perform the action if (selection != null) { @@ -71,6 +72,7 @@ public class DeleteTaskAction extends ActionDelegate implements IObjectActionDel public void setActivePart(IAction action, IWorkbenchPart targetPart) { } + @Override public void selectionChanged(IAction action, ISelection selection) { boolean enable = false; if (selection instanceof IStructuredSelection) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java index a896b6f9cd8..c0a9ce4171a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java @@ -42,6 +42,7 @@ public class ExternalEditorInput implements ITranslationUnitEditorInput, IPersis /* */ + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java index ac9beea6a37..d801ae3fe7c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java @@ -44,6 +44,7 @@ public class OpenExternalProblemAction extends ActionDelegate implements IObject } + @Override public void runWithEvent(IAction action, Event event) { Object object = selection.getFirstElement(); if (object instanceof IMarker) { @@ -75,6 +76,7 @@ public class OpenExternalProblemAction extends ActionDelegate implements IObject return cproject ; } + @Override public void selectionChanged(IAction action, ISelection selection) { boolean enable = false; if (selection instanceof IStructuredSelection) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java index f2350185da9..bad84d1c661 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java @@ -69,6 +69,7 @@ public class ProblemTableViewer extends TableViewer { /* * @see StructuredViewer#mapElement(Object, Widget) */ + @Override protected void mapElement(Object element, Widget item) { super.mapElement(element, item); if (item instanceof Item) { @@ -79,6 +80,7 @@ public class ProblemTableViewer extends TableViewer { /* * @see StructuredViewer#unmapElement(Object, Widget) */ + @Override protected void unmapElement(Object element, Widget item) { if (item instanceof Item) { fResourceToItemsMapper.removeFromMap(element, (Item) item); @@ -89,6 +91,7 @@ public class ProblemTableViewer extends TableViewer { /* * @see StructuredViewer#unmapAllElements() */ + @Override protected void unmapAllElements() { fResourceToItemsMapper.clearMap(); super.unmapAllElements(); @@ -97,6 +100,7 @@ public class ProblemTableViewer extends TableViewer { /* * @see ContentViewer#handleLabelProviderChanged(LabelProviderChangedEvent) */ + @Override protected void handleLabelProviderChanged(LabelProviderChangedEvent event) { if (event instanceof ProblemsLabelChangedEvent) { ProblemsLabelChangedEvent e= (ProblemsLabelChangedEvent) event; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java index 5824eb649d9..c78ea67ae2e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java @@ -69,6 +69,7 @@ public class ProblemTreeViewer extends TreeViewer { /* * @see StructuredViewer#mapElement(Object, Widget) */ + @Override protected void mapElement(Object element, Widget item) { super.mapElement(element, item); if (item instanceof Item) { @@ -79,6 +80,7 @@ public class ProblemTreeViewer extends TreeViewer { /* * @see StructuredViewer#unmapElement(Object, Widget) */ + @Override protected void unmapElement(Object element, Widget item) { if (item instanceof Item) { fResourceToItemsMapper.removeFromMap(element, (Item) item); @@ -89,6 +91,7 @@ public class ProblemTreeViewer extends TreeViewer { /* * @see StructuredViewer#unmapAllElements() */ + @Override protected void unmapAllElements() { fResourceToItemsMapper.clearMap(); super.unmapAllElements(); @@ -97,6 +100,7 @@ public class ProblemTreeViewer extends TreeViewer { /* * @see ContentViewer#handleLabelProviderChanged(LabelProviderChangedEvent) */ + @Override protected void handleLabelProviderChanged(LabelProviderChangedEvent event) { Object source= event.getElement(); if (source == null) { @@ -139,6 +143,7 @@ public class ProblemTreeViewer extends TreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.AbstractTreeViewer#isExpandable(java.lang.Object) */ + @Override public boolean isExpandable(Object element) { ITreeContentProvider cp = (ITreeContentProvider) getContentProvider(); if (cp == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java index 124925cba1e..fc967ce74a1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java @@ -67,6 +67,7 @@ public class RemoteTreeContentManager { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { while (!fElementQueue.isEmpty() && !monitor.isCanceled()) { Object element = null; @@ -207,7 +208,8 @@ public class RemoteTreeContentManager { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ - public IStatus runInUIThread(IProgressMonitor updateMonitor) { + @Override + public IStatus runInUIThread(IProgressMonitor updateMonitor) { //Cancel the job if the tree viewer got closed if (fViewer.getControl().isDisposed()) return Status.CANCEL_STATUS; @@ -235,7 +237,8 @@ public class RemoteTreeContentManager { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ - public IStatus runInUIThread(IProgressMonitor updateMonitor) { + @Override + public IStatus runInUIThread(IProgressMonitor updateMonitor) { //Cancel the job if the tree viewer got closed if (fViewer.getControl().isDisposed()) return Status.CANCEL_STATUS; @@ -265,7 +268,8 @@ public class RemoteTreeContentManager { * * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { if (!placeholder.isRemoved()) { Control control = fViewer.getControl(); if (control.isDisposed()) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java index 9615f68c876..661a06d98be 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java @@ -55,7 +55,8 @@ public class RemoteTreeViewer extends ProblemTreeViewer { /* (non-Javadoc) * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { if (getControl().isDisposed() || element == null) { return Status.OK_STATUS; } @@ -123,7 +124,8 @@ public class RemoteTreeViewer extends ProblemTreeViewer { /* (non-Javadoc) * @see org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime.IProgressMonitor) */ - public IStatus runInUIThread(IProgressMonitor monitor) { + @Override + public IStatus runInUIThread(IProgressMonitor monitor) { if (getControl().isDisposed() || selection == null) { return Status.OK_STATUS; } @@ -247,7 +249,8 @@ public class RemoteTreeViewer extends ProblemTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.AbstractTreeViewer#add(java.lang.Object, java.lang.Object) */ - public synchronized void add(Object parentElement, Object childElement) { + @Override + public synchronized void add(Object parentElement, Object childElement) { super.add(parentElement, childElement); runDeferredUpdates(); } @@ -255,7 +258,8 @@ public class RemoteTreeViewer extends ProblemTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.AbstractTreeViewer#add(java.lang.Object, java.lang.Object[]) */ - public synchronized void add(Object parentElement, Object[] childElements) { + @Override + public synchronized void add(Object parentElement, Object[] childElements) { super.add(parentElement, childElements); runDeferredUpdates(); } @@ -263,6 +267,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.AbstractTreeViewer#remove(java.lang.Object) */ + @Override public synchronized void remove(Object element) { validateDeferredUpdates(element); super.remove(element); @@ -271,6 +276,7 @@ public class RemoteTreeViewer extends ProblemTreeViewer { /* (non-Javadoc) * @see org.eclipse.jface.viewers.AbstractTreeViewer#remove(java.lang.Object[]) */ + @Override public synchronized void remove(Object[] elements) { for (int i = 0; i < elements.length; i++) { validateDeferredUpdates(elements[i]); @@ -336,7 +342,8 @@ public class RemoteTreeViewer extends ProblemTreeViewer { } } - public Object[] filter(Object[] elements) { + @Override + public Object[] filter(Object[] elements) { return super.filter(elements); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/SWTUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/SWTUtil.java index e79531d75ec..8a214ff2a91 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/SWTUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/SWTUtil.java @@ -87,6 +87,7 @@ public class SWTUtil { * @deprecated * @see IDialogConstants#BUTTON_HEIGHT */ + @Deprecated public static int getButtonHeigthHint(Button button) { if (button.getFont().equals(JFaceResources.getDefaultFont())) button.setFont(JFaceResources.getDialogFont()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java index 4bf65b2e269..47656e7c1f2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java @@ -101,6 +101,7 @@ public class StringMatcher { * specifying if case should be ignored * @deprecated Use StringMatcher(pattern, ignoreCase, ignoreWildCards). */ + @Deprecated public StringMatcher(String aPattern, boolean ignoreCase) { this(aPattern, ignoreCase, false); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java index 74e7fae0bc3..46a10981557 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java @@ -42,6 +42,7 @@ public class TableLayoutComposite extends Composite { public TableLayoutComposite(Composite parent, int style) { super(parent, style); addControlListener(new ControlAdapter() { + @Override public void controlResized(ControlEvent e) { Rectangle area= getClientArea(); Table table= (Table)getChildren()[0]; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java index 91370945b69..bd8bffb7586 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java @@ -59,6 +59,7 @@ public class AppearanceAwareLabelProvider extends CUILabelProvider implements IP /* * @see IBaseLabelProvider#dispose() */ + @Override public void dispose() { // PreferenceConstants.getPreferenceStore().removePropertyChangeListener(this); super.dispose(); @@ -67,6 +68,7 @@ public class AppearanceAwareLabelProvider extends CUILabelProvider implements IP /* * @see CUILabelProvider#evaluateImageFlags() */ + @Override protected int evaluateImageFlags(Object element) { return getImageFlags() & fImageFlagMask; } @@ -74,6 +76,7 @@ public class AppearanceAwareLabelProvider extends CUILabelProvider implements IP /* * @see CUILabelProvider#evaluateTextFlags() */ + @Override protected int evaluateTextFlags(Object element) { return getTextFlags() & fTextFlagMask; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java index 2f8ded183f6..81d4b8a2abc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java @@ -58,7 +58,8 @@ public abstract class AsyncTreeContentProvider implements ITreeContentProvider { public AsyncTreeContentProvider(Display disp) { fDisplay= disp; fJob= new Job(CUIMessages.getString("AsyncTreeContentProvider.JobName")) { //$NON-NLS-1$ - protected IStatus run(final IProgressMonitor monitor) { + @Override + protected IStatus run(final IProgressMonitor monitor) { return runJob(monitor); } }; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeWorkInProgressNode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeWorkInProgressNode.java index a0eb3301438..9bca6892630 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeWorkInProgressNode.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeWorkInProgressNode.java @@ -21,7 +21,8 @@ public class AsyncTreeWorkInProgressNode { public Object getParent() { return fParent; } - public String toString() { + @Override + public String toString() { return "..."; //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java index 3e3e41607b3..6bde7ef1b92 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java @@ -132,6 +132,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { /* (non-Javadoc) * @see ILabelProvider#getImage */ + @Override public Image getImage(Object element) { Image result= fImageLabelProvider.getImageLabel(element, evaluateImageFlags(element)); if (result == null && (element instanceof IStorage)) { @@ -155,6 +156,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { /* (non-Javadoc) * @see ILabelProvider#getText */ + @Override public String getText(Object element) { String result= CElementLabels.getTextLabel(element, evaluateTextFlags(element)); if (result.length() == 0 && (element instanceof IStorage)) { @@ -167,6 +169,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { /* (non-Javadoc) * @see IBaseLabelProvider#dispose */ + @Override public void dispose() { if (fLabelDecorators != null) { for (int i= 0; i < fLabelDecorators.size(); i++) { @@ -182,6 +185,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { /* (non-Javadoc) * @see IBaseLabelProvider#addListener(ILabelProviderListener) */ + @Override public void addListener(ILabelProviderListener listener) { if (fLabelDecorators != null) { for (int i= 0; i < fLabelDecorators.size(); i++) { @@ -195,6 +199,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { /* (non-Javadoc) * @see IBaseLabelProvider#isLabelProperty(Object, String) */ + @Override public boolean isLabelProperty(Object element, String property) { return true; } @@ -202,6 +207,7 @@ public class CUILabelProvider extends LabelProvider implements IColorProvider { /* (non-Javadoc) * @see IBaseLabelProvider#removeListener(ILabelProviderListener) */ + @Override public void removeListener(ILabelProviderListener listener) { if (fLabelDecorators != null) { for (int i= 0; i < fLabelDecorators.size(); i++) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java index 88bddf8d954..bddadc967f3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java @@ -43,6 +43,7 @@ public class DecoratingCLabelProvider extends DecoratingLabelProvider implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) */ + @Override public Color getForeground(Object element) { // label provider is a JavaUILabelProvider return ((IColorProvider) getLabelProvider()).getForeground(element); @@ -51,6 +52,7 @@ public class DecoratingCLabelProvider extends DecoratingLabelProvider implements /* (non-Javadoc) * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) */ + @Override public Color getBackground(Object element) { // label provider is a JavaUILabelProvider return ((IColorProvider) getLabelProvider()).getBackground(element); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExtendedTreeViewer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExtendedTreeViewer.java index d88acff0066..3b95cbc9f30 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExtendedTreeViewer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExtendedTreeViewer.java @@ -36,7 +36,8 @@ public class ExtendedTreeViewer extends TreeViewer { }); } - protected void preservingSelection(Runnable updateCode) { + @Override + protected void preservingSelection(Runnable updateCode) { if (fPreservingSelection) { updateCode.run(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java index 72aaec5615b..ff5096ca644 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java @@ -32,6 +32,7 @@ public class ImageImageDescriptor extends ImageDescriptor { /* (non-Javadoc) * @see ImageDescriptor#getImageData() */ + @Override public ImageData getImageData() { return fImage.getImageData(); } @@ -39,6 +40,7 @@ public class ImageImageDescriptor extends ImageDescriptor { /* (non-Javadoc) * @see Object#equals(Object) */ + @Override public boolean equals(Object obj) { return (obj != null) && getClass().equals(obj.getClass()) && fImage.equals(((ImageImageDescriptor)obj).fImage); } @@ -46,6 +48,7 @@ public class ImageImageDescriptor extends ImageDescriptor { /* (non-Javadoc) * @see Object#hashCode() */ + @Override public int hashCode() { return fImage.hashCode(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java index fcb1dc89e35..83b665d5c7b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java @@ -31,6 +31,7 @@ public class MemberFilter extends ViewerFilter{ public static final int FILTER_STATIC= 2; public static final int FILTER_FIELDS= 4; /** @deprecated Unsupported filter constant */ + @Deprecated public static final int FILTER_LOCALTYPES= 8; private int fFilterProperties; @@ -63,6 +64,7 @@ public class MemberFilter extends ViewerFilter{ /* * @see ViewerFilter@select */ + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if(element instanceof IDeclaration){ try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java index 4d5b32a94df..bc0534a8e4f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java @@ -43,6 +43,7 @@ public class MemberFilterAction extends Action { /* * @see Action#actionPerformed */ + @Override public void run() { fFilterActionGroup.setMemberFilter(fFilterProperty, isChecked()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java index 139d6cd1b5d..74a991d40c1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java @@ -49,6 +49,7 @@ public final class ProjectTemplateStore { * Make sure we keep the id of added code templates - add removes * it in the usual add() method */ + @Override public void add(TemplatePersistenceData data) { if (data.isUserAdded()) { super.add(data); @@ -57,6 +58,7 @@ public final class ProjectTemplateStore { } } + @Override public void save() throws IOException { StringWriter output= new StringWriter(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java index 47b54048483..df1b6c56228 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java @@ -142,6 +142,7 @@ public class SelectionListenerWithASTManager { return; fCurrentJob= new Job(Messages.SelectionListenerWithASTManager_jobName) { + @Override public IStatus run(IProgressMonitor monitor) { if (!monitor.isCanceled() && isSelectionValid(selection)) { return calculateASTandInform(workingCopy, selection, monitor); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java index 26c523c9b76..edd0c21ee88 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java @@ -23,6 +23,7 @@ import org.eclipse.jface.util.PropertyChangeEvent; * * @deprecated Use {@link AppearanceAwareLabelProvider} instead. */ +@Deprecated public class StandardCElementLabelProvider extends AppearanceAwareLabelProvider implements IPropertyChangeListener { /** @@ -50,6 +51,7 @@ public class StandardCElementLabelProvider extends AppearanceAwareLabelProvider /* * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) */ + @Override public void propertyChange(PropertyChangeEvent event) { //String property= event.getProperty(); /* if (property.equals(AppearancePreferencePage.PREF_METHOD_RETURNTYPE) @@ -64,6 +66,7 @@ public class StandardCElementLabelProvider extends AppearanceAwareLabelProvider /* * @see IBaseLabelProvider#dispose() */ + @Override public void dispose() { CUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this); super.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java index 638151e8fee..58f0a683903 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java @@ -40,6 +40,7 @@ public class StorageLabelProvider extends LabelProvider { /* (non-Javadoc) * @see ILabelProvider#getImage */ + @Override public Image getImage(Object element) { if (element instanceof IStorage) return getImageForJarEntry((IStorage)element); @@ -50,6 +51,7 @@ public class StorageLabelProvider extends LabelProvider { /* (non-Javadoc) * @see ILabelProvider#getText */ + @Override public String getText(Object element) { if (element instanceof IStorage) return ((IStorage)element).getName(); @@ -61,6 +63,7 @@ public class StorageLabelProvider extends LabelProvider { * * @see IBaseLabelProvider#dispose */ + @Override public void dispose() { if (fJarImageMap != null) { Iterator each= fJarImageMap.values().iterator(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java index 8ed4059fe7d..2313c15cd5f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java @@ -141,6 +141,7 @@ public abstract class AbstractOpenWizardAction extends Action implements IWorkbe /** * The user has invoked this action. */ + @Override public void run() { /* if (!fNoChecking && !canActionBeAdded()) { return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractWizardDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractWizardDropDownAction.java index 9d410e3528d..ca20fdbb4ce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractWizardDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractWizardDropDownAction.java @@ -83,6 +83,7 @@ public abstract class AbstractWizardDropDownAction extends Action implements IMe } } + @Override public void run() { // for now, run the default action // we might want the last run action at some point diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java index 1163fae1d56..a3b2b4917b6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java @@ -32,7 +32,8 @@ public class NewClassCreationWizard extends NewElementWizard { /* * @see Wizard#createPages */ - public void addPages() { + @Override + public void addPages() { super.addPages(); fPage = new NewClassCreationWizardPage(); addPage(fPage); @@ -44,7 +45,8 @@ public class NewClassCreationWizard extends NewElementWizard { * * @see org.eclipse.cdt.internal.ui.wizards.NewElementWizard#canRunForked() */ - protected boolean canRunForked() { + @Override + protected boolean canRunForked() { return !fPage.isNamespaceSelected(); } @@ -53,7 +55,8 @@ public class NewClassCreationWizard extends NewElementWizard { * * @see org.eclipse.cdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse.core.runtime.IProgressMonitor) */ - protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { + @Override + protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { fPage.createClass(monitor); // use the full progress monitor } @@ -62,7 +65,8 @@ public class NewClassCreationWizard extends NewElementWizard { * * @see org.eclipse.jface.wizard.IWizard#performFinish() */ - public boolean performFinish() { + @Override + public boolean performFinish() { boolean finished = super.performFinish(); if (finished) { if (fPage.openClassInEditor()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java index f52f1bb7061..046f57399ee 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java @@ -92,6 +92,7 @@ public abstract class NewElementWizard extends Wizard implements INewWizard { /* * @see Wizard#performFinish */ + @Override public boolean performFinish() { IWorkspaceRunnable op= new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException, OperationCanceledException { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizardPage.java index c846e882dbf..e20d63eed22 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizardPage.java @@ -42,6 +42,7 @@ public abstract class NewElementWizardPage extends WizardPage { /* * @see WizardPage#becomesVisible */ + @Override public void setVisible(boolean visible) { super.setVisible(visible); fPageVisible = visible; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFileDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFileDropDownAction.java index 0b3ebd072e4..57360368499 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFileDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFileDropDownAction.java @@ -19,6 +19,7 @@ public class NewFileDropDownAction extends AbstractWizardDropDownAction { // WorkbenchHelp.setHelp(this, ICHelpContextIds.OPEN_FILE_WIZARD_ACTION); } + @Override protected IAction[] getWizardActions() { return CWizardRegistry.getFileWizardActions(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFolderDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFolderDropDownAction.java index 80fbabd51bd..b6de948b661 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFolderDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFolderDropDownAction.java @@ -19,6 +19,7 @@ public class NewFolderDropDownAction extends AbstractWizardDropDownAction { // WorkbenchHelp.setHelp(this, ICHelpContextIds.OPEN_FOLDER_WIZARD_ACTION); } + @Override protected IAction[] getWizardActions() { return CWizardRegistry.getFolderWizardActions(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java index 5169ac78a80..f458082cd07 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java @@ -21,6 +21,7 @@ public class NewProjectDropDownAction extends AbstractWizardDropDownAction { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.OPEN_PROJECT_WIZARD_ACTION); } + @Override protected IAction[] getWizardActions() { return CWizardRegistry.getProjectWizardActions(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java index 986ab4d3866..a0031d07ab2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java @@ -21,6 +21,7 @@ public class NewTypeDropDownAction extends AbstractWizardDropDownAction { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.OPEN_CLASS_WIZARD_ACTION); } + @Override protected IAction[] getWizardActions() { return CWizardRegistry.getTypeWizardActions(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java index bc5078a405c..82039c51c5c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java @@ -67,6 +67,7 @@ public class OpenNewWizardAction extends AbstractOpenWizardAction { /* (non-Javadoc) * @see org.eclipse.jdt.internal.ui.wizards.AbstractOpenWizardAction#createWizard() */ + @Override protected Wizard createWizard() throws CoreException { return (Wizard) CoreUtility.createExtension(fConfigurationElement, ATT_CLASS); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java index d58f450f02e..ffabcfad8f1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java @@ -123,17 +123,20 @@ public class BaseClassesListDialogField extends ListDialogField { setTableColumns(new ListDialogField.ColumnsDescription(columns, headers, true)); } - protected boolean managedButtonPressed(int index) { + @Override + protected boolean managedButtonPressed(int index) { super.managedButtonPressed(index); return false; } - protected TableViewer createTableViewer(Composite parent) { + @Override + protected TableViewer createTableViewer(Composite parent) { TableViewer viewer = super.createTableViewer(parent); Table table = viewer.getTable(); table.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = NewClassWizardMessages.getString("NewClassCreationWizardPage.baseClasses.label"); //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java index 2f3e435f230..a69fa7e03e8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java @@ -29,7 +29,8 @@ public final class ConstructorMethodStub extends AbstractMethodStub { super(NAME, access, false, isInline); } - public String createMethodDeclaration(ITranslationUnit tu, String className, IBaseClassInfo[] baseClasses, String lineDelimiter) throws CoreException { + @Override + public String createMethodDeclaration(ITranslationUnit tu, String className, IBaseClassInfo[] baseClasses, String lineDelimiter) throws CoreException { StringBuffer buf = new StringBuffer(); buf.append(className); buf.append("()"); //$NON-NLS-1$ @@ -48,7 +49,8 @@ public final class ConstructorMethodStub extends AbstractMethodStub { return buf.toString(); } - public String createMethodImplementation(ITranslationUnit tu, String className, IBaseClassInfo[] baseClasses, String lineDelimiter) throws CoreException { + @Override + public String createMethodImplementation(ITranslationUnit tu, String className, IBaseClassInfo[] baseClasses, String lineDelimiter) throws CoreException { if (fIsInline) { return ""; //$NON-NLS-1$ } @@ -69,11 +71,13 @@ public final class ConstructorMethodStub extends AbstractMethodStub { return buf.toString(); } - public boolean isConstructor() { + @Override + public boolean isConstructor() { return true; } - public boolean canModifyVirtual() { + @Override + public boolean canModifyVirtual() { return false; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java index b665a3490f7..468bc162f2e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java @@ -30,7 +30,8 @@ public final class DestructorMethodStub extends AbstractMethodStub { super(NAME, access, isVirtual, isInline); } - public String createMethodDeclaration(ITranslationUnit tu, String className, IBaseClassInfo[] baseClasses, String lineDelimiter) throws CoreException { + @Override + public String createMethodDeclaration(ITranslationUnit tu, String className, IBaseClassInfo[] baseClasses, String lineDelimiter) throws CoreException { StringBuffer buf = new StringBuffer(); if (fIsVirtual){ buf.append("virtual "); //$NON-NLS-1$ @@ -53,7 +54,8 @@ public final class DestructorMethodStub extends AbstractMethodStub { return buf.toString(); } - public String createMethodImplementation(ITranslationUnit tu, String className, IBaseClassInfo[] baseClasses, String lineDelimiter) throws CoreException { + @Override + public String createMethodImplementation(ITranslationUnit tu, String className, IBaseClassInfo[] baseClasses, String lineDelimiter) throws CoreException { if (fIsInline) { return ""; //$NON-NLS-1$ } @@ -74,7 +76,8 @@ public final class DestructorMethodStub extends AbstractMethodStub { return buf.toString(); } - public boolean isDestructor() { + @Override + public boolean isDestructor() { return true; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java index 3cd9322d089..f4d98eeb56c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java @@ -135,17 +135,20 @@ public class MethodStubsListDialogField extends CheckedListDialogField { setTableColumns(new ListDialogField.ColumnsDescription(columns, headers, true)); } - protected boolean managedButtonPressed(int index) { + @Override + protected boolean managedButtonPressed(int index) { super.managedButtonPressed(index); return false; } - protected TableViewer createTableViewer(Composite parent) { + @Override + protected TableViewer createTableViewer(Composite parent) { TableViewer viewer = super.createTableViewer(parent); Table table = viewer.getTable(); table.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = NewClassWizardMessages.getString("NewClassCreationWizardPage.methodStubs.label"); //$NON-NLS-1$ } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java index 7d5ebc2294e..7bc9be8be96 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java @@ -74,6 +74,7 @@ public class NewBaseClassSelectionDialog extends TypeSelectionDialog { /* * @see Dialog#createButtonsForButtonBar */ + @Override protected void createButtonsForButtonBar(Composite parent) { createButton(parent, ADD_ID, NewClassWizardMessages.getString("NewBaseClassSelectionDialog.addButton.label"), true); //$NON-NLS-1$ super.createButtonsForButtonBar(parent); @@ -82,6 +83,7 @@ public class NewBaseClassSelectionDialog extends TypeSelectionDialog { /* * @see Dialog#buttonPressed */ + @Override protected void buttonPressed(int buttonId) { if (buttonId == ADD_ID){ addType(getLowerSelectedElement()); @@ -92,6 +94,7 @@ public class NewBaseClassSelectionDialog extends TypeSelectionDialog { /* * @see Dialog#okPressed */ + @Override protected void okPressed() { addType(getLowerSelectedElement()); super.okPressed(); @@ -167,6 +170,7 @@ public class NewBaseClassSelectionDialog extends TypeSelectionDialog { /* * @see AbstractElementListSelectionDialog#handleDefaultSelected() */ + @Override protected void handleDefaultSelected() { if (validateCurrentSelection()) buttonPressed(ADD_ID); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java index c0e0508d2ef..80f5e6e206e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java @@ -87,7 +87,8 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { implements ISelectionChangedListener, IDoubleClickListener, IDialogFieldListener { // -- SelectionAdapter -- - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { doStatusUpdate(); if (fCurrStatus.isOK()) buttonPressed(IDialogConstants.OK_ID); @@ -162,7 +163,8 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { super(FILTER_TYPES); } - public boolean select(Viewer viewer, Object parent, Object obj) { + @Override + public boolean select(Viewer viewer, Object parent, Object obj) { if (obj instanceof ICElement) { ICElement elem = (ICElement)obj; if (!(fInput instanceof ICModel)) { @@ -227,6 +229,7 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { * * @param status status to apply */ + @Override protected void updateStatus(IStatus status) { fCurrStatus = status; super.updateStatus(status); @@ -341,7 +344,8 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { * * @see org.eclipse.jface.window.Window#open() */ - public int open() { + @Override + public int open() { super.open(); return getReturnCode(); } @@ -349,7 +353,8 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { /** * Handles cancel button pressed event. */ - protected void cancelPressed() { + @Override + protected void cancelPressed() { setResult(null); super.cancelPressed(); } @@ -357,7 +362,8 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { /* * @see SelectionStatusDialog#computeResult() */ - protected void computeResult() { + @Override + protected void computeResult() { setResult(((IStructuredSelection) fViewer.getSelection()).toList()); } @@ -366,7 +372,8 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { * * @see org.eclipse.jface.window.Window#create() */ - public void create() { + @Override + public void create() { BusyIndicator.showWhile(null, new Runnable() { public void run() { superCreate(); @@ -384,7 +391,8 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { /* * @see Dialog#createDialogArea(Composite) */ - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); // Label messageLabel = createMessageArea(composite); int nColumns = 4; @@ -460,7 +468,8 @@ public class SourceFileSelectionDialog extends SelectionStatusDialog { /** * @see org.eclipse.jface.window.Window#handleShellCloseEvent() */ - protected void handleShellCloseEvent() { + @Override + protected void handleShellCloseEvent() { super.handleShellCloseEvent(); //Handle the closing of the shell by selecting the close icon diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java index 40f1d950567..56210f11473 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java @@ -70,6 +70,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#createTableViewer */ + @Override protected TableViewer createTableViewer(Composite parent) { Table table= new Table(parent, SWT.CHECK + getListStyle()); CheckboxTableViewer tableViewer= new CheckboxTableViewer(table); @@ -85,6 +86,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#getListControl */ + @Override public Control getListControl(Composite parent) { Control control= super.getListControl(parent); if (parent != null) { @@ -97,6 +99,7 @@ public class CheckedListDialogField extends ListDialogField { * @see DialogField#dialogFieldChanged * Hooks in to get element changes to update check model. */ + @Override public void dialogFieldChanged() { for (int i= fCheckElements.size() -1; i >= 0; i--) { if (!fElements.contains(fCheckElements.get(i))) { @@ -195,6 +198,7 @@ public class CheckedListDialogField extends ListDialogField { /* (non-Javadoc) * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField#replaceElement(java.lang.Object, java.lang.Object) */ + @Override public void replaceElement(Object oldElement, Object newElement) throws IllegalArgumentException { boolean wasChecked= isChecked(oldElement); super.replaceElement(oldElement, newElement); @@ -206,6 +210,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#getManagedButtonState */ + @Override protected boolean getManagedButtonState(ISelection sel, int index) { if (index == fCheckAllButtonIndex) { return !fElements.isEmpty(); @@ -218,6 +223,7 @@ public class CheckedListDialogField extends ListDialogField { /* * @see ListDialogField#extraButtonPressed */ + @Override protected boolean managedButtonPressed(int index) { if (index == fCheckAllButtonIndex) { checkAll(true); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ComboDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ComboDialogField.java index 04bd78f1131..2c938c75a3d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ComboDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ComboDialogField.java @@ -45,6 +45,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -59,6 +60,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 2; } @@ -76,6 +78,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#setFocus */ + @Override public boolean setFocus() { if (isOkToUse(fComboControl)) { fComboControl.setFocus(); @@ -144,6 +147,7 @@ public class ComboDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fComboControl)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java index 05f531175ea..603d313e2f1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java @@ -57,6 +57,7 @@ public class LayoutUtil { * @param marginHeight The margin height to be used by the composite * @deprecated */ + @Deprecated public static void doDefaultLayout(Composite parent, DialogField[] editors, boolean labelOnTop, int minWidth, int minHeight, int marginWidth, int marginHeight) { int nCulumns= getNumberOfColumns(editors); Control[][] controls= new Control[editors.length][]; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java index 44cdc33336a..0799d024113 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java @@ -68,6 +68,7 @@ public class LinkToFileGroup extends StringButtonDialogField { this.type = IResource.FILE; } + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); //initializeDialogUnits(parent); @@ -101,6 +102,7 @@ public class LinkToFileGroup extends StringButtonDialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 4; } @@ -112,6 +114,7 @@ public class LinkToFileGroup extends StringButtonDialogField { linkButton.setSelection(createLink); linkButton.setFont(parent.getFont()); SelectionListener selectionListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { createLink = linkButton.getSelection(); browseButton.setEnabled(createLink); @@ -128,10 +131,12 @@ public class LinkToFileGroup extends StringButtonDialogField { return linkButton; } + @Override public String getText() { return linkTargetField.getText(); } + @Override public void setText(String text) { if (isOkToUse(linkTargetField)) { preventDialogFieldChanged = true; @@ -141,6 +146,7 @@ public class LinkToFileGroup extends StringButtonDialogField { // dialogFieldChanged(); } + @Override public Text getTextControl(Composite parent){ if(linkTargetField == null){ assertCompositeNotNull(parent); @@ -180,6 +186,7 @@ public class LinkToFileGroup extends StringButtonDialogField { browseButton.setFont(parent.getFont()); browseButton.setText(NewWizardMessages.getString("CreateLinkedResourceGroup.browseButton")); //$NON-NLS-1$ browseButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleLinkTargetBrowseButtonPressed(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java index 098339224fc..62c68c349cf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java @@ -226,6 +226,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { PixelConverter converter= new PixelConverter(parent); @@ -263,6 +264,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 3; } @@ -315,6 +317,7 @@ public class ListDialogField extends DialogField { } fTable.getTable().addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleKeyPressed(e); } @@ -465,6 +468,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#dialogFieldChanged */ + @Override public void dialogFieldChanged() { super.dialogFieldChanged(); updateButtonState(); @@ -499,6 +503,7 @@ public class ListDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java index 3377b950064..3ca2e822fcd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java @@ -79,6 +79,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -98,6 +99,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 1; } @@ -178,6 +180,7 @@ public class SelectionButtonDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fButton)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java index bc07c615fff..fa1a4d2d6b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java @@ -81,6 +81,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -106,6 +107,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public int getNumberOfControls() { return (fGroupBorderStyle == SWT.NONE) ? 2 : 1; } @@ -225,6 +227,7 @@ public class SelectionButtonDialogFieldGroup extends DialogField { // ------ enable / disable management + @Override protected void updateEnableState() { super.updateEnableState(); if (fButtons != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java index fbd52b3048b..4f4486f879a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java @@ -57,6 +57,7 @@ public class Separator extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { return doFillIntoGrid(parent, nColumns, 4); } @@ -64,6 +65,7 @@ public class Separator extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 1; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java index 835380eb8e3..0b8121c1c03 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java @@ -61,6 +61,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -77,6 +78,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 3; } @@ -132,6 +134,7 @@ public class StringButtonDialogField extends StringDialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fBrowseButton)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java index 8612141c87b..2cc771167a6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java @@ -42,6 +42,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { assertEnoughColumns(nColumns); @@ -56,6 +57,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 2; } @@ -73,6 +75,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#setFocus */ + @Override public boolean setFocus() { if (isOkToUse(fTextControl)) { fTextControl.setFocus(); @@ -120,6 +123,7 @@ public class StringDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); if (isOkToUse(fTextControl)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java index 2a15c0f15fb..7a0695a9a76 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java @@ -154,6 +154,7 @@ public class TreeListDialogField extends DialogField { * * @deprecated Use {@link #setViewerComparator(ViewerComparator)} instead. */ + @Deprecated public void setViewerSorter(ViewerSorter viewerSorter) { setViewerComparator(viewerSorter); } @@ -206,6 +207,7 @@ public class TreeListDialogField extends DialogField { /* * @see DialogField#doFillIntoGrid */ + @Override public Control[] doFillIntoGrid(Composite parent, int nColumns) { PixelConverter converter = new PixelConverter(parent); @@ -243,6 +245,7 @@ public class TreeListDialogField extends DialogField { /* * @see DialogField#getNumberOfControls */ + @Override public int getNumberOfControls() { return 3; } @@ -276,6 +279,7 @@ public class TreeListDialogField extends DialogField { fTreeControl = (Tree) fTree.getControl(); fTreeControl.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { handleKeyPressed(e); } @@ -427,6 +431,7 @@ public class TreeListDialogField extends DialogField { /* * @see DialogField#dialogFieldChanged */ + @Override public void dialogFieldChanged() { super.dialogFieldChanged(); updateButtonState(); @@ -472,6 +477,7 @@ public class TreeListDialogField extends DialogField { /* * @see DialogField#updateEnableState */ + @Override protected void updateEnableState() { super.updateEnableState(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java index b7223ed9397..2b4603c62c3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java @@ -36,7 +36,8 @@ public abstract class AbstractFileCreationWizard extends NewElementWizard { * * @see org.eclipse.cdt.internal.ui.wizards.NewElementWizard#canRunForked() */ - protected boolean canRunForked() { + @Override + protected boolean canRunForked() { return true; } @@ -45,7 +46,8 @@ public abstract class AbstractFileCreationWizard extends NewElementWizard { * * @see org.eclipse.cdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse.core.runtime.IProgressMonitor) */ - protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { + @Override + protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { fPage.createFile(monitor); // use the full progress monitor } @@ -54,7 +56,8 @@ public abstract class AbstractFileCreationWizard extends NewElementWizard { * * @see org.eclipse.jface.wizard.IWizard#performFinish() */ - public boolean performFinish() { + @Override + public boolean performFinish() { boolean res = super.performFinish(); if (res) { //TODO need prefs option for opening editor diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java index 6bb8d9d9910..cf7922bb43d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java @@ -207,6 +207,7 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag Button configureButton= new Button(parent, SWT.PUSH); configureButton.setText(NewFileWizardMessages.AbstractFileCreationWizardPage_configure_label); configureButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { editTemplates(); } @@ -602,6 +603,7 @@ public abstract class AbstractFileCreationWizardPage extends NewElementWizardPag /* * @see WizardPage#becomesVisible */ + @Override public void setVisible(boolean visible) { super.setVisible(visible); if (visible) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java index c45b95e9c60..11d3130e984 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java @@ -48,7 +48,8 @@ public class NewFileFromTemplateWizard extends BasicNewResourceWizard { /* * Method declared on IWizard. */ - public void addPages() { + @Override + public void addPages() { super.addPages(); mainPage = new WizardNewFileFromTemplateCreationPage("newFilePage1", getSelection());//$NON-NLS-1$ mainPage.setTitle(NewFileWizardMessages.NewFileFromTemplateWizard_pageTitle); @@ -59,7 +60,8 @@ public class NewFileFromTemplateWizard extends BasicNewResourceWizard { /* * Method declared on IWorkbenchWizard. */ - public void init(IWorkbench workbench, IStructuredSelection currentSelection) { + @Override + public void init(IWorkbench workbench, IStructuredSelection currentSelection) { super.init(workbench, currentSelection); setWindowTitle(NewFileWizardMessages.NewFileFromTemplateWizard_shellTitle); setNeedsProgressMonitor(true); @@ -68,7 +70,8 @@ public class NewFileFromTemplateWizard extends BasicNewResourceWizard { /* * Method declared on BasicNewResourceWizard. */ - protected void initializeDefaultPageImageDescriptor() { + @Override + protected void initializeDefaultPageImageDescriptor() { ImageDescriptor desc = CPluginImages.DESC_WIZBAN_NEW_FILE; setDefaultPageImageDescriptor(desc); } @@ -76,7 +79,8 @@ public class NewFileFromTemplateWizard extends BasicNewResourceWizard { /* * Method declared on IWizard. */ - public boolean performFinish() { + @Override + public boolean performFinish() { IFile file = mainPage.createNewFile(); if (file == null) { return false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java index a73d4ecbdaa..e8716a83762 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java @@ -58,6 +58,7 @@ public class NewHeaderFileCreationWizardPage extends AbstractFileCreationWizardP /** * Sets the focus on the starting input field. */ + @Override protected void setFocus() { fNewFileDialogField.setFocus(); } @@ -69,6 +70,7 @@ public class NewHeaderFileCreationWizardPage extends AbstractFileCreationWizardP * @param parent the parent composite * @param nColumns number of columns to span */ + @Override protected void createFileControls(Composite parent, int nColumns) { fNewFileDialogField.doFillIntoGrid(parent, nColumns); Text textControl = fNewFileDialogField.getTextControl(null); @@ -76,6 +78,7 @@ public class NewHeaderFileCreationWizardPage extends AbstractFileCreationWizardP textControl.addFocusListener(new StatusFocusListener(NEW_FILE_ID)); } + @Override public IPath getFileFullPath() { String str = fNewFileDialogField.getText(); IPath path = null; @@ -90,6 +93,7 @@ public class NewHeaderFileCreationWizardPage extends AbstractFileCreationWizardP return path; } + @Override protected IStatus fileNameChanged() { StatusInfo status = new StatusInfo(); @@ -136,6 +140,7 @@ public class NewHeaderFileCreationWizardPage extends AbstractFileCreationWizardP return status; } + @Override public void createFile(IProgressMonitor monitor) throws CoreException { IPath filePath = getFileFullPath(); if (filePath != null) { @@ -162,6 +167,7 @@ public class NewHeaderFileCreationWizardPage extends AbstractFileCreationWizardP /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.wizards.filewizard.AbstractFileCreationWizardPage#getCreatedFileTU() */ + @Override public ITranslationUnit getCreatedFileTU() { return fNewFileTU; } @@ -169,6 +175,7 @@ public class NewHeaderFileCreationWizardPage extends AbstractFileCreationWizardP /* * @see org.eclipse.cdt.internal.ui.wizards.filewizard.AbstractFileCreationWizardPage#getApplicableTemplates() */ + @Override protected Template[] getApplicableTemplates() { return StubUtility.getFileTemplatesForContentTypes( new String[] { CCorePlugin.CONTENT_TYPE_CXXHEADER, CCorePlugin.CONTENT_TYPE_CHEADER }, null); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java index 70eeec8d1e0..855ab51e9a2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java @@ -58,6 +58,7 @@ public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardP /** * Sets the focus on the starting input field. */ + @Override protected void setFocus() { fNewFileDialogField.setFocus(); } @@ -69,6 +70,7 @@ public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardP * @param parent the parent composite * @param nColumns number of columns to span */ + @Override protected void createFileControls(Composite parent, int nColumns) { fNewFileDialogField.doFillIntoGrid(parent, nColumns); Text textControl = fNewFileDialogField.getTextControl(null); @@ -76,6 +78,7 @@ public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardP textControl.addFocusListener(new StatusFocusListener(NEW_FILE_ID)); } + @Override public IPath getFileFullPath() { String str = fNewFileDialogField.getText(); IPath path = null; @@ -90,6 +93,7 @@ public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardP return path; } + @Override protected IStatus fileNameChanged() { StatusInfo status = new StatusInfo(); @@ -136,6 +140,7 @@ public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardP return status; } + @Override public void createFile(IProgressMonitor monitor) throws CoreException { IPath filePath = getFileFullPath(); if (filePath != null) { @@ -164,6 +169,7 @@ public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardP /* (non-Javadoc) * @see org.eclipse.cdt.internal.ui.wizards.filewizard.AbstractFileCreationWizardPage#getCreatedFileTU() */ + @Override public ITranslationUnit getCreatedFileTU() { return fNewFileTU; } @@ -171,6 +177,7 @@ public class NewSourceFileCreationWizardPage extends AbstractFileCreationWizardP /* * @see org.eclipse.cdt.internal.ui.wizards.filewizard.AbstractFileCreationWizardPage#getApplicableTemplates() */ + @Override protected Template[] getApplicableTemplates() { return StubUtility.getFileTemplatesForContentTypes( new String[] { CCorePlugin.CONTENT_TYPE_CXXSOURCE, CCorePlugin.CONTENT_TYPE_CSOURCE }, null); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java index 27fbd86d23e..a1d54c7b9dd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java @@ -74,6 +74,7 @@ public class WizardNewFileFromTemplateCreationPage extends WizardNewFileCreation /* * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createAdvancedControls(org.eclipse.swt.widgets.Composite) */ + @Override protected void createAdvancedControls(Composite parent) { Composite groupComposite= new Composite(parent,SWT.NONE); groupComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); @@ -87,6 +88,7 @@ public class WizardNewFileFromTemplateCreationPage extends WizardNewFileCreation useTemplateButton.setText(NewFileWizardMessages.WizardNewFileFromTemplateCreationPage_useTemplate_label); useTemplateButton.setSelection(fUseTemplate); SelectionListener useTemplateListener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fUseTemplate= useTemplateButton.getSelection(); fTemplatesCombo.setEnabled(fUseTemplate); @@ -102,6 +104,7 @@ public class WizardNewFileFromTemplateCreationPage extends WizardNewFileCreation configureButton.setText(NewFileWizardMessages.WizardNewFileFromTemplateCreationPage_configure_label); SelectionListener changeTemplateListener= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { editTemplates(); } @@ -133,6 +136,7 @@ public class WizardNewFileFromTemplateCreationPage extends WizardNewFileCreation /* * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#getInitialContents() */ + @Override protected InputStream getInitialContents() { Template template= getSelectedTemplate(); if (fUseTemplate && template != null) { @@ -157,6 +161,7 @@ public class WizardNewFileFromTemplateCreationPage extends WizardNewFileCreation /* * @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#handleEvent(org.eclipse.swt.widgets.Event) */ + @Override public void handleEvent(Event event) { updateTemplates(); super.handleEvent(event); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java index 5ee2ac833c5..b39b76a557a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java @@ -223,6 +223,7 @@ public class NewSourceFolderWizardPage extends NewElementWizardPage { /* * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean) */ + @Override public void setVisible(boolean visible) { super.setVisible(visible); if (visible) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableLabelProvider.java index 892e328c92d..29762390b7f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableLabelProvider.java @@ -23,6 +23,7 @@ public class StringVariableLabelProvider extends LabelProvider { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { if (element instanceof IStringVariable) { IStringVariable variable = (IStringVariable)element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java index 8309114e48f..bd73c89d39b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java @@ -83,6 +83,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Control control = super.createDialogArea(parent); createArgumentArea((Composite)control); @@ -129,7 +130,8 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { gd = new GridData(GridData.FILL_HORIZONTAL); fArgumentText.setLayoutData(gd); fArgumentText.getAccessible().addAccessibleListener(new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = Messages.StringVariableSelectionDialog_columnArgument; } }); @@ -155,6 +157,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { * * @see org.eclipse.ui.dialogs.AbstractElementListSelectionDialog#handleSelectionChanged() */ + @Override protected void handleSelectionChanged() { super.handleSelectionChanged(); Object[] objects = getSelectedElements(); @@ -177,6 +180,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#okPressed() */ + @Override protected void okPressed() { fArgumentValue = fArgumentText.getText().trim(); super.okPressed(); @@ -194,7 +198,8 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings() */ - protected IDialogSettings getDialogBoundsSettings() { + @Override + protected IDialogSettings getDialogBoundsSettings() { IDialogSettings settings = CUIPlugin.getDefault().getDialogSettings(); IDialogSettings section = settings.getSection(getDialogSettingsSectionName()); if (section == null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java index e0fe8521503..66eb4429f2a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java @@ -35,12 +35,14 @@ public class TeamProjectIndexExportWizard extends Wizard implements IExportWizar setDialogSettings(section); } - public void addPages() { + @Override + public void addPages() { super.addPages(); fMainPage = new TeamProjectIndexExportWizardPage(fSelection); addPage(fMainPage); } + @Override public boolean performFinish() { return fMainPage.finish(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java index 31051c91c32..cf0f0344ade 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java @@ -26,6 +26,7 @@ class CElementWorkingSetPageContentProvider extends BaseCElementContentProvider /* * @see org.eclipse.cdt.internal.ui.BaseCElementContentProvider#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object element) { if (element instanceof IWorkspaceRoot) { IWorkspaceRoot root = (IWorkspaceRoot)element; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java index ce26ee76c6f..890228ee2c9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java @@ -60,6 +60,7 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh /* * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { synchronized (fWorkingSet) { checkElementExistence(fWorkingSet); @@ -123,6 +124,7 @@ public class CElementWorkingSetUpdater implements IWorkingSetUpdater, IElementCh check.setRule(SingletonRule.INSTANCE); check.schedule(2000 + fWorkingSets.size() * 100); check.addJobChangeListener(new JobChangeAdapter() { + @Override public void done(IJobChangeEvent event) { synchronized (fWorkingSets) { fWorkingSets.add(workingSet); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java index ce0eca18a2a..a9c5160822b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java @@ -105,7 +105,8 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme /** * @see org.eclipse.jface.viewers.IContentProvider#dispose() */ - public void dispose() { + @Override + public void dispose() { super.dispose(); CoreModel.getDefault().removeElementChangedListener(this); } @@ -113,7 +114,8 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme /** * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + @Override + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { super.inputChanged(viewer, oldInput, newInput); @@ -329,14 +331,16 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme fViewer.refresh(project); } } - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o instanceof RefreshContainer) { RefreshContainer c = (RefreshContainer)o; return c.container.equals(container) && c.project.equals(project); } return false; } - public int hashCode() { + @Override + public int hashCode() { return container.hashCode()*10903143 + 31181; } } @@ -358,14 +362,16 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme fViewer.refresh(element); } } - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o instanceof RefreshElement) { RefreshElement c = (RefreshElement)o; return c.element.equals(element); } return false; } - public int hashCode() { + @Override + public int hashCode() { return element.hashCode()*7 + 490487; } } @@ -381,14 +387,16 @@ public class CElementContentProvider extends BaseCElementContentProvider impleme // enable state. fViewer.setSelection(fViewer.getSelection()); } - public boolean equals(Object o) { + @Override + public boolean equals(Object o) { if (o instanceof RefreshElement) { RefreshElement c = (RefreshElement)o; return c.element.equals(element); } return false; } - public int hashCode() { + @Override + public int hashCode() { return element.hashCode()*11 + 490487; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java index 9d43a0462a6..8a98f0ce9e3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java @@ -40,6 +40,7 @@ public abstract class CElementGrouping extends WorkbenchAdapter implements IAdap /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) */ + @Override public String getLabel(Object object) { switch (type) { case INCLUDES_GROUPING: @@ -51,6 +52,7 @@ public abstract class CElementGrouping extends WorkbenchAdapter implements IAdap /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) */ + @Override public ImageDescriptor getImageDescriptor(Object object) { switch (type) { case INCLUDES_GROUPING: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java index 2070af54955..c7f7aaf5ab5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java @@ -53,6 +53,7 @@ public class CElementImageDescriptor extends CompositeImageDescriptor { /** * @deprecated flag never had an effect */ + @Deprecated public final static int RUNNABLE= 0x010; /** Flag to render the warning adornment */ @@ -64,11 +65,13 @@ public class CElementImageDescriptor extends CompositeImageDescriptor { /** * @deprecated flag never had an effect */ + @Deprecated public final static int OVERRIDES= 0x080; /** * @deprecated flag never had an effect */ + @Deprecated public final static int IMPLEMENTS= 0x100; /** Flag to render the 'relates to' adornment (for trees, an arrow down) */ @@ -167,6 +170,7 @@ public class CElementImageDescriptor extends CompositeImageDescriptor { /* (non-Javadoc) * Method declared in CompositeImageDescriptor */ + @Override protected Point getSize() { return fSize; } @@ -174,6 +178,7 @@ public class CElementImageDescriptor extends CompositeImageDescriptor { /* (non-Javadoc) * Method declared on Object. */ + @Override public boolean equals(Object object) { if (!CElementImageDescriptor.class.equals(object.getClass())) return false; @@ -185,6 +190,7 @@ public class CElementImageDescriptor extends CompositeImageDescriptor { /* (non-Javadoc) * Method declared on Object. */ + @Override public int hashCode() { return fBaseImage.hashCode() | fFlags | fSize.hashCode(); } @@ -192,6 +198,7 @@ public class CElementImageDescriptor extends CompositeImageDescriptor { /* (non-Javadoc) * Method declared in CompositeImageDescriptor */ + @Override protected void drawCompositeImage(int width, int height) { ImageData bg; if ((bg= fBaseImage.getImageData()) == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java index 5b99c0748d9..130641029ec 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java @@ -102,6 +102,7 @@ public class CElementLabelProvider extends LabelProvider { fCElementLabelProvider= new CUILabelProvider(getTextFlags() | CElementBaseLabels.TEMPLATE_PARAMETERS, getImageFlags()); } + @Override public String getText(Object element) { if (element instanceof ICElement) { return fCElementLabelProvider.getText(element); @@ -109,10 +110,12 @@ public class CElementLabelProvider extends LabelProvider { return fWorkbenchLabelProvider.getText(element); } + @Override public Image getImage(Object element) { return fImageLabelProvider.getImageLabel(element, getImageFlags()); } + @Override public void dispose() { if (fCElementLabelProvider != null) { fCElementLabelProvider.dispose(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java index 83aa114d77a..e195eab5393 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java @@ -122,6 +122,7 @@ public class CElementSorter extends ViewerSorter { fSeparateHeaderAndSource= store.getBoolean(PreferenceConstants.CVIEW_SEPARATE_HEADER_AND_SOURCE); } + @Override public int category (Object element) { if (element instanceof ICModel) { return CMODEL; @@ -233,6 +234,7 @@ public class CElementSorter extends ViewerSorter { /* (non-Javadoc) * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) */ + @Override public int compare(Viewer viewer, Object e1, Object e2) { int cat1 = category(e1); int cat2 = category(e2); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java index de5e32f0a1e..d41a04354bd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java @@ -597,6 +597,7 @@ public class CUIPlugin extends AbstractUIPlugin { } /** @deprecated Use {@link EditorsUI#getSharedTextColors()} instead. */ + @Deprecated public ISharedTextColors getSharedTextColors() { return EditorsUI.getSharedTextColors(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java index 26013c36a49..3f8bd19e172 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java @@ -33,6 +33,7 @@ public class CUIPreferenceInitializer extends AbstractPreferenceInitializer { /* (non-Javadoc) * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences() */ + @Override public void initializeDefaultPreferences() { final IPreferenceStore store = CUIPlugin.getDefault().getPreferenceStore(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IncludesGrouping.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IncludesGrouping.java index 3c51189d9fa..96cf6caad6b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IncludesGrouping.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IncludesGrouping.java @@ -30,6 +30,7 @@ public class IncludesGrouping extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object object) { try { return tu.getChildrenOfType(ICElement.C_INCLUDE).toArray(); @@ -41,6 +42,7 @@ public class IncludesGrouping extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object object) { return tu; } @@ -48,6 +50,7 @@ public class IncludesGrouping extends CElementGrouping { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof IncludesGrouping) { return tu.equals(((IncludesGrouping)obj).getParent(obj)) ; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java index 5740191cd6a..58e8cb7c503 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java @@ -36,6 +36,7 @@ public class NamespacesGrouping extends CElementGrouping { fName = namespace.getElementName(); } + @Override public String getLabel(Object object) { return fName; } @@ -43,6 +44,7 @@ public class NamespacesGrouping extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) */ + @Override public Object[] getChildren(Object object) { List list = new ArrayList(); for (int i = 0; i < fNamespaces.length; ++i) { @@ -60,6 +62,7 @@ public class NamespacesGrouping extends CElementGrouping { /* (non-Javadoc) * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) */ + @Override public Object getParent(Object object) { return fUnit; } @@ -74,6 +77,7 @@ public class NamespacesGrouping extends CElementGrouping { /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof IncludesGrouping) { return fUnit.equals(((IncludesGrouping)obj).getParent(obj)) ; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java index db42f5ff2a5..ac0f63130ce 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java @@ -933,6 +933,7 @@ public class PreferenceConstants { * @since 3.1.1 * @deprecated As of 4.0, replaced by {@link AbstractDecoratedTextEditorPreferenceConstants#EDITOR_SHOW_TEXT_HOVER_AFFORDANCE} */ + @Deprecated public static final String EDITOR_SHOW_TEXT_HOVER_AFFORDANCE= AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE; /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java index 48849ce5dc1..ff4a7cb7f81 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java @@ -105,12 +105,14 @@ public class BuildActiveConfigMenuAction extends ChangeBuildConfigActionBase */ private void addMenuListener(Menu menu) { menu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { fillMenu((Menu)e.widget); } }); } + @Override protected IAction makeAction(String sName, StringBuffer builder, int accel) { return new BuildConfigAction(fProjects, sName, builder.toString(), accel + 1, buildaction); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java index 04fc763b111..4c8341432c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java @@ -36,6 +36,7 @@ public class BuildConfigAction extends ChangeConfigAction { /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { super.run(); buildAction.selectionChanged(new StructuredSelection(fProjects.toArray())); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigContextAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigContextAction.java index 7a91dc632f3..838b690e54e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigContextAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigContextAction.java @@ -69,6 +69,7 @@ public class ChangeBuildConfigContextAction extends ChangeBuildConfigActionBase public Menu getMenu(Menu parent) { Menu menu = new Menu(parent); menu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { fillMenu((Menu)e.widget); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java index 905a0a89a7a..635e6a9fd53 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java @@ -93,6 +93,7 @@ public class ChangeBuildConfigMenuAction extends ChangeBuildConfigActionBase imp */ private void addMenuListener(Menu menu) { menu.addMenuListener(new MenuAdapter() { + @Override public void menuShown(MenuEvent e) { fillMenu((Menu)e.widget); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java index 99cb0b4f33f..85fdf5fc43d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java @@ -45,6 +45,7 @@ public class ChangeConfigAction extends Action { /** * @see org.eclipse.jface.action.IAction#run() */ + @Override public void run() { Iterator iter = fProjects.iterator(); while (iter.hasNext()) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java index 36749242b79..759a2ed4f82 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java @@ -75,6 +75,7 @@ public class CustomFiltersActionGroup extends ActionGroup { //setImageDescriptor(CPluginImages.DESC_CLCL_FILTER); } + @Override public void run() { openDialog(); } @@ -117,6 +118,7 @@ public class CustomFiltersActionGroup extends ActionGroup { /* * Overrides method from ContributionItem. */ + @Override public void fill(Menu menu, int index) { MenuItem mi= new MenuItem(menu, SWT.CHECK, index); mi.setText("&" + fItemNumber + " " + fFilterName); //$NON-NLS-1$ //$NON-NLS-2$ @@ -127,6 +129,7 @@ public class CustomFiltersActionGroup extends ActionGroup { // mi.setImage(JavaPluginImages.get(JavaPluginImages.IMG_OBJS_JAVA_WORKING_SET)); mi.setSelection(fState); mi.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { fState= !fState; fActionGroup.setFilter(fFilterId, fState); @@ -137,6 +140,7 @@ public class CustomFiltersActionGroup extends ActionGroup { /* * @see org.eclipse.jface.action.IContributionItem#isDynamic() */ + @Override public boolean isDynamic() { return true; } @@ -228,6 +232,7 @@ public class CustomFiltersActionGroup extends ActionGroup { /* * Method declared on ActionGroup. */ + @Override public void fillActionBars(IActionBars actionBars) { fillToolBar(actionBars.getToolBarManager()); fillViewMenu(actionBars.getMenuManager()); @@ -401,6 +406,7 @@ public class CustomFiltersActionGroup extends ActionGroup { /* * Method declared on ActionGroup. */ + @Override public void dispose() { if (fMenuManager != null) fMenuManager.removeMenuListener(fMenuListener); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java index db385d1584d..ab8bbe39d84 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java @@ -146,6 +146,7 @@ implements IWorkbenchWindowPulldownDelegate2, IObjectActionDelegate { CoreModel.getDefault().setProjectDescription(res.getProject(), prjd); } catch (CoreException e) {} } + @Override public String toString() { return "[" + cfgd.getName() + "] for " + res.getName(); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java index ed4c3f9ef14..20db7e97660 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java @@ -338,6 +338,7 @@ public class GenerateActionGroup extends ActionGroup { /* * Method declared in ActionGroup */ + @Override public void fillActionBars(IActionBars actionBar) { super.fillActionBars(actionBar); setGlobalActionHandlers(actionBar); @@ -346,6 +347,7 @@ public class GenerateActionGroup extends ActionGroup { /* * Method declared in ActionGroup */ + @Override public void fillContextMenu(IMenuManager menu) { super.fillContextMenu(menu); String menuText= ActionMessages.getString("SourceMenu_label"); //$NON-NLS-1$ @@ -430,6 +432,7 @@ public class GenerateActionGroup extends ActionGroup { /* * Method declared in ActionGroup */ + @Override public void dispose() { if (fRegisteredSelectionListeners != null) { ISelectionProvider provider= fSite.getSelectionProvider(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java index c660b308a5a..b652256bbf3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java @@ -47,6 +47,7 @@ public class MemberFilterActionGroup extends ActionGroup { public static final int FILTER_FIELDS= MemberFilter.FILTER_FIELDS; /** @deprecated Unsupported filter constant */ + @Deprecated public static final int FILTER_LOCALTYPES= MemberFilter.FILTER_LOCALTYPES; public static final int ALL_FILTERS= FILTER_NONPUBLIC | FILTER_FIELDS | FILTER_STATIC; @@ -310,6 +311,7 @@ public class MemberFilterActionGroup extends ActionGroup { /* (non-Javadoc) * @see ActionGroup#fillActionBars(IActionBars) */ + @Override public void fillActionBars(IActionBars actionBars) { contributeToToolBar(actionBars.getToolBarManager()); } @@ -351,6 +353,7 @@ public class MemberFilterActionGroup extends ActionGroup { /* (non-Javadoc) * @see ActionGroup#dispose() */ + @Override public void dispose() { fFilterActions= null; fFilter= null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java index b10b2549878..f28bbf404a0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java @@ -87,12 +87,14 @@ public class OpenAction extends SelectionDispatchAction { /* (non-Javadoc) * Method declared on SelectionDispatchAction. */ + @Override public void selectionChanged(ITextSelection selection) { } /* (non-Javadoc) * Method declared on SelectionDispatchAction. */ + @Override public void selectionChanged(IStructuredSelection selection) { setEnabled(checkEnabled(selection)); } @@ -116,6 +118,7 @@ public class OpenAction extends SelectionDispatchAction { /* (non-Javadoc) * Method declared on SelectionDispatchAction. */ + @Override public void run(ITextSelection selection) { if (!ActionUtil.isProcessable(getShell(), fEditor)) return; @@ -142,6 +145,7 @@ public class OpenAction extends SelectionDispatchAction { /* (non-Javadoc) * Method declared on SelectionDispatchAction. */ + @Override public void run(IStructuredSelection selection) { if (!checkEnabled(selection)) return; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/SelectionDispatchAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/SelectionDispatchAction.java index a5b3d768efe..8c303434ffb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/SelectionDispatchAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/SelectionDispatchAction.java @@ -168,6 +168,7 @@ public abstract class SelectionDispatchAction extends Action implements ISelecti /* (non-Javadoc) * Method declared on IAction. */ + @Override public void run() { dispatchRun(getSelection()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java index 7b59cba0894..d0463aa7c8b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java @@ -39,6 +39,7 @@ import org.eclipse.ui.texteditor.ITextEditor; * * @deprecated Use generic IShowInTarget support instead. */ +@Deprecated public class ShowInCViewAction extends SelectionProviderAction { private IWorkbenchPage page; @@ -62,6 +63,7 @@ public class ShowInCViewAction extends SelectionProviderAction { //WorkbenchHelp.setHelp(this, ICHelpContextIds.SHOW_IN_CVIEW_ACTION); } + @Override public void run() { ISelection selection = getSelection(); if (selection instanceof ITextSelection) { @@ -106,6 +108,7 @@ public class ShowInCViewAction extends SelectionProviderAction { * (non-Javadoc) * Method declared on SelectionProviderAction. */ + @Override public void selectionChanged(IStructuredSelection selection) { setEnabled(!getSelection().isEmpty()); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractBinaryParserPage.java index f37b35dc29d..d3abf51d3eb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractBinaryParserPage.java @@ -83,6 +83,7 @@ public abstract class AbstractBinaryParserPage extends AbstractCOptionPage { fCompositeParent.setLayout(new TabFolderLayout()); } + @Override public void setVisible(boolean visible) { super.setVisible(visible); handleBinaryParserChanged(); @@ -141,6 +142,7 @@ public abstract class AbstractBinaryParserPage extends AbstractCOptionPage { abstract protected String[] getBinaryParserIDs(); + @Override abstract public void createControl(Composite parent); /* @@ -148,6 +150,7 @@ public abstract class AbstractBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override abstract public void performApply(IProgressMonitor monitor) throws CoreException; /* @@ -155,6 +158,7 @@ public abstract class AbstractBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performDefaults() */ + @Override abstract public void performDefaults(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java index 610502cceca..f011d41b735 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java @@ -75,6 +75,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { * * @param prefs */ + @Deprecated public AbstractErrorParserBlock(Preferences prefs) { this(); // usingDeprecatedContructor = true; @@ -86,6 +87,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { setDescription(CUIPlugin.getResourceString(DESC)); } + @Override public Image getImage() { return null; } @@ -108,6 +110,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { * * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) */ + @Override public String getText(Object element) { String name = (String)mapParsers.get(element.toString()); return name != null ? name : element.toString(); @@ -157,6 +160,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { * @deprecated - use getErrorParserIDs(boolean defaults) * @return String[] */ + @Deprecated protected String[] getErrorParserIDs() { return new String[0]; } @@ -172,6 +176,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { * @param parserIDs */ + @Deprecated protected void saveErrorParsers(Preferences prefs, String[] parserIDs) { StringBuffer buf = new StringBuffer(); for (int i = 0; i < parserIDs.length; i++) { @@ -250,6 +255,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { } } + @Override public void createControl(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); setControl(composite); @@ -283,6 +289,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { initializeValues(); } + @Override public void performApply(IProgressMonitor monitor) throws CoreException { if (listDirty) { IProject project = getContainer().getProject(); @@ -313,6 +320,7 @@ public abstract class AbstractErrorParserBlock extends AbstractCOptionPage { } } + @Override public void performDefaults() { setDefaults(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java index 8d4aac00534..0cdc0db08b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java @@ -59,6 +59,7 @@ public abstract class AbstractGNUBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void performApply(IProgressMonitor monitor) throws CoreException { if (monitor == null) { monitor = new NullProgressMonitor(); @@ -123,6 +124,7 @@ public abstract class AbstractGNUBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performDefaults() */ + @Override public void performDefaults() { String addr2line = null; String cppfilt = null; @@ -146,6 +148,7 @@ public abstract class AbstractGNUBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Group comp = new Group(parent, SWT.SHADOW_ETCHED_IN); comp.setText(CUIMessages.getString("BinaryParserBlock.binaryParserOptions")); //$NON-NLS-1$ @@ -169,6 +172,7 @@ public abstract class AbstractGNUBinaryParserPage extends AbstractCOptionPage { Button button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleAddr2LineButtonSelected(); //updateLaunchConfigurationDialog(); @@ -207,6 +211,7 @@ public abstract class AbstractGNUBinaryParserPage extends AbstractCOptionPage { button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse1")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleCPPFiltButtonSelected(); //updateLaunchConfigurationDialog(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java index eeb051d347a..03623b0b277 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java @@ -83,10 +83,12 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { return fExtension.getLabel(); } + @Override public String toString() { return fExtension.getUniqueIdentifier(); } + @Override public boolean equals(Object obj) { if (obj instanceof BinaryParserConfiguration) { return this.getID().equals(((BinaryParserConfiguration) obj).getID()); @@ -97,6 +99,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { protected class BinaryParserLabelProvider extends LabelProvider { + @Override public String getText(Object element) { return ((BinaryParserConfiguration) element).getName(); } @@ -125,6 +128,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { binaryList = new CheckedListDialogField(listAdapter, buttonLabels, new BinaryParserLabelProvider()) { + @Override protected int getListStyle() { int style = super.getListStyle(); return style & ~SWT.MULTI; @@ -176,6 +180,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { return false; // invalid extension definition (must have at least cextension elements) } + @Override public void createControl(Composite parent) { PixelConverter converter = new PixelConverter(parent); @@ -210,6 +215,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { } + @Override public void performApply(IProgressMonitor monitor) throws CoreException { if (monitor == null) { monitor = new NullProgressMonitor(); @@ -269,6 +275,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { monitor.done(); } + @Override public void setContainer(ICOptionContainer container) { super.setContainer(container); @@ -349,6 +356,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { return new String[0]; } + @Override public void performDefaults() { String id = null; @@ -386,6 +394,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { getContainer().updateContainer(); } + @Override protected String getCurrentBinaryParserID() { List list = binaryList.getSelectedElements(); if (list.size() > 0) { @@ -398,6 +407,7 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { return null; } + @Override protected String[] getBinaryParserIDs() { return (String[]) configMap.keySet().toArray(new String[configMap.keySet().size()]); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java index 973b83b2851..aa0b54dd632 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java @@ -61,6 +61,7 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements fHelpProviderIcon= CPluginImages.DESC_OBJS_LIBRARY; } + @Override public String getText(Object element) { if (element instanceof CHelpBookDescriptor) { return ((CHelpBookDescriptor)element).getCHelpBook().getTitle(); @@ -68,6 +69,7 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements return super.getText(element); } + @Override public Image getImage(Object element) { if (element instanceof CHelpBookDescriptor) { return fRegistry.get(fHelpProviderIcon); @@ -157,6 +159,7 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createContents(Composite parent) { fCHelpSettingsDisplay= new CHelpSettingsDisplay(); fCHelpSettingsDisplay.init(getResource()); @@ -171,6 +174,7 @@ public class CHelpConfigurationPropertyPage extends PropertyPage implements return (IResource)element.getAdapter(IResource.class); } + @Override public boolean performOk() { fCHelpSettingsDisplay.performOk(); super.performOk(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java index fd125e0b3fb..608e4ed3b61 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java @@ -61,6 +61,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void performApply(IProgressMonitor monitor) throws CoreException { if (monitor == null) { monitor = new NullProgressMonitor(); @@ -125,6 +126,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performDefaults() */ + @Override public void performDefaults() { String addr2line = null; String cppfilt = null; @@ -156,6 +158,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite composite) { Group comp = new Group(composite, SWT.SHADOW_ETCHED_IN); comp.setText(CUIMessages.getString("BinaryParserBlock.binaryParserOptions")); //$NON-NLS-1$ @@ -180,6 +183,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { Button button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleAddr2LineButtonSelected(); //updateLaunchConfigurationDialog(); @@ -218,6 +222,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse1")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleCPPFiltButtonSelected(); //updateLaunchConfigurationDialog(); @@ -256,6 +261,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse2")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleCygPathButtonSelected(); //updateLaunchConfigurationDialog(); @@ -295,6 +301,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse2")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleCygPathButtonSelected(); //updateLaunchConfigurationDialog(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java index 36f941dca79..7c24c45f4a6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java @@ -51,6 +51,7 @@ public class DocCommentOwnerBlock extends AbstractCOptionPage { fLink.setVisible(!fCheckbox.getSelection()); } + @Override public void createControl(final Composite parent) { Composite pane= new Composite(parent, SWT.NONE); pane.setLayout(new GridLayout(2, true)); @@ -61,6 +62,7 @@ public class DocCommentOwnerBlock extends AbstractCOptionPage { fCheckbox= ControlFactory.createCheckBox(pane, DialogsMessages.DocCommentOwnerBlock_EnableProjectSpecificSettings); fCheckbox.setLayoutData(GridDataFactory.fillDefaults().grab(true,false).create()); fCheckbox.addSelectionListener(new SelectionAdapter(){ + @Override public void widgetSelected(SelectionEvent e) { handleCheckBox(); } @@ -70,6 +72,7 @@ public class DocCommentOwnerBlock extends AbstractCOptionPage { fLink.setText(DialogsMessages.PreferenceScopeBlock_preferenceLink); fLink.setLayoutData(GridDataFactory.fillDefaults().align(GridData.CENTER, GridData.BEGINNING).grab(true,false).create()); fLink.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(parent.getShell(), EDITOR_PREF_PAGE_ID, null, null).open(); } @@ -86,6 +89,7 @@ public class DocCommentOwnerBlock extends AbstractCOptionPage { handleCheckBox(); } + @Override public void performApply(IProgressMonitor monitor) throws CoreException { if(!fCheckbox.getSelection()) fManager.setCommentOwner(getProject(), null, true); @@ -112,6 +116,7 @@ public class DocCommentOwnerBlock extends AbstractCOptionPage { return null; } + @Override public void performDefaults() { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java index 19f3704becd..ea5eb2a0f81 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java @@ -77,6 +77,7 @@ public class DocCommentOwnerCombo extends Composite { fCombo.select(0); } + @Override public void setEnabled(boolean enabled) { fCombo.setEnabled(enabled); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java index a56a681d02f..c312ad668a1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java @@ -56,6 +56,7 @@ public class DocCommentOwnerComposite extends Composite { return fDocCombo.getSelectedDocCommentOwner(); } + @Override public void setEnabled(boolean enabled) { desc.setEnabled(enabled); comboLabel.setEnabled(enabled); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java index ef8b9cb2dc9..fb70af6f7d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java @@ -22,6 +22,7 @@ public class GNUElfBinaryParserPage extends AbstractGNUBinaryParserPage { /* (non-Javadoc) * @see org.eclipse.cdt.ui.dialogs.AbstractGNUBinaryParserPage#getRealBinaryParserPage() */ + @Override protected AbstractGNUBinaryParserPage getRealBinaryParserPage() { return this; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUSomBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUSomBinaryParserPage.java index f4e64d92d9d..f4011809590 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUSomBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUSomBinaryParserPage.java @@ -22,6 +22,7 @@ public class GNUSomBinaryParserPage extends AbstractGNUBinaryParserPage { /* (non-Javadoc) * @see org.eclipse.cdt.ui.dialogs.AbstractGNUBinaryParserPage#getRealBinaryParserPage() */ + @Override protected AbstractGNUBinaryParserPage getRealBinaryParserPage() { return this; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUXCoffBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUXCoffBinaryParserPage.java index 622de3d494c..067e5e39fae 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUXCoffBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUXCoffBinaryParserPage.java @@ -22,6 +22,7 @@ public class GNUXCoffBinaryParserPage extends AbstractGNUBinaryParserPage { /* (non-Javadoc) * @see org.eclipse.cdt.ui.dialogs.GNUElfBinaryParserPage#getRealBinaryParserPage() */ + @Override protected AbstractGNUBinaryParserPage getRealBinaryParserPage() { return this; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java index 0e153badf07..2e2f7fbace8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java @@ -135,7 +135,8 @@ public class IndexerBlock extends AbstractCOptionPage { } } - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { fParent= parent; Composite composite = ControlFactory.createComposite(parent, 1); @@ -148,6 +149,7 @@ public class IndexerBlock extends AbstractCOptionPage { if (getProject() != null || getContainer() instanceof ICOptionContainerExtension) { fPrefScopeBlock= new PreferenceScopeBlock(PREF_PAGE_ID) { + @Override protected void onPreferenceScopeChange() { IndexerBlock.this.onPreferenceScopeChange(); } @@ -168,6 +170,7 @@ public class IndexerBlock extends AbstractCOptionPage { gd.grabExcessHorizontalSpace= true; fIndexersComboBox = ControlFactory.createSelectCombo(group,"", ""); //$NON-NLS-1$ //$NON-NLS-2$ fIndexersComboBox.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { onIndexerChange(); } @@ -186,7 +189,8 @@ public class IndexerBlock extends AbstractCOptionPage { fUseFixedBuildConfig= ControlFactory.createRadioButton(group, DialogsMessages.IndexerBlock_fixedBuildConfig, null, null); fBuildConfigComboBox= ControlFactory.createSelectCombo(group, "", ""); //$NON-NLS-1$ //$NON-NLS-2$ final SelectionAdapter listener = new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { setUseActiveBuildConfig(fUseActiveBuildButton.getSelection()); } }; @@ -456,7 +460,8 @@ public class IndexerBlock extends AbstractCOptionPage { return null; } - public void performApply(IProgressMonitor monitor) throws CoreException { + @Override + public void performApply(IProgressMonitor monitor) throws CoreException { int scope= computeScope(); IProject project= getProject(); String indexerID = getSelectedIndexerID(); @@ -503,7 +508,8 @@ public class IndexerBlock extends AbstractCOptionPage { CCoreInternals.savePreferences(project); } - public void performDefaults() { + @Override + public void performDefaults() { fCurrentProperties= null; if (fPrefScopeBlock != null) { fPrefScopeBlock.setInstanceScope(); @@ -518,6 +524,7 @@ public class IndexerBlock extends AbstractCOptionPage { /** * @deprecated always returns false */ + @Deprecated public boolean isIndexEnabled() { return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java index 3655e4e9f7d..7a2720111d9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java @@ -39,6 +39,7 @@ public class IndexerOptionPropertyPage extends PropertyPage implements ICOptionC optionPage.setContainer(this); } + @Override protected Control createContents(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout()); @@ -49,10 +50,12 @@ public class IndexerOptionPropertyPage extends PropertyPage implements ICOptionC return composite; } + @Override protected void performDefaults() { optionPage.performDefaults(); } + @Override public boolean performOk() { try { optionPage.performApply(new NullProgressMonitor()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java index 56407b12745..17c8cb2a2bf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java @@ -55,6 +55,7 @@ public class MachOBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performApply(org.eclipse.core.runtime.IProgressMonitor) */ + @Override public void performApply(IProgressMonitor monitor) throws CoreException { if (monitor == null) { monitor = new NullProgressMonitor(); @@ -110,6 +111,7 @@ public class MachOBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.cdt.ui.dialogs.ICOptionPage#performDefaults() */ + @Override public void performDefaults() { String cppfilt = null; IProject proj = getContainer().getProject(); @@ -129,6 +131,7 @@ public class MachOBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ + @Override public void createControl(Composite parent) { Group comp = new Group(parent, SWT.SHADOW_ETCHED_IN); comp.setText(CUIMessages.getString("BinaryParserBlock.binaryParserOptions")); //$NON-NLS-1$ @@ -153,6 +156,7 @@ public class MachOBinaryParserPage extends AbstractCOptionPage { Button button = ControlFactory.createPushButton(comp, CUIMessages.getString("BinaryParserPage.label.browse")); //$NON-NLS-1$ button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent evt) { handleCPPFiltButtonSelected(); //updateLaunchConfigurationDialog(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/NullIndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/NullIndexerBlock.java index cb5e3649011..bc307bf58a7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/NullIndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/NullIndexerBlock.java @@ -22,15 +22,18 @@ import org.eclipse.swt.widgets.Composite; */ public class NullIndexerBlock extends AbstractIndexerPage { + @Override public void createControl(Composite parent) { super.createControl(parent); ControlEnableState.disable(getControl()); } + @Override public Properties getProperties() { return new Properties(); } + @Override public void setProperties(Properties properties) { } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java index 2c90ce87a57..71c0b1ba926 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java @@ -44,6 +44,7 @@ abstract public class PreferenceScopeBlock { fStoreWithProject= ControlFactory.createCheckBox(two, DialogsMessages.PreferenceScopeBlock_storeWithProject); SelectionListener sl= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateEnablement(); onPreferenceScopeChange(); @@ -56,6 +57,7 @@ abstract public class PreferenceScopeBlock { fLink.setText(DialogsMessages.PreferenceScopeBlock_preferenceLink); fLink.setLayoutData(new GridData()); sl= new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(parent.getShell(), fPrefPageID, null, null).open(); onPreferenceScopeChange(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java index c8d3d534fd0..b31dc5e07d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java @@ -53,6 +53,7 @@ public class ReferenceBlock extends AbstractCOptionPage { setDescription(CUIPlugin.getResourceString(DESC)); } + @Override public Image getImage() { return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT); } @@ -65,6 +66,7 @@ public class ReferenceBlock extends AbstractCOptionPage { */ protected IStructuredContentProvider getContentProvider() { return new WorkbenchContentProvider() { + @Override public Object[] getChildren(Object element) { if (!(element instanceof IWorkspace)) return new Object[0]; @@ -106,6 +108,7 @@ public class ReferenceBlock extends AbstractCOptionPage { return projects; } + @Override public void createControl(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); composite.setLayout(new GridLayout()); @@ -155,6 +158,7 @@ public class ReferenceBlock extends AbstractCOptionPage { } + @Override public void performApply(IProgressMonitor monitor) throws CoreException { IProject[] refProjects = getReferencedProjects(); if (refProjects != null) { @@ -173,6 +177,7 @@ public class ReferenceBlock extends AbstractCOptionPage { } + @Override public void performDefaults() { initializeValues(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java index bdf6976b2e8..31990c958d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java @@ -120,6 +120,7 @@ public abstract class TabFolderOptionBlock { fFolder.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (!initializingTabs) { setCurrentPage((ICOptionPage) ((TabItem)e.item).getData()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java index 88e3dd79698..ffefe085601 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java @@ -183,7 +183,8 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab { buttons[i].setLayoutData(gdb); buttons[i].addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { buttonPressed(event); }}); } @@ -336,7 +337,8 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab { b.setText(name); setupControl(b, span, mode); b.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { setGrayed((Button)event.widget, false); checkPressed(event); }}); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java index 2b5652d94b1..80e6e9bdd34 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java @@ -89,6 +89,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { } + @Override public void createControls(Composite parent) { super.createControls(parent); usercomp.setLayout(new GridLayout(2, false)); @@ -112,10 +113,12 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { tv.setLabelProvider(new RichLabelProvider()); table.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { updateButtons(); } - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { if (buttonIsEnabled(1) && table.getSelectionIndex() != -1) buttonPressed(1); } @@ -142,7 +145,8 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { * Updates state of add/edit/delete buttons * Called when table selection changes. */ - protected void updateButtons() { + @Override + protected void updateButtons() { int i = table.getSelectionIndex(); boolean x = i != -1; boolean y = x; @@ -198,6 +202,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { * Called when configuration changed * Refreshes languages list and calls table refresh. */ + @Override public void updateData(ICResourceDescription rcfg) { if (rcfg == null) return; if (page.isMultiCfg()) { @@ -212,6 +217,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { /** * Unified "Add/Edit/Delete" buttons handler */ + @Override public void buttonPressed(int i) { ICLanguageSettingEntry[] ent = new ICLanguageSettingEntry[1]; ExtData old; @@ -327,6 +333,7 @@ outer: return ein; } + @Override protected void performApply(ICResourceDescription src, ICResourceDescription dst) { ICConfigurationDescription c1 = src.getConfiguration(); ICConfigurationDescription c2 = dst.getConfiguration(); @@ -338,6 +345,7 @@ outer: v[i].getCompatibleExtensions(), v[i].getEntries()); } + @Override protected void performDefaults() { cfg.removeExternalSettings(); updateData(this.getResDesc()); @@ -346,6 +354,7 @@ outer: // Extended label provider private class RichLabelProvider extends LabelProvider implements IFontProvider, ITableLabelProvider /*, IColorProvider*/{ public RichLabelProvider(){} + @Override public Image getImage(Object element) { return getColumnImage(element, 0); } @@ -359,6 +368,7 @@ outer: else return IMG_FS; } + @Override public String getText(Object element) { return getColumnText(element, 0); } @@ -388,6 +398,7 @@ outer: } } + @Override public boolean canBeVisible() { if (! page.isForProject() ) return false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java index 92ca3b6904d..bfeeeacdfe2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java @@ -101,6 +101,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { private final static Image IMG_MK = CPluginImages.get(CPluginImages.IMG_OBJS_MACRO); private static final int[] DEFAULT_SASH_WEIGHTS = new int[] { 10, 30 }; + @Override public void createControls(Composite parent) { super.createControls(parent); usercomp.setLayout(new GridLayout(2, true)); @@ -161,10 +162,12 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { tv.setLabelProvider(new RichLabelProvider()); table.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { updateButtons(); } - public void widgetDefaultSelected(SelectionEvent e) { + @Override + public void widgetDefaultSelected(SelectionEvent e) { if (buttonIsEnabled(1) && table.getSelectionIndex() != -1) buttonPressed(1); } @@ -184,6 +187,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { lb1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); lb1.setToolTipText(UIMessages.getString("EnvironmentTab.15")); //$NON-NLS-1$ lb1.addMouseListener(new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent e) { CDTPrefUtil.spinDMode(); update(); @@ -191,7 +195,8 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { showBIButton = setupCheck(usercomp, UIMessages.getString("AbstractLangsListTab.0"), 1, GridData.FILL_HORIZONTAL); //$NON-NLS-1$ showBIButton.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { update(); } }); @@ -200,6 +205,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { lb2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); lb2.setToolTipText(UIMessages.getString("EnvironmentTab.23")); //$NON-NLS-1$ lb2.addMouseListener(new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent e) { CDTPrefUtil.spinWMode(); updateLbs(null, lb2); @@ -214,7 +220,8 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { * Updates state for all buttons * Called when table selection changes. */ - protected void updateButtons() { + @Override + protected void updateButtons() { int index = table.getSelectionIndex(); int[] ids = table.getSelectionIndices(); boolean canAdd = langTree.getItemCount() > 0; @@ -254,6 +261,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { langTree.setHeaderVisible(true); langTree.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { TreeItem[] items = langTree.getSelection(); if (items.length > 0) { @@ -277,7 +285,8 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { langCol.setResizable(false); langTree.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = UIMessages.getString("AbstractLangsListTab.1"); //$NON-NLS-1$ } } @@ -339,6 +348,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { * Called when configuration changed * Refreshes languages list and calls table refresh. */ + @Override public void updateData(ICResourceDescription cfg) { if (cfg == null || !canBeVisible()) return; updateExport(); @@ -485,6 +495,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { /** * Unified buttons handler */ + @Override public void buttonPressed(int i) { ICLanguageSettingEntry old; int n = table.getSelectionIndex(); @@ -588,6 +599,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { } } + @Override protected void performApply(ICResourceDescription src, ICResourceDescription dst) { if (page.isMultiCfg()) { ICLanguageSetting [] sr = ls; @@ -616,6 +628,7 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab { } } + @Override protected void performDefaults() { TreeItem[] tis = langTree.getItems(); for (int i=0; i 0 ) { ICPropertyTab newTab = (ICPropertyTab)folder.getSelection()[0].getData(); if (newTab != null && currentTab != newTab) { @@ -414,17 +418,20 @@ implements } } - public boolean performCancel() { + @Override + public boolean performCancel() { if (! noContentOnPage && displayedConfig) forEach(ICPropertyTab.CANCEL); CDTPropertyManager.performCancel(this); return true; } + @Override public void performDefaults() { if (! noContentOnPage && displayedConfig) forEach(ICPropertyTab.DEFAULTS); } - public void performApply() { performSave(SAVE_MODE_APPLY); } + @Override + public void performApply() { performSave(SAVE_MODE_APPLY); } /** * There are 2 ways to perform OK for CDT property pages. @@ -444,7 +451,8 @@ implements * /.metadata/.plugins/org.eclipse.cdt.ui/apply_mode */ - public boolean performOk() { + @Override + public boolean performOk() { File f = CUIPlugin.getDefault().getStateLocation().append("apply_mode").toFile(); //$NON-NLS-1$ if (f.exists()) return performSave(SAVE_MODE_APPLYOK); @@ -599,11 +607,13 @@ implements public void updateTitle() { } public void updateContainer() { } + @Override public boolean isValid() { updateContainer(); return super.isValid(); } + @Override public void setVisible(boolean visible) { super.setVisible(visible); if (visible) { @@ -664,6 +674,7 @@ implements } catch (CoreException e) {} } + @Override public IPreferenceStore getPreferenceStore() { return CUIPlugin.getDefault().getPreferenceStore(); } @@ -782,6 +793,7 @@ implements } } + @Override public void dispose() { if (displayedConfig) forEach(ICPropertyTab.DISPOSE); @@ -1015,6 +1027,7 @@ implements } // override parent's method to use proper class + @Override public IAdaptable getElement() { if (internalElement == null && !checkElement()) throw (new NullPointerException(UIMessages.getString("AbstractPage.15"))); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java index 247353302de..9916244cd78 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java @@ -31,6 +31,7 @@ public abstract class AbstractPrefPage extends AbstractPage public Label titleLabel; + @Override protected Control createContents(Composite parent) { // Create the container we return to the property page editor Composite composite = new Composite(parent, SWT.NULL); @@ -53,11 +54,16 @@ public abstract class AbstractPrefPage extends AbstractPage return composite; } + @Override protected boolean checkElement() { return true; } + @Override public boolean isForPrefs() { return true; } public void init(IWorkbench workbench) {} + @Override public ICResourceDescription getResDesc() { return null; } + @Override public void performApply() { performOk(); } + @Override public boolean performOk() { forEach(ICPropertyTab.OK, null); return true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPropertyDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPropertyDialog.java index 121ca907af2..91ef42d0108 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPropertyDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPropertyDialog.java @@ -55,7 +55,8 @@ public abstract class AbstractPropertyDialog extends Dialog { b.setText(text); b.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); b.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent event) { + @Override + public void widgetSelected(SelectionEvent event) { buttonPressed(event); }}); return b; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java index f43cf5727ff..2e661f6d5bd 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java @@ -25,6 +25,7 @@ public abstract class AbstractSinglePage extends AbstractPage { /** * Implement this method to create your own widgets */ + @Override public abstract void createWidgets(Composite c); /** @@ -40,6 +41,7 @@ public abstract class AbstractSinglePage extends AbstractPage { * Rewrite this method to handle configuration change * Do not forget to call super.cfgChanged(_cfgd); */ + @Override protected void cfgChanged(ICConfigurationDescription _cfgd) { super.cfgChanged(_cfgd); // if (displayedConfig) { @@ -50,7 +52,8 @@ public abstract class AbstractSinglePage extends AbstractPage { /** * Usually, this method needs not to be rewritten */ - public boolean performCancel() { + @Override + public boolean performCancel() { // if (! noContentOnPage && displayedConfig) { // do nothing in most cases // } @@ -61,6 +64,7 @@ public abstract class AbstractSinglePage extends AbstractPage { * Rewrite this method to restore default * values in current ResourceDescription */ + @Override public void performDefaults() { // if (! noContentOnPage && displayedConfig) { // do something with getResDesc() fields @@ -70,7 +74,8 @@ public abstract class AbstractSinglePage extends AbstractPage { /** * Usually, this method needs not to be rewritten */ - public boolean performOk() { + @Override + public boolean performOk() { if (! noContentOnPage && displayedConfig) { // do nothing in most cases } @@ -80,6 +85,7 @@ public abstract class AbstractSinglePage extends AbstractPage { /** * */ + @Override public void setVisible(boolean visible) { super.setVisible(visible); if (visible) { @@ -90,12 +96,14 @@ public abstract class AbstractSinglePage extends AbstractPage { /** * No need to rewrite */ + @Override protected boolean isSingle() { return true; } /** * Call to "foreach" does not really matter, since we have not tabs * But we intercept this call to perform other operations (apply). */ + @Override protected void forEach(int m, Object data) { if (m == ICPropertyTab.APPLY) performApply(getResDesc(), (ICResourceDescription)data); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java index 787fa6d8cf2..357ed550f12 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java @@ -83,7 +83,9 @@ public class BinaryParsTab extends AbstractCPropertyTab { public BinaryParserConfiguration(IExtension extension) { fExtension = extension; } public String getID() { return fExtension.getUniqueIdentifier();} public String getName() { return fExtension.getLabel(); } + @Override public String toString() { return fExtension.getUniqueIdentifier(); } + @Override public boolean equals(Object obj) { if (obj instanceof BinaryParserConfiguration) { return this.getID().equals(((BinaryParserConfiguration) obj).getID()); @@ -110,6 +112,7 @@ public class BinaryParsTab extends AbstractCPropertyTab { return CCorePlugin.BINARY_PARSER_SIMPLE_ID; } + @Override public void createControls(Composite parent) { super.createControls(parent); PlatformUI.getWorkbench().getHelpSystem().setHelp(usercomp, ICHelpContextIds.BINARY_PARSER_PAGE); @@ -131,6 +134,7 @@ public class BinaryParsTab extends AbstractCPropertyTab { table = new Table(c1, SWT.BORDER | SWT.CHECK | SWT.SINGLE); table.setLayoutData(new GridData(GridData.FILL_BOTH)); table.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleBinaryParserChanged(); updateButtons(); @@ -144,6 +148,7 @@ public class BinaryParsTab extends AbstractCPropertyTab { public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} }); tv.setLabelProvider(new LabelProvider() { + @Override public String getText(Object element) { String txt = (element != null) ? element.toString() : EMPTY_STR; if (element instanceof BinaryParserConfiguration) @@ -181,11 +186,13 @@ public class BinaryParsTab extends AbstractCPropertyTab { handleBinaryParserChanged(); } - public void setVisible(boolean _visible) { + @Override + public void setVisible(boolean _visible) { super.setVisible(_visible); page.enableConfigSelection(!_visible); } + @Override public void updateData(ICResourceDescription cfgd) { String[] ids = null; if (page.isForPrefs()) { // prefs @@ -270,6 +277,7 @@ public class BinaryParsTab extends AbstractCPropertyTab { return false; // invalid extension definition (must have at least cextension elements) } + @Override public void updateButtons() { int cnt = table.getItemCount(); int pos = table.getSelectionIndex(); @@ -316,6 +324,7 @@ public class BinaryParsTab extends AbstractCPropertyTab { return ((BinaryParserConfiguration)table.getItem(x).getData()).getID(); } + @Override protected void performApply(ICResourceDescription src, ICResourceDescription dst) { if (page.isMultiCfg()) { src = ((ICResourceDescription[])((ICMultiResourceDescription)src).getItems())[0]; @@ -328,6 +337,7 @@ public class BinaryParsTab extends AbstractCPropertyTab { } } + @Override protected void performDefaults() { if (page.isForProject()) CoreModelUtil.setBinaryParserIds(page.getCfgsEditable(), null); @@ -355,6 +365,7 @@ public class BinaryParsTab extends AbstractCPropertyTab { } } + @Override public void buttonPressed(int i) { switch (i) { case 0: @@ -402,6 +413,7 @@ public class BinaryParsTab extends AbstractCPropertyTab { } } // This page can be displayed for project only + @Override public boolean canBeVisible() { return page.isForProject() || page.isForPrefs(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java index 2230a6229ed..ccd0730af34 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java @@ -42,6 +42,7 @@ public class BuildVarListDialog extends ElementListSelectionDialog { public BuildVarListDialog(Shell parent, Object[] input) { super(parent, new LabelProvider () { + @Override public String getText(Object element) { if (element instanceof ICdtVariable) return ((ICdtVariable)element).getName(); @@ -53,6 +54,7 @@ public class BuildVarListDialog extends ElementListSelectionDialog { setElements(input); } + @Override protected Control createDialogArea(Composite container) { Composite c = (Composite) super.createDialogArea(container); @@ -76,7 +78,8 @@ public class BuildVarListDialog extends ElementListSelectionDialog { if (fFilteredList != null) { fFilteredList.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = LIST_DESCRIPTION; } } @@ -86,6 +89,7 @@ public class BuildVarListDialog extends ElementListSelectionDialog { return c; } + @Override protected void handleSelectionChanged() { super.handleSelectionChanged(); Object[] objects = getSelectedElements(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java index 5b94c9c3770..66a84d43c07 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java @@ -26,6 +26,7 @@ public class CDTUIListComparator extends CDTListComparator implements Comparator comparator = new CDTUIListComparator(); return comparator; } + @Override public int compare(Object a, Object b) { if (a == null || b == null) return 0; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java index e9a7ea99178..08fe70a8880 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java @@ -23,14 +23,17 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry; public class CLocationOutputTab extends CLocationTab { + @Override public void createControls(Composite parent) { super.createControls(parent); label.setText(UIMessages.getString("CLocationOutputTab.0")); //$NON-NLS-1$ } + @Override public ICExclusionPatternPathEntry[] getEntries(ICResourceDescription cfgd) { return cfgd.getConfiguration().getBuildSetting().getOutputDirectories(); } + @Override public void setEntries(ICResourceDescription cfgd, ICExclusionPatternPathEntry[] data) { ICOutputEntry[] out = null; if (data != null) { @@ -39,9 +42,11 @@ public class CLocationOutputTab extends CLocationTab { } cfgd.getConfiguration().getBuildSetting().setOutputDirectories(out); } + @Override public ICExclusionPatternPathEntry newEntry(IPath p, IPath[] ex, boolean isWorkspacePath) { return new COutputEntry(p, ex, isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0); } + @Override public ICExclusionPatternPathEntry newEntry(IFolder f, IPath[] ex, boolean isWorkspacePath) { return new COutputEntry(f, ex, isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java index 9120fb33460..60e16aaa6d9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java @@ -23,20 +23,25 @@ import org.eclipse.cdt.core.settings.model.ICSourceEntry; public class CLocationSourceTab extends CLocationTab { + @Override public void createControls(Composite parent) { super.createControls(parent); label.setText(UIMessages.getString("CLocationSourceTab.0")); //$NON-NLS-1$ } + @Override public ICExclusionPatternPathEntry newEntry(IPath p, IPath[] ex, boolean isWorkspacePath) { return new CSourceEntry(p, ex, isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0); } + @Override public ICExclusionPatternPathEntry newEntry(IFolder f, IPath[] ex, boolean isWorkspacePath) { return new CSourceEntry(f, ex, isWorkspacePath ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0); } + @Override public ICExclusionPatternPathEntry[] getEntries(ICResourceDescription cfgd) { return cfgd.getConfiguration().getSourceEntries(); } + @Override public void setEntries(ICResourceDescription cfgd, ICExclusionPatternPathEntry[] data) { ICSourceEntry[] out = null; if (data != null) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java index df95c271941..b7e76353421 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java @@ -82,6 +82,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { return s; } + @Override public String toString() { String[] s = getExts(); if (s.length == 0) @@ -101,6 +102,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { ent = _ent; f[0] = new _Filter(this); } + @Override public String toString() { return getPath() == null ? EMPTY_STR : @@ -114,6 +116,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { } } + @Override public void createControls(Composite parent) { super.createControls(parent); usercomp.setLayout(new GridLayout(1, false)); @@ -122,6 +125,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { tree = new TreeViewer(usercomp); tree.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); tree.getTree().addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateButtons(); }}); @@ -149,6 +153,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { }}); tree.setLabelProvider(new LabelProvider() { + @Override public Image getImage(Object element) { if (element instanceof _Entry) return IMG_EN; @@ -165,12 +170,14 @@ public abstract class CLocationTab extends AbstractCPropertyTab { * Edit: enabled if 1 element selected (entry or filter) * Delete: enabled if selected element is entry */ + @Override protected void updateButtons() { TreeItem[] sel = tree.getTree().getSelection(); buttonSetEnabled(2, sel.length == 1); buttonSetEnabled(3, sel.length > 0 && sel[0].getData() instanceof _Entry); } + @Override public void buttonPressed(int x) { Shell shell = usercomp.getShell(); TreeItem[] sel = tree.getTree().getSelection(); @@ -187,6 +194,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { // create / link case 1: NewFolderDialog d = new NewFolderDialog(shell, page.getProject()) { + @Override public void create() { super.create(); handleAdvancedButtonSelect(); @@ -239,6 +247,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { updateData(cfgd); } + @Override public void updateData(ICResourceDescription _cfgd) { if (page.isMultiCfg()) { usercomp.setVisible(false); @@ -265,10 +274,12 @@ public abstract class CLocationTab extends AbstractCPropertyTab { protected abstract ICExclusionPatternPathEntry newEntry(IPath p, IPath[] ex, boolean workspacePath); protected abstract ICExclusionPatternPathEntry newEntry(IFolder f, IPath[] ex, boolean workspacePath); + @Override protected void performApply(ICResourceDescription src, ICResourceDescription dst) { setEntries(dst, getEntries(src)); } + @Override protected void performDefaults() { setEntries(cfgd, null); updateData(cfgd); @@ -276,6 +287,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { // This page can be displayed for project only + @Override public boolean canBeVisible() { if (page.getResDesc() instanceof ICMultiItemsHolder) return false; // cannot work with multi cfg @@ -355,7 +367,8 @@ public abstract class CLocationTab extends AbstractCPropertyTab { super(parent, new WorkbenchLabelProvider() { - protected String decorateText(String input, Object element) { + @Override + protected String decorateText(String input, Object element) { if (element instanceof Holder && ((Holder)element).isRoot()) return UIMessages.getString("CLocationTab.8"); //$NON-NLS-1$ @@ -364,6 +377,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { }, new WorkbenchContentProvider() { + @Override public Object[] getChildren(Object element) { if (element instanceof IProject) { Object[] ob1 = super.getChildren(element); @@ -397,6 +411,7 @@ public abstract class CLocationTab extends AbstractCPropertyTab { }); addFilter(new ViewerFilter () { + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { if (! (element instanceof Holder)) return false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java index cb4bc28cca2..04dcf0b4dca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java @@ -52,6 +52,7 @@ public class ConfigMultiSelectionDialog extends Dialog { public ConfigMultiSelectionDialog(Shell parentShell) { super(parentShell); } + @Override protected void configureShell(Shell shell) { super.configureShell(shell); shell.setText(UIMessages.getString("ConfigMultiSelectionDialog.0")); //$NON-NLS-1$ @@ -60,6 +61,7 @@ public class ConfigMultiSelectionDialog extends Dialog { /** * Method is overridden to disable "OK" button at start */ + @Override protected Control createContents(Composite parent) { Control out = super.createContents(parent); b_ok = getButton(IDialogConstants.OK_ID); @@ -70,6 +72,7 @@ public class ConfigMultiSelectionDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, SWT.NULL); composite.setFont(parent.getFont()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java index f04c303bf50..830a1d1a8f6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java @@ -57,12 +57,14 @@ public class EnvDialog extends Dialog { /** * Method is overridden to disable "OK" button at start */ + @Override protected Control createContents(Composite parent) { Control out = super.createContents(parent); setButtons(); return out; } + @Override protected Control createDialogArea(Composite c) { c.setLayout(new GridLayout(3, false)); GridData gd; @@ -93,6 +95,7 @@ public class EnvDialog extends Dialog { final Button b = new Button(c, SWT.PUSH); b.setText(UIMessages.getString("EnvDialog.2")); //$NON-NLS-1$ b.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { String x = AbstractCPropertyTab.getVariableDialog(b.getShell(), cfgd); if (x != null) { @@ -111,6 +114,7 @@ public class EnvDialog extends Dialog { b_add2all.setVisible(false); else b_add2all.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { toAll = b_add2all.getSelection(); }}); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java index ec97c2c4616..8865da3804a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java @@ -90,9 +90,11 @@ public class EnvironmentTab extends AbstractCPropertyTab { private class EnvironmentLabelProvider extends LabelProvider implements ITableLabelProvider, IFontProvider , ITableFontProvider, IColorProvider{ public EnvironmentLabelProvider(boolean user){ } + @Override public Image getImage(Object element) { return null; // JavaPluginImages.get(JavaPluginImages.IMG_OBJS_REFACTORING_INFO); } + @Override public String getText(Object element) { return getColumnText(element, 0); } @@ -148,6 +150,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { } } + @Override public void createControls(Composite parent) { super.createControls(parent); usercomp.setLayout(new GridLayout(2, true)); @@ -203,6 +206,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { b1.setToolTipText(UIMessages.getString("EnvironmentTab.3")); //$NON-NLS-1$ b1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); b1.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (cfgd != null) ce.setAppendEnvironment(true, cfgd); @@ -215,6 +219,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { lb1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); lb1.setToolTipText(UIMessages.getString("EnvironmentTab.15")); //$NON-NLS-1$ lb1.addMouseListener(new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent e) { CDTPrefUtil.spinDMode(); updateData(); @@ -225,6 +230,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { b2.setToolTipText(UIMessages.getString("EnvironmentTab.4")); //$NON-NLS-1$ b2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); b2.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (cfgd != null) ce.setAppendEnvironment(false, cfgd); @@ -237,6 +243,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { lb2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); lb2.setToolTipText(UIMessages.getString("EnvironmentTab.23")); //$NON-NLS-1$ lb2.addMouseListener(new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent e) { CDTPrefUtil.spinWMode(); updateLbs(null, lb2); @@ -244,6 +251,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { initButtons(new String[] {UIMessages.getString("EnvironmentTab.5"),UIMessages.getString("EnvironmentTab.6"),UIMessages.getString("EnvironmentTab.7"),UIMessages.getString("EnvironmentTab.8"),UIMessages.getString("EnvironmentTab.9")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } + @Override public void buttonPressed(int i) { switch (i) { case 0: @@ -264,6 +272,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { } } + @Override public void updateButtons() { if (table == null || table.isDisposed()) return; @@ -273,6 +282,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { buttonSetEnabled(4, pos != -1); } + @Override public void updateData(ICResourceDescription _cfgd) { // null means preference configuration cfgd = (_cfgd != null) ? _cfgd.getConfiguration() : null; @@ -307,6 +317,7 @@ public class EnvironmentTab extends AbstractCPropertyTab { updateButtons(); } + @Override protected void performApply(ICResourceDescription _src, ICResourceDescription _dst) { ICConfigurationDescription src = _src.getConfiguration(); ICConfigurationDescription dst = _dst.getConfiguration(); @@ -330,7 +341,8 @@ public class EnvironmentTab extends AbstractCPropertyTab { public MyListSelectionDialog(Shell parentShell, Object input, IStructuredContentProvider contentProvider) { super(parentShell, input, contentProvider, new LabelProvider() {}, UIMessages.getString("EnvironmentTab.12")); //$NON-NLS-1$ } - protected Control createDialogArea(Composite parent) { + @Override + protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); Button b = new Button(composite, SWT.CHECK); b.setText(UIMessages.getString("EnvironmentTab.13")); //$NON-NLS-1$ @@ -339,7 +351,8 @@ public class EnvironmentTab extends AbstractCPropertyTab { b.setVisible(false); else b.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { + @Override + public void widgetSelected(SelectionEvent e) { toAll = ((Button)e.widget).getSelection(); }}); return composite; @@ -494,10 +507,12 @@ public class EnvironmentTab extends AbstractCPropertyTab { }; } // This page can be displayed for project only + @Override public boolean canBeVisible() { return page.isForProject() || page.isForPrefs(); } + @Override protected void performOK() { if (vars != null) { if (fUserSupplier.setWorkspaceEnvironment(vars)) @@ -508,11 +523,13 @@ public class EnvironmentTab extends AbstractCPropertyTab { super.performOK(); } + @Override protected void performCancel() { vars = null; super.performCancel(); } + @Override protected void performDefaults() { ce.restoreDefaults(cfgd); // both for proj & prefs vars = null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java index d7b8af81e17..5a1ec90b3a6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java @@ -41,11 +41,13 @@ public class ErrorParsTab extends AbstractCPropertyTab { private CheckboxTableViewer tv; private ICConfigurationDescription cfgd; + @Override public void createControls(Composite parent) { super.createControls(parent); usercomp.setLayout(new FillLayout()); table = new Table(usercomp, SWT.BORDER | SWT.CHECK | SWT.SINGLE); table.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateButtons(); }}); @@ -88,6 +90,7 @@ public class ErrorParsTab extends AbstractCPropertyTab { } } + @Override public void buttonPressed (int n) { switch (n) { case 0: // up @@ -136,9 +139,11 @@ public class ErrorParsTab extends AbstractCPropertyTab { key = _key; value = _value; } + @Override public String toString() { return value; } } + @Override public void updateData(ICResourceDescription _cfgd) { cfgd = _cfgd.getConfiguration(); if (mapParsers == null) return; @@ -175,6 +180,7 @@ public class ErrorParsTab extends AbstractCPropertyTab { updateButtons(); } + @Override public void updateButtons() { int cnt = table.getItemCount(); int pos = table.getSelectionIndex(); @@ -184,6 +190,7 @@ public class ErrorParsTab extends AbstractCPropertyTab { buttonSetEnabled(4, cnt > 0); } + @Override protected void performApply(ICResourceDescription src, ICResourceDescription dst) { ICConfigurationDescription sd = src.getConfiguration(); ICConfigurationDescription dd = dst.getConfiguration(); @@ -214,10 +221,12 @@ public class ErrorParsTab extends AbstractCPropertyTab { cfgd.getBuildSetting().setErrorParserIDs(s); } // This page can be displayed for project only + @Override public boolean canBeVisible() { return page.isForProject() || page.isForPrefs(); } + @Override protected void performDefaults() { if (cfgd instanceof ICMultiConfigDescription) ((ICMultiConfigDescription)cfgd).setErrorParserIDs(null); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java index 8e9d91cd202..903cfaf0414 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java @@ -56,11 +56,13 @@ public class ExPatternDialog extends StatusDialog { private static class ExPatternLabelProvider extends LabelProvider { + @Override public Image getImage(Object element) { ImageDescriptorRegistry registry= CUIPlugin.getImageDescriptorRegistry(); return registry.get(CPluginImages.DESC_OBJS_EXCLUSION_FILTER_ATTRIB); } + @Override public String getText(Object element) { return (String) element; } @@ -119,6 +121,7 @@ public class ExPatternDialog extends StatusDialog { } + @Override protected Control createDialogArea(Composite parent) { Composite composite= (Composite)super.createDialogArea(parent); @@ -222,6 +225,7 @@ public class ExPatternDialog extends StatusDialog { /* * @see org.eclipse.jface.window.Window#configureShell(Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); // WorkbenchHelp.setHelp(newShell, ICHelpContextIds.EXCLUSION_PATTERN_DIALOG); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java index 0fbe38f72e6..a036044a4da 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java @@ -92,6 +92,7 @@ public class ExPatternEntryDialog extends StatusDialog { } } + @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite) super.createDialogArea(parent); @@ -178,6 +179,7 @@ public class ExPatternEntryDialog extends StatusDialog { /* * @see org.eclipse.jface.window.Window#configureShell(Shell) */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); // WorkbenchHelp.setHelp(newShell, diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java index a153666dcb7..ed47f3d0dc2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java @@ -80,6 +80,7 @@ public class ExpDialog extends AbstractPropertyDialog { isWsp = _isWsp; } + @Override protected Control createDialogArea(Composite c) { GridData gd; if (c.getLayoutData() instanceof GridData) { @@ -146,6 +147,7 @@ public class ExpDialog extends AbstractPropertyDialog { c_wsp.setLayoutData(gd); c_wsp.setSelection(isWsp); c_wsp.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { c_wsp.setImage(AbstractExportTab.getWspImage(c_wsp.getSelection())); }}); @@ -177,6 +179,7 @@ public class ExpDialog extends AbstractPropertyDialog { c_langs.setText(TO_ALL); c_langs.setLayoutData(new GridData(GridData.BEGINNING)); c_langs.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { langs.setEnabled(!c_langs.getSelection()); }}); @@ -185,6 +188,7 @@ public class ExpDialog extends AbstractPropertyDialog { c_types.setText(TO_ALL); c_types.setLayoutData(new GridData(GridData.BEGINNING)); c_types.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { types.setEnabled(!c_types.getSelection()); }}); @@ -241,6 +245,7 @@ public class ExpDialog extends AbstractPropertyDialog { b_ok.setEnabled(enabled); } + @Override public void buttonPressed(SelectionEvent e) { String s; if (e.widget.equals(b_ok)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java index 910552e3fe8..5bbe917d6c7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java @@ -16,15 +16,19 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry; public class ExpIncludeTab extends AbstractExportTab { + @Override public ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp) { int flags = isWsp ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0; return new CIncludePathEntry(s2, flags); } + @Override public ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp) { return doAdd(s1, s2, isWsp); } + @Override public int getKind() { return ICSettingEntry.INCLUDE_PATH; } + @Override public boolean hasValues() { return false; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java index 54613af1a76..a4efe2c3094 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java @@ -24,15 +24,19 @@ public class ExpLibraryPathTab extends AbstractExportTab implements IPathEntrySt updateData(getResDesc()); } + @Override public ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp) { int flags = isWsp ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0; return new CLibraryPathEntry(s2, flags); } + @Override public ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp) { return doAdd(s1, s2, isWsp); } + @Override public int getKind() { return ICSettingEntry.LIBRARY_PATH; } + @Override public boolean hasValues() { return false; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java index 23c0070c1ef..3003d2ce382 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java @@ -24,16 +24,20 @@ public class ExpLibraryTab extends AbstractExportTab implements IPathEntryStoreL updateData(getResDesc()); } + @Override public ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp) { int flags = isWsp ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0; return new CLibraryFileEntry(s2, flags); } + @Override public ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp) { return doAdd(s1, s2, isWsp); } + @Override public int getKind() { return ICSettingEntry.LIBRARY_FILE; } + @Override public boolean hasValues() { return false; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java index 0b58843a6cc..a729d531721 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java @@ -17,14 +17,18 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry; public class ExpSymbolTab extends AbstractExportTab { // isWsp is ignored for symbols + @Override public ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp) { return new CMacroEntry(s1, s2, 0); } + @Override public ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp) { return doAdd(s1, s2, isWsp); } + @Override public int getKind() { return ICSettingEntry.MACRO; } + @Override public boolean hasValues() { return true; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java index 24427afe56f..f6d07f08dc2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java @@ -63,6 +63,7 @@ public class IncludeDialog extends AbstractPropertyDialog { isWsp = true; } + @Override protected Control createDialogArea(Composite c) { c.setLayout(new GridLayout(2, false)); GridData gd; @@ -119,6 +120,7 @@ public class IncludeDialog extends AbstractPropertyDialog { c_wsp.setLayoutData(gd); c_wsp.setSelection(isWsp); c_wsp.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { c_wsp.setImage(AbstractExportTab.getWspImage(c_wsp.getSelection())); }}); @@ -161,6 +163,7 @@ public class IncludeDialog extends AbstractPropertyDialog { b_ok.setEnabled(text.getText().trim().length() > 0); } + @Override public void buttonPressed(SelectionEvent e) { String s; if (e.widget.equals(b_ok)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java index c1d8252cc14..fe6fe1cd496 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java @@ -20,12 +20,14 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry; public class IncludeTab extends AbstractLangsListTab { - public void additionalTableSet() { + @Override +public void additionalTableSet() { columnToFit = new TableColumn(table, SWT.NONE); columnToFit.setText(UIMessages.getString("IncludeTab.0")); //$NON-NLS-1$ showBIButton.setSelection(true); } + @Override public ICLanguageSettingEntry doAdd() { IncludeDialog dlg = new IncludeDialog( usercomp.getShell(), IncludeDialog.NEW_DIR, @@ -43,6 +45,7 @@ public class IncludeTab extends AbstractLangsListTab { return null; } + @Override public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) { IncludeDialog dlg = new IncludeDialog( usercomp.getShell(), IncludeDialog.OLD_DIR, @@ -57,5 +60,6 @@ public class IncludeTab extends AbstractLangsListTab { return null; } + @Override public int getKind() { return ICSettingEntry.INCLUDE_PATH; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java index 4afeacdec5a..22c2f91f823 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java @@ -26,10 +26,12 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt IPathEntryStore fStore; private static final int[] PRIVATE_SASH_WEIGHTS = new int[] { 0, 30 }; + @Override public void additionalTableSet() { columnToFit = new TableColumn(table, SWT.NONE); } + @Override public void createControls(Composite parent) { super.createControls(parent); sashForm.setWeights(PRIVATE_SASH_WEIGHTS); @@ -40,6 +42,7 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt updateData(getResDesc()); } + @Override public ICLanguageSettingEntry doAdd() { IncludeDialog dlg = new IncludeDialog( usercomp.getShell(), IncludeDialog.NEW_DIR, @@ -55,6 +58,7 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt return null; } + @Override public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) { IncludeDialog dlg = new IncludeDialog( usercomp.getShell(), IncludeDialog.OLD_DIR, @@ -69,10 +73,12 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt return null; } + @Override public int getKind() { return ICSettingEntry.LIBRARY_PATH; } + @Override protected boolean isHeaderVisible() { return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java index fd8452ece62..eb177647b1f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java @@ -25,10 +25,12 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL IPathEntryStore fStore; private static final int[] PRIVATE_SASH_WEIGHTS = new int[] { 0, 30 }; + @Override public void additionalTableSet() { columnToFit = new TableColumn(table, SWT.NONE); } + @Override public void createControls(Composite parent) { super.createControls(parent); sashForm.setWeights(PRIVATE_SASH_WEIGHTS); @@ -39,6 +41,7 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL updateData(getResDesc()); } + @Override public ICLanguageSettingEntry doAdd() { IncludeDialog dlg = new IncludeDialog( usercomp.getShell(), IncludeDialog.NEW_FILE, @@ -54,6 +57,7 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL return null; } + @Override public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) { IncludeDialog dlg = new IncludeDialog( usercomp.getShell(), IncludeDialog.OLD_FILE, @@ -68,10 +72,12 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL return null; } + @Override public int getKind() { return ICSettingEntry.LIBRARY_FILE; } + @Override protected boolean isHeaderVisible() { return false; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java index e2dc186a7a0..f58cba6fc8e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java @@ -78,6 +78,7 @@ public class ManageConfigDialog extends Dialog { prj = _prj; } + @Override protected void configureShell(Shell shell) { super.configureShell(shell); if (title != null) shell.setText(title); @@ -86,6 +87,7 @@ public class ManageConfigDialog extends Dialog { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, SWT.NULL); composite.setFont(parent.getFont()); @@ -114,6 +116,7 @@ public class ManageConfigDialog extends Dialog { actBtn.setText(UIMessages.getString("ManageConfigDialog.4")); //$NON-NLS-1$ actBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); actBtn.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { TableItem[] tis = table.getSelection(); if (tis == null || tis.length != 1) return; @@ -127,6 +130,7 @@ public class ManageConfigDialog extends Dialog { newBtn.setText(UIMessages.getString(NEW)); newBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); newBtn.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleNewPressed(); }} ); @@ -135,6 +139,7 @@ public class ManageConfigDialog extends Dialog { delBtn.setText(UIMessages.getString(REMOVE)); delBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); delBtn.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleRemovePressed(); }} ); @@ -143,6 +148,7 @@ public class ManageConfigDialog extends Dialog { renBtn.setText(UIMessages.getString(RENAME)); renBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); renBtn.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { handleRenamePressed(); }} ); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java index 1caaae28aef..0e8fae3fc3e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java @@ -165,6 +165,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { * * @param numColumns the number of columns */ + @Override protected void adjustForNumColumns(int numColumns) { GridData gd = (GridData) textField.getLayoutData(); gd.horizontalSpan = numColumns - 1; @@ -226,6 +227,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { * but must call super.doFillIntoGrid. *

*/ + @Override protected void doFillIntoGrid(Composite parent, int numColumns) { title = new Label(parent, SWT.UP); @@ -250,6 +252,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { * the field editor. *

*/ + @Override protected void doLoad() { if (textField != null) { String value = getPreferenceStore().getString(getPreferenceName()); @@ -266,6 +269,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { * the field editor. *

*/ + @Override protected void doLoadDefault() { if (textField != null) { String value = @@ -278,6 +282,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { /* (non-Javadoc) * @see org.eclipse.jface.preference.FieldEditor#doStore() */ + @Override protected void doStore() { getPreferenceStore().setValue(getPreferenceName(), textField.getText()); } @@ -296,6 +301,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { * * @return the number of controls */ + @Override public int getNumberOfControls() { return 2; } @@ -339,15 +345,18 @@ public class MultiLineTextFieldEditor extends FieldEditor { switch (validateStrategy) { case VALIDATE_ON_KEY_STROKE : textField.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { valueChanged(); } }); textField.addFocusListener(new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { refreshValidState(); } + @Override public void focusLost(FocusEvent e) { clearErrorMessage(); } @@ -355,14 +364,17 @@ public class MultiLineTextFieldEditor extends FieldEditor { break; case VALIDATE_ON_FOCUS_LOST : textField.addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { clearErrorMessage(); } }); textField.addFocusListener(new FocusAdapter() { + @Override public void focusGained(FocusEvent e) { refreshValidState(); } + @Override public void focusLost(FocusEvent e) { valueChanged(); clearErrorMessage(); @@ -409,6 +421,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { * and false if invalid * @see #refreshValidState */ + @Override public boolean isValid() { return isValid; } @@ -423,6 +436,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { * both this method and isValid. *

*/ + @Override protected void refreshValidState() { isValid = checkState(); } @@ -454,6 +468,7 @@ public class MultiLineTextFieldEditor extends FieldEditor { * does nothing. Subclasses may reimplement. *

*/ + @Override public void setFocus() { if (textField != null) { textField.setFocus(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java index c0187b36c80..aca228b7e8b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java @@ -85,6 +85,7 @@ public class NewConfigurationDialog extends Dialog 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) { String description = new String(); @@ -120,6 +121,7 @@ public class NewConfigurationDialog extends Dialog 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) @@ -129,6 +131,7 @@ public class NewConfigurationDialog extends Dialog 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(); @@ -138,6 +141,7 @@ public class NewConfigurationDialog extends Dialog implements INewCfgDialog { validateState(); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, SWT.NULL); composite.setFont(parent.getFont()); @@ -223,6 +227,7 @@ public class NewConfigurationDialog extends Dialog 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) { validateState(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PageLayout.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PageLayout.java index c3ec36343e9..f9e2413a59c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PageLayout.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PageLayout.java @@ -31,6 +31,7 @@ public class PageLayout extends Layout { */ private Point minimumPageSize = new Point(200, 200); + @Override public void layout(Composite composite, boolean force) { Rectangle rect = composite.getClientArea(); Control[] children = composite.getChildren(); @@ -38,6 +39,7 @@ public class PageLayout extends Layout { children[i].setSize(rect.width, rect.height); } } + @Override public Point computeSize(Composite composite, int wHint, int hHint, boolean force) { if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) { return new Point(wHint, hHint); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java index 4aeecaf5b81..8a0b21514a9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java @@ -28,6 +28,7 @@ public class Page_head_general extends PropertyPage implements ICOptionContainer private DocCommentOwnerBlock fDocBlock; private boolean isProjectLevel; + @Override protected Control createContents(Composite parent) { isProjectLevel= getProject() != null; if(isProjectLevel) { @@ -39,6 +40,7 @@ public class Page_head_general extends PropertyPage implements ICOptionContainer return parent; } + @Override protected void performDefaults() { if(isProjectLevel) { fDocBlock.performDefaults(); @@ -46,6 +48,7 @@ public class Page_head_general extends PropertyPage implements ICOptionContainer super.performDefaults(); } + @Override public boolean performOk() { if(isProjectLevel) { try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java index fc725d81274..959799762e0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java @@ -37,6 +37,8 @@ public class PrefPage_Abstract extends AbstractPrefPage { } } + @Override protected String getHeader() { return null; } + @Override protected boolean isSingle() { return true; } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java index c4f64f520ea..ae64db24a28 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java @@ -92,6 +92,7 @@ public class ProjectContentsArea { createUserEntryArea(projectGroup, defaultEnabled); useDefaultsButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean useDefaults = useDefaultsButton.getSelection(); @@ -140,6 +141,7 @@ public class ProjectContentsArea { browseButton = new Button(composite, SWT.PUSH); browseButton.setText(BROWSE_LABEL); browseButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { handleLocationBrowseButtonPressed(); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java index 965bb235e1a..9a7cef8b506 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java @@ -38,6 +38,7 @@ public class RefsTab extends AbstractCPropertyTab { static private final String ACTIVE = "[" + UIMessages.getString("RefsTab.3") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + @Override public void createControls(Composite parent) { super.createControls(parent); initButtons(new String[] {UIMessages.getString("RefsTab.0"), UIMessages.getString("RefsTab.2")}, 120); //$NON-NLS-1$ //$NON-NLS-2$ @@ -47,7 +48,8 @@ public class RefsTab extends AbstractCPropertyTab { tree.setLayoutData(new GridData(GridData.FILL_BOTH)); tree.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = UIMessages.getString("RefsTab.4"); //$NON-NLS-1$ } } @@ -55,6 +57,7 @@ public class RefsTab extends AbstractCPropertyTab { initData(); tree.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if ((e.detail & SWT.CHECK) == SWT.CHECK && e.item != null && (e.item instanceof TreeItem)) { TreeItem sel = (TreeItem)e.item; @@ -110,16 +113,19 @@ public class RefsTab extends AbstractCPropertyTab { public ActiveCfg(IProject _project) { project = _project; } + @Override public String toString() { return ACTIVE; } } - public void buttonPressed(int n) { + @Override + public void buttonPressed(int n) { for (TreeItem item : tree.getItems()) item.setExpanded(n==0); } + @Override protected void updateData(ICResourceDescription cfgd) { if (page.isMultiCfg()) { setAllVisible(false, null); @@ -198,20 +204,24 @@ public class RefsTab extends AbstractCPropertyTab { updateButtons(); } + @Override protected void performApply(ICResourceDescription src, ICResourceDescription dst) { dst.getConfiguration().setReferenceInfo(src.getConfiguration().getReferenceInfo()); } // This page can be displayed for project only + @Override public boolean canBeVisible() { return page.isForProject() && ! page.isMultiCfg(); } + @Override protected void performDefaults() { getResDesc().getConfiguration().setReferenceInfo(new HashMap()); initData(); } + @Override protected void updateButtons() { updateButtons(null, false, false); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java index 805cc325963..4c773b0e849 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java @@ -76,6 +76,7 @@ public class RenameConfigurationDialog 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) { newName = configName.getText().trim(); @@ -87,6 +88,7 @@ public class RenameConfigurationDialog 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) shell.setText(title); @@ -95,6 +97,7 @@ public class RenameConfigurationDialog 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(); @@ -104,6 +107,7 @@ public class RenameConfigurationDialog extends Dialog { validateState(); } + @Override protected Control createDialogArea(Composite parent) { Composite composite = new Composite(parent, SWT.NULL); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java index 3f394125c09..1e2dee42555 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java @@ -85,6 +85,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { protected LevelDialog() { super(CUIPlugin.getActiveWorkbenchShell()); } + @Override protected Control createDialogArea(Composite parent) { Composite c = new Composite(parent, 0); c.setLayoutData(new GridData(GridData.FILL_BOTH)); @@ -97,6 +98,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { sp.setMinimum(0); sp.setSelection(currentLevel); sp.addSelectionListener(new SelectionAdapter () { + @Override public void widgetSelected(SelectionEvent e) { currentLevel = ((Spinner)e.widget).getSelection(); } @@ -160,6 +162,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { return ti; } + @Override public void createControls(Composite parent) { super.createControls(parent); usercomp.setLayout(new GridLayout(5, false)); @@ -178,6 +181,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { } else combo.select(1); // ConfigurationDescription combo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { updateData(cfg); }}); @@ -188,6 +192,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { b1.setLayoutData(gd); b1.setText(UIMessages.getString("StructureTreeTab.5")); //$NON-NLS-1$ b1.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { tree.setRedraw(false); expandAll(tree.getItem(0), true, -1); @@ -200,6 +205,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { b2.setLayoutData(gd); b2.setText(UIMessages.getString("StructureTreeTab.6")); //$NON-NLS-1$ b2.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { LevelDialog ld = new LevelDialog(); if (ld.open() == Window.OK) { @@ -215,6 +221,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { b3.setLayoutData(gd); b3.setText(UIMessages.getString("StructureTreeTab.7")); //$NON-NLS-1$ b3.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { tree.setRedraw(false); expandAll(tree.getItem(0), false, -1); @@ -307,8 +314,10 @@ public class StructureTreeTab extends AbstractCPropertyTab { return x; } + @Override protected void performApply(ICResourceDescription src,ICResourceDescription dst) {} + @Override protected void performDefaults() {} private void update(ICProjectDescription prj) { @@ -748,6 +757,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { return ti; } + @Override public void updateData(ICResourceDescription rcfg) { cfg = rcfg; tree.getDisplay().asyncExec(new Runnable() { @@ -778,9 +788,11 @@ public class StructureTreeTab extends AbstractCPropertyTab { } // This page can be displayed if it's permitted in prefs + @Override public boolean canBeVisible() { return CDTPrefUtil.getBool(CDTPrefUtil.KEY_DTREE); } + @Override protected void updateButtons() {} // Do nothing. No buttons to update. } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java index 9f05cbe15df..03ecfb68199 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java @@ -50,6 +50,7 @@ public class SymbolDialog extends AbstractPropertyDialog { cfgd = _cfgd; } + @Override protected Control createDialogArea(Composite c) { c.setLayout(new GridLayout(4, true)); GridData gd; @@ -125,6 +126,7 @@ public class SymbolDialog extends AbstractPropertyDialog { b_ok.setEnabled(txt1.getText().trim().length() > 0); } + @Override public void buttonPressed(SelectionEvent e) { if (e.widget.equals(b_ok)) { super.text1 = txt1.getText(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java index ce762559979..9d5cf511cca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java @@ -24,7 +24,8 @@ import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; import org.eclipse.cdt.core.settings.model.ICSettingEntry; public class SymbolTab extends AbstractLangsListTab { - public void additionalTableSet() { + @Override + public void additionalTableSet() { TableColumn tc = new TableColumn(table, SWT.LEFT); tc.setText(UIMessages.getString("SymbolTab.0")); //$NON-NLS-1$ tc.setWidth(80); @@ -33,13 +34,15 @@ public class SymbolTab extends AbstractLangsListTab { tc.setWidth(130); table.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = UIMessages.getString("SymbolTab.0"); //$NON-NLS-1$ } } ); } + @Override public ICLanguageSettingEntry doAdd() { SymbolDialog dlg = new SymbolDialog( usercomp.getShell(), true, @@ -48,10 +51,11 @@ public class SymbolTab extends AbstractLangsListTab { toAllCfgs = dlg.check1; toAllLang = dlg.check3; return new CMacroEntry(dlg.text1, dlg.text2, 0); - } else - return null; + } + return null; } + @Override public ICLanguageSettingEntry doEdit(ICLanguageSettingEntry ent) { SymbolDialog dlg = new SymbolDialog( usercomp.getShell(), false, @@ -59,15 +63,16 @@ public class SymbolTab extends AbstractLangsListTab { ent.getValue(), getResDesc()); if (dlg.open()) return new CMacroEntry(dlg.text1, dlg.text2, 0); - else - return null; + return null; } + @Override public int getKind() { return ICSettingEntry.MACRO; } // Specific version of "update()" for Symbols tab only + @Override public void update() { if (lang != null) { int x = table.getSelectionIndex(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/TypedCDTViewerFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/TypedCDTViewerFilter.java index 438ed766c25..cc24ba78ca7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/TypedCDTViewerFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/TypedCDTViewerFilter.java @@ -24,6 +24,7 @@ public class TypedCDTViewerFilter extends ViewerFilter { /** * @see ViewerFilter#select */ + @Override public boolean select(Viewer viewer, Object parent, Object element) { for (int i= 0; i < types.length; i++) { if (types[i].isInstance(element)) return true; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ContentAssistInvocationContext.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ContentAssistInvocationContext.java index d8efac84bc9..2546f930b61 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ContentAssistInvocationContext.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ContentAssistInvocationContext.java @@ -185,6 +185,7 @@ public class ContentAssistInvocationContext { * @param obj {@inheritDoc} * @return {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == null) return false; @@ -197,6 +198,7 @@ public class ContentAssistInvocationContext { /* * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return 23459213 << 5 | (fViewer == null ? 0 : fViewer.hashCode() << 3) | fOffset; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java index f07d5e68894..5ac07cfaa08 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java @@ -25,6 +25,7 @@ import org.eclipse.cdt.core.model.IWorkingCopy; * completionProprosalComputer and implement interface * {@link ICompletionProposalComputer} */ +@Deprecated public interface ICompletionContributor { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java index b88b09015d0..b95d8a9a76a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java @@ -198,6 +198,7 @@ public class DefaultMultilineCommentAutoEditStrategy implements IAutoEditStrateg */ IASTDeclaration stopWhenLeaving; + @Override public int visit(IASTDeclaration declaration) { IASTNodeLocation loc= declaration.getFileLocation(); if(loc != null) { @@ -216,6 +217,7 @@ public class DefaultMultilineCommentAutoEditStrategy implements IAutoEditStrateg } return PROCESS_CONTINUE; } + @Override public int leave(IASTDeclaration declaration) { if(declaration==stopWhenLeaving) return PROCESS_ABORT; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java index 6e4639ab0cb..1805f27e0b3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java @@ -119,6 +119,7 @@ public class DoxygenMultilineAutoEditStrategy extends DefaultMultilineCommentAut /* * @see org.eclipse.cdt.ui.text.doctools.DefaultMultilineCommentAutoEditStrategy#customizeAfterNewLineForDeclaration(org.eclipse.jface.text.IDocument, org.eclipse.cdt.core.dom.ast.IASTDeclaration, org.eclipse.jface.text.ITypedRegion) */ + @Override protected StringBuilder customizeAfterNewLineForDeclaration(IDocument doc, IASTDeclaration dec, ITypedRegion partition) { while(dec instanceof ICPPASTTemplateDeclaration) /* if? */ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java index 76ea53c9db1..ae844f528e7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java @@ -67,6 +67,7 @@ public class GenericTagCommentScanner extends BufferedRuleBasedScanner implement /* * @see org.eclipse.jface.text.rules.RuleBasedScanner#nextToken() */ + @Override public IToken nextToken() { fTokenStore.ensureTokensInitialised(); return super.nextToken(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java index 2b79523951c..ad0c31a07c5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java @@ -162,6 +162,7 @@ public class GenericTagDoubleClickStrategy implements ITextDoubleClickStrategy { /* * @see CharacterIterator#clone() */ + @Override public Object clone() { DocumentCharacterIterator i= new DocumentCharacterIterator(); i.fDocument= fDocument; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java index 004d979ed02..644cf57fad5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java @@ -24,10 +24,12 @@ public class CCProjectWizard extends CDTCommonProjectWizard { super(UIMessages.getString("NewModelProjectWizard.2"), UIMessages.getString("NewModelProjectWizard.3")); //$NON-NLS-1$ //$NON-NLS-2$ } + @Override public String[] getNatures() { return new String[] { CProjectNature.C_NATURE_ID, CCProjectNature.CC_NATURE_ID }; } + @Override protected IProject continueCreation(IProject prj) { try { CProjectNature.addCNature(prj, new NullProgressMonitor()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java index 63c6d291ef3..9f9d14062d5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java @@ -82,6 +82,7 @@ implements IExecutableExtension, IWizardWithMemory wz_desc = desc; } + @Override public void addPages() { fMainPage= new CDTMainWizardPage(CUIPlugin.getResourceString(PREFIX)); fMainPage.setTitle(wz_title); @@ -180,6 +181,7 @@ implements IExecutableExtension, IWizardWithMemory return true; } + @Override public boolean performFinish() { boolean needsPost = (newProject != null && !isChanged()); // create project if it is not created yet @@ -210,7 +212,8 @@ implements IExecutableExtension, IWizardWithMemory return false; } - public boolean performCancel() { + @Override + public boolean performCancel() { clearProject(); return true; } @@ -275,11 +278,13 @@ implements IExecutableExtension, IWizardWithMemory protected abstract IProject continueCreation(IProject prj); public abstract String[] getNatures(); + @Override public void dispose() { fMainPage.dispose(); } - public boolean canFinish() { + @Override + public boolean canFinish() { if (fMainPage.h_selected != null) { if(!fMainPage.h_selected.canFinich()) return false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java index 79b87faf80f..586db2ce846 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java @@ -83,7 +83,8 @@ import org.eclipse.cdt.internal.ui.CPluginImages; /** (non-Javadoc) * Method declared on IDialogPage. */ - public void createControl(Composite parent) { + @Override + public void createControl(Composite parent) { super.createControl(parent); createDynamicGroup((Composite)getControl()); @@ -112,6 +113,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; 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; @@ -120,7 +122,8 @@ import org.eclipse.cdt.internal.ui.CPluginImages; }}); tree.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = UIMessages.getString("CMainWizardPage.0"); //$NON-NLS-1$ } } @@ -135,6 +138,7 @@ import org.eclipse.cdt.internal.ui.CPluginImages; 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()); @@ -146,7 +150,8 @@ import org.eclipse.cdt.internal.ui.CPluginImages; show_sup.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOSUPP)); } - public IWizardPage getNextPage() { + @Override + public IWizardPage getNextPage() { return (h_selected == null) ? null : h_selected.getSpecificPage(); } @@ -161,7 +166,8 @@ import org.eclipse.cdt.internal.ui.CPluginImages; * @return true if all controls are valid, and * false if at least one is invalid */ - protected boolean validatePage() { + @Override + protected boolean validatePage() { setMessage(null); if (!super.validatePage()) return false; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java index d46b0bd87d8..e80de499e2e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java @@ -20,10 +20,12 @@ public class CDTProjectWizard extends CDTCommonProjectWizard { super(UIMessages.getString("NewModelProjectWizard.0"), UIMessages.getString("NewModelProjectWizard.1")); //$NON-NLS-1$ //$NON-NLS-2$ } + @Override public String[] getNatures() { return new String[0]; } + @Override protected IProject continueCreation(IProject prj) { return prj; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java index d2f116fb738..c2b2b4a2dd5 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java @@ -24,10 +24,12 @@ public class CProjectWizard extends CDTCommonProjectWizard { UIMessages.getString("NewModelProjectWizard.5")); //$NON-NLS-1$ } + @Override public String[] getNatures() { return new String[] { CProjectNature.C_NATURE_ID }; } + @Override protected IProject continueCreation(IProject prj) { try { CProjectNature.addCNature(prj, new NullProgressMonitor()); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java index 2549fe7df6f..9d3755a43c6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java @@ -199,6 +199,7 @@ public class CWizardHandler implements Cloneable { public boolean canFinich() {return true;} + @Override public Object clone() { try { CWizardHandler clone = (CWizardHandler)super.clone(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java index 525180dd014..89a0eda2d72 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java @@ -31,6 +31,7 @@ import org.eclipse.jface.wizard.IWizardPage; * @deprecated - use IPathEntryContainerPage */ +@Deprecated public interface ICPathContainerPage extends IWizardPage { /** diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCCProjectWizard.java index bb638a14281..b41e6586c33 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCCProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCCProjectWizard.java @@ -33,6 +33,7 @@ public abstract class NewCCProjectWizard extends NewCProjectWizard { } + @Override protected void doRun(IProgressMonitor monitor) throws CoreException { super.doRun(monitor); // Add C++ Nature to the newly created project. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java index d549dab9dc2..015265ba8fa 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java @@ -98,6 +98,7 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#addPages() */ + @Override public void addPages() { fMainPage= new NewCProjectWizardPage(CUIPlugin.getResourceString(PREFIX)); fMainPage.setTitle(wz_title); @@ -160,6 +161,7 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#performFinish() */ + @Override public boolean performFinish() { if (!invokeRunnable(getRunnable())) { return false; @@ -198,6 +200,7 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement /* * Reimplemented method from superclass */ + @Override protected void initializeDefaultPageImageDescriptor() { setDefaultPageImageDescriptor(CPluginImages.DESC_WIZABAN_NEW_PROJ); } @@ -205,6 +208,7 @@ public abstract class NewCProjectWizard extends BasicNewResourceWizard implement /* (non-Javadoc) * Method declared on IWorkbenchWizard. */ + @Override public void init(IWorkbench workbench, IStructuredSelection currentSelection) { super.init(workbench, currentSelection); setWindowTitle(CUIPlugin.getResourceString(WINDOW_TITLE)); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java index 2aafb9a0020..2a9283aa52b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java @@ -40,6 +40,7 @@ public abstract class NewCProjectWizardOptionPage extends WizardPage implements setControl(fOptionBlock.createContents(parent)); } + @Override public void setVisible(boolean visible) { super.setVisible(visible); fOptionBlock.setVisible(visible); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardPage.java index 54ade33597c..3e2d0d9284c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardPage.java @@ -64,6 +64,7 @@ public class NewCProjectWizardPage extends WizardNewProjectCreationPage { * @return true if all controls are valid, and * false if at least one is invalid */ + @Override protected boolean validatePage() { if (super.validatePage() == true) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java index b7afc91fc7c..cf91c52014f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java @@ -882,7 +882,8 @@ public class NewClassCreationWizardPage extends NewElementWizardPage { /* * @see WizardPage#becomesVisible */ - public void setVisible(boolean visible) { + @Override + public void setVisible(boolean visible) { super.setVisible(visible); if (visible) { setFocus(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewHeaderFileCreationWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewHeaderFileCreationWizard.java index f459fd9d05e..1e6bf821031 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewHeaderFileCreationWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewHeaderFileCreationWizard.java @@ -28,7 +28,8 @@ public class NewHeaderFileCreationWizard extends AbstractFileCreationWizard { /* * @see Wizard#createPages */ - public void addPages() { + @Override + public void addPages() { super.addPages(); fPage = new NewHeaderFileCreationWizardPage(); addPage(fPage); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFileCreationWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFileCreationWizard.java index 2ece37225f0..6190e62bf8d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFileCreationWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFileCreationWizard.java @@ -28,7 +28,8 @@ public class NewSourceFileCreationWizard extends AbstractFileCreationWizard { /* * @see Wizard#createPages */ - public void addPages() { + @Override + public void addPages() { super.addPages(); fPage = new NewSourceFileCreationWizardPage(); addPage(fPage); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java index 4907eb81cc0..3e66c82a52a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java @@ -32,6 +32,7 @@ public class NewSourceFolderCreationWizard extends NewElementWizard { /* * @see Wizard#addPages */ + @Override public void addPages() { super.addPages(); fPage= new NewSourceFolderWizardPage(); @@ -42,6 +43,7 @@ public class NewSourceFolderCreationWizard extends NewElementWizard { /* (non-Javadoc) * @see org.eclipse.jdt.internal.ui.wizards.NewElementWizard#finishPage(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected void finishPage(IProgressMonitor monitor) throws InterruptedException, CoreException { fPage.createSourceRoot(monitor); // use the full progress monitor } @@ -49,6 +51,7 @@ public class NewSourceFolderCreationWizard extends NewElementWizard { /* (non-Javadoc) * @see org.eclipse.jface.wizard.IWizard#performFinish() */ + @Override public boolean performFinish() { boolean res= super.performFinish(); if (res) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java index 59191f7299d..fa47510f942 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java @@ -62,7 +62,8 @@ public abstract class ConversionWizard /* (non-Javadoc) * Method declared on IWorkbenchWizard. */ - public void init(IWorkbench workbench, IStructuredSelection currentSelection) { + @Override + public void init(IWorkbench workbench, IStructuredSelection currentSelection) { super.init(workbench, currentSelection); setWindowTitle(getWindowTitleResource()); } @@ -114,7 +115,8 @@ public abstract class ConversionWizard * Method doRun calls the doRunPrologue and mainPage's doRun method and the * doRunEpliogue. Subclasses may overwrite to add further actions */ - protected void doRun(IProgressMonitor monitor) throws CoreException { + @Override + protected void doRun(IProgressMonitor monitor) throws CoreException { try{ mainPage.doRun(monitor, getProjectID(), getBuildSystemId()); } catch (CoreException ce){ @@ -129,7 +131,8 @@ public abstract class ConversionWizard * Return the type of project that it is being converted to * The default if a make project */ - public abstract String getProjectID(); + @Override + public abstract String getProjectID(); /** * Method addPages allows subclasses to add as many pages as they need. Overwrite @@ -143,19 +146,22 @@ public abstract class ConversionWizard * * @see NewCProjectWizard#addPages */ - public abstract void addPages(); + @Override + public abstract void addPages(); /** * Required by superclass but with no implementation here * * @param monitor */ - protected void doRunPrologue(IProgressMonitor monitor) {} + @Override + protected void doRunPrologue(IProgressMonitor monitor) {} /** * Required by superclass but with no implementation here * * @param monitor */ - protected void doRunEpilogue(IProgressMonitor monitor) {} + @Override + protected void doRunEpilogue(IProgressMonitor monitor) {} } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java index ba68d7dee53..66364c32828 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java @@ -155,6 +155,7 @@ public abstract class ConvertProjectWizardPage SelectionListener cListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { convertToC = cRadioButton.getSelection(); convertToCC = ccRadioButton.getSelection(); @@ -212,7 +213,8 @@ public abstract class ConvertProjectWizardPage table.setLinesVisible(false); table.getAccessible().addAccessibleListener( new AccessibleAdapter() { - public void getName(AccessibleEvent e) { + @Override + public void getName(AccessibleEvent e) { e.result = CUIPlugin.getResourceString(PROJECT_LIST); } } @@ -232,7 +234,8 @@ public abstract class ConvertProjectWizardPage // define and assign sorter tableViewer.setSorter(new ViewerSorter() { - public int compare(Viewer viewer, Object object1, Object object2) { + @Override + public int compare(Viewer viewer, Object object1, Object object2) { if ((object1 instanceof IProject) && (object2 instanceof IProject)) { IProject left = (IProject)object1; @@ -247,7 +250,8 @@ public abstract class ConvertProjectWizardPage return super.compare(viewer, object1, object2); } - public boolean isSorterProperty(Object element, String property) { + @Override + public boolean isSorterProperty(Object element, String property) { return true; } }); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java index d312b4c6c0c..bbf1985d8c4 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java @@ -29,6 +29,7 @@ public class TemplateCNewWizard extends CNewWizard { /** * Creates and returns an array of items to be displayed */ + @Override public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) { Template[] templates = TemplateEngineUI.getDefault().getTemplates(); ArrayList items = new ArrayList(); @@ -46,6 +47,7 @@ public class TemplateCNewWizard extends CNewWizard { return items.toArray(new EntryDescriptor[items.size()]); } + @Override public void setDependentControl(Composite parent, IWizardItemsListListener page) { //nothing to do? diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/AbstractWizardDataPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/AbstractWizardDataPage.java index 92eda249378..d13b45a195d 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/AbstractWizardDataPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/AbstractWizardDataPage.java @@ -56,6 +56,7 @@ public abstract class AbstractWizardDataPage extends WizardPage implements IWiza * (non-Javadoc) * @see org.eclipse.jface.wizard.WizardPage#getNextPage() */ + @Override public IWizardPage getNextPage() { if(next != null) { return next; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java index e470b9e10f7..4654e69f3c7 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java @@ -260,6 +260,7 @@ public class ProjectSelectionPage extends WizardPage implements IWizardDataPage }); } + @Override public void setVisible(boolean visible) { super.setVisible(visible); } @@ -342,6 +343,7 @@ public class ProjectSelectionPage extends WizardPage implements IWizardDataPage * (non-Javadoc) * @see org.eclipse.jface.wizard.WizardPage#getNextPage() */ + @Override public IWizardPage getNextPage() { if(next != null) { return next; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/SimpleElementException.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/SimpleElementException.java index b13940adbb0..cd8c1750dbc 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/SimpleElementException.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/SimpleElementException.java @@ -55,6 +55,7 @@ public class SimpleElementException extends Exception { * * @return String */ + @Override public String toString() { return expDefinition; } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java index 35c30fa5a25..d1f8f9b9a52 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java @@ -180,11 +180,13 @@ public class Template extends TemplateCore { * resources to each process (Ref. ProcessResourceManager). * @param monitor */ + @Override public IStatus[] executeTemplateProcesses(IProgressMonitor monitor, final boolean showError) { setDirty(); TemplateEngine.getDefault().updateSharedDefaults(this); final IStatus[][] result = new IStatus[1][]; WorkspaceModifyOperation wmo = new WorkspaceModifyOperation() { + @Override protected void execute(IProgressMonitor monitor) throws org.eclipse.core.runtime.CoreException ,java.lang.reflect.InvocationTargetException ,InterruptedException { try { result[0] = getProcessHandler().processAll(monitor); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java index cf2c06dedf8..7f2ce96647c 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java @@ -42,21 +42,25 @@ public class TemplateClassWizard extends TemplatesChoiceWizard implements INewWi //setDefaultPageImageDescriptor(TemplateEnginePlugin.imageDescriptorFromPlugin(TemplateEnginePlugin.getDefault().getWizardIconPluginID(), TemplateEnginePlugin.getDefault().getWizardIconFile())); } + @Override public String getListSelectionTitle() { return Messages.getString("TemplateClassWizard.1"); //$NON-NLS-1$ } + @Override public String getListSelectionDescription() { return Messages.getString("TemplateClassWizard.2"); //$NON-NLS-1$ } + @Override public String getListSelectionLabel() { return Messages.getString("TemplateClassWizard.3"); //$NON-NLS-1$ } + @Override protected IWizardDataPage[] getPagesBeforeTemplatePages() { if (pagesBeforeTemplatePages == null) { projectSelectionPage = new ProjectSelectionPage(); @@ -68,6 +72,7 @@ public class TemplateClassWizard extends TemplatesChoiceWizard implements INewWi return pagesBeforeTemplatePages; } + @Override protected IWizardDataPage[] getPagesAfterTemplatePages() { if (pagesAfterTemplatePages == null) { pagesAfterTemplatePages = new IWizardDataPage[] {}; @@ -85,12 +90,14 @@ public class TemplateClassWizard extends TemplatesChoiceWizard implements INewWi configElement = config; } + @Override public boolean performFinish() { boolean retVal = super.performFinish(); BasicNewProjectResourceWizard.updatePerspective(configElement); return retVal; } + @Override protected IWizardDataPage[] getPagesAfterTemplateSelection() { if (pagesAfterTemplateSelection == null) { pagesAfterTemplateSelection = new IWizardDataPage[] {}; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java index 03d95736e55..37a874a1222 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java @@ -47,10 +47,12 @@ public abstract class TemplateDrivenWizard extends Wizard { protected Composite pageContainer; protected List templatePagesOrderVector; + @Override public final void addPage(IWizardPage page) { page.setWizard(this); } + @Override public final void addPages() { IWizardPage[] pages = getPagesBeforeTemplatePages(); for(int i=0; i pagesBeforeTemplatePages.size() + templatePagesOrderVector.size()) {//current is some page after template pages other than the first post-template page pageIndex--; @@ -96,6 +99,7 @@ public abstract class TemplateDrivenWizard extends Wizard { return null; } + @Override public IWizardPage getNextPage(IWizardPage page) { if (pageIndex < pagesBeforeTemplatePages.size() - 1) {//current is a page before template pages that is not the final one pageIndex++; @@ -124,6 +128,7 @@ public abstract class TemplateDrivenWizard extends Wizard { return null; } + @Override public final boolean canFinish() { for(Iterator i = pagesBeforeTemplatePages.iterator(); i.hasNext(); ) { IWizardPage page = (IWizardPage) i.next(); @@ -149,6 +154,7 @@ public abstract class TemplateDrivenWizard extends Wizard { return true; } + @Override public boolean performFinish() { IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { @@ -178,6 +184,7 @@ public abstract class TemplateDrivenWizard extends Wizard { } } + @Override public final void createPageControls(Composite pageContainer) { super.createPageControls(pageContainer); this.pageContainer = pageContainer; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateListSelectionPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateListSelectionPage.java index 969eb59c2fb..3963fd285e9 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateListSelectionPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateListSelectionPage.java @@ -195,11 +195,13 @@ class TemplateListSelectionPage extends WizardSelectionPage implements ISelectio return wizard.getStartingPage(); } + @Override public boolean canFlipToNextPage() { IStructuredSelection ssel = (IStructuredSelection)wizardSelectionViewer.getSelection(); return ssel != null && !ssel.isEmpty() && (ssel.getFirstElement() instanceof Template); } + @Override public void setVisible(boolean visible) { if (visible) { Template[] templates = parentWizard.getTemplates(); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java index 9caa110840b..571379f7821 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java @@ -46,6 +46,7 @@ public abstract class TemplatesChoiceWizard extends Wizard implements ITemplates protected IWorkbench workbench; protected IStructuredSelection selection; + @Override public final void addPages() { IWizardPage[] pages = getPagesBeforeTemplatePages(); for(int i=0; i valueStore = template.getValueStore(); finishPressed = true; @@ -110,10 +112,12 @@ class WizardNode implements IWizardNode { return true; } + @Override public boolean canFinish(){ return !finishPressed && super.canFinish(); } + @Override public void createPageControls(Composite pageContainer) { super.createPageControls(pageContainer); parentPage.adjustTemplateValues(template); @@ -125,6 +129,7 @@ class WizardNode implements IWizardNode { } } + @Override public Image getDefaultPageImage() { return parentPage.getImage(); } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/event/PatternEvent.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/event/PatternEvent.java index caf513b8727..dc03106bfdc 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/event/PatternEvent.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/event/PatternEvent.java @@ -66,6 +66,7 @@ public class PatternEvent extends EventObject { * * @return String */ + @Override public String toString() { return eventMessage; } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java index 4d0f2ff3f67..8ba0222c42e 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java @@ -62,6 +62,7 @@ public class NewProjectCreationPage extends WizardNewProjectCreationPage impleme return baseName; } + @Override protected boolean validatePage() { if (super.validatePage() == true) { IStatus validName = isValidName(getProjectName()); @@ -121,6 +122,7 @@ public class NewProjectCreationPage extends WizardNewProjectCreationPage impleme * (non-Javadoc) * @see org.eclipse.jface.wizard.WizardPage#getNextPage() */ + @Override public IWizardPage getNextPage() { if(next != null) { return next; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java index 754a2bb1745..954eb6723fd 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java @@ -105,6 +105,7 @@ public class TemplateInputDialog extends Dialog { * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell) */ + @Override protected void configureShell(Shell shell) { super.configureShell(shell); this.shell = shell; @@ -117,6 +118,7 @@ public class TemplateInputDialog extends Dialog { * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) */ + @Override protected Control createDialogArea(Composite parent) { this.parent = parent; @@ -229,6 +231,7 @@ public class TemplateInputDialog extends Dialog { * overridden to perform custom events on OK button. */ + @Override protected void okPressed() { if (option == TemplatePreferencePage.OPTION_ADD) { String name = nameText.getText(); @@ -283,6 +286,7 @@ public class TemplateInputDialog extends Dialog { * * @see org.eclipse.jface.dialogs.Dialog#cancelPressed() */ + @Override protected void cancelPressed() { sharedDialog.close(); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java index f1691148934..edda6959dd1 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java @@ -181,6 +181,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench * @return subComposite */ + @Override protected Control createContents(Composite parent) { Composite composite = new Composite(parent, SWT.NONE); @@ -303,6 +304,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench private void addTableListener() { SelectionListener sListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { boolean isSelected = table.isSelected(table.getSelectionIndex()); int selectionCount = table.getSelectionCount(); @@ -378,6 +380,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench inputDialog = new TemplateInputDialog(getShell()); SelectionListener listener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { if (e.getSource().equals(editButton)) { String editItemString = getSelectedItemNameFromTable(); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java index 6f66652b58c..d988a84e707 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java @@ -114,6 +114,7 @@ public abstract class UIPage extends DialogPage { * * @return Control. */ + @Override public Control getControl() { return uiComposite; } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java index 76e5294697d..d2bb071ff22 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java @@ -128,6 +128,7 @@ public class UIWizardPage extends UIPage implements IWizardDataPage, PatternEven * @return Image. */ + @Override public Image getImage() { Image result = super.getImage(); @@ -184,6 +185,7 @@ public class UIWizardPage extends UIPage implements IWizardDataPage, PatternEven /** * Overloaded from DialogPage */ + @Override public Shell getShell() { IWizardContainer container = getContainer(); @@ -253,6 +255,7 @@ public class UIWizardPage extends UIPage implements IWizardDataPage, PatternEven /** * @return String, Page name of this page. */ + @Override public String toString() { return name; } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/GenericUIElementGroup.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/GenericUIElementGroup.java index 536c89377b2..2b5aee289d5 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/GenericUIElementGroup.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/GenericUIElementGroup.java @@ -29,14 +29,17 @@ public class GenericUIElementGroup extends UIElement { /** * @deprecated use {@value UIGroupTypeEnum#PAGES_ONLY} */ + @Deprecated public static String PAGES_ONLY = UIGroupTypeEnum.PAGES_ONLY.getId(); /** * @deprecated use {@value UIGroupTypeEnum#PAGES_ONLY} */ + @Deprecated public static String PAGES_TAB = UIGroupTypeEnum.PAGES_TAB.getId(); /** * @deprecated */ + @Deprecated public static String LOGTYPE = "UIElement"; //$NON-NLS-1$ UIGroupTypeEnum type = null; @@ -60,6 +63,7 @@ public class GenericUIElementGroup extends UIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#setValues(java.util.Map) */ + @Override public void setValues(Map valueMap) { int childCount = getChildCount(); @@ -71,6 +75,7 @@ public class GenericUIElementGroup extends UIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#getValues() */ + @Override public Map getValues() { HashMap valueMap = new HashMap(); int childCount = getChildCount(); @@ -85,6 +90,7 @@ public class GenericUIElementGroup extends UIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#createWidgets(org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UIComposite) */ + @Override public void createWidgets(UIComposite uiComposite) { int childCount = getChildCount(); @@ -101,6 +107,7 @@ public class GenericUIElementGroup extends UIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#disposeWidget() */ + @Override public void disposeWidget() { int childCount = getChildCount(); @@ -116,6 +123,7 @@ public class GenericUIElementGroup extends UIElement { * @param index * @return child uiElement */ + @Override public UIElement getChild(int index) { return childList.get(index); } @@ -127,6 +135,7 @@ public class GenericUIElementGroup extends UIElement { * @see UIElement * @param aUIElement */ + @Override public void addToChildList(UIElement aUIElement) { childList.add(aUIElement); } @@ -138,6 +147,7 @@ public class GenericUIElementGroup extends UIElement { * @see UIElement * @return the child count of UIElement */ + @Override public int getChildCount() { return childList.size(); } @@ -153,6 +163,7 @@ public class GenericUIElementGroup extends UIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#isValid() */ + @Override public boolean isValid() { boolean retVal = true; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/InputUIElement.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/InputUIElement.java index b2f4b2a23ac..7bef9d2e9ca 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/InputUIElement.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/InputUIElement.java @@ -67,6 +67,7 @@ public abstract class InputUIElement extends UIElement { * @param uiElement * @throws SimpleElementException */ + @Override public void addToChildList(UIElement uiElement) throws SimpleElementException { throw new SimpleElementException(); } @@ -76,6 +77,7 @@ public abstract class InputUIElement extends UIElement { * * @see UIElement */ + @Override public int getChildCount() throws SimpleElementException { throw new SimpleElementException(); } @@ -85,6 +87,7 @@ public abstract class InputUIElement extends UIElement { * * @see UIElement */ + @Override public UIElement getChild(int index) throws SimpleElementException { throw new SimpleElementException(); } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/SimpleUIElementGroup.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/SimpleUIElementGroup.java index 0d727bc7d27..345ac39d6e4 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/SimpleUIElementGroup.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/SimpleUIElementGroup.java @@ -29,6 +29,7 @@ public class SimpleUIElementGroup extends GenericUIElementGroup { /** * @see UIElement */ + @Override public void setValues(Map valueMap) { super.setValues(valueMap); } @@ -36,6 +37,7 @@ public class SimpleUIElementGroup extends GenericUIElementGroup { /** * @see UIElement */ + @Override public Map getValues() { return super.getValues(); } @@ -43,6 +45,7 @@ public class SimpleUIElementGroup extends GenericUIElementGroup { /** * @see UIElement */ + @Override public void createWidgets(UIComposite uiComposite) { super.createWidgets(uiComposite); } @@ -53,11 +56,13 @@ public class SimpleUIElementGroup extends GenericUIElementGroup { * * @see UIElement */ + @Override public void disposeWidget() { super.disposeWidget(); } // @see UIElement + @Override public boolean isValid() { return super.isValid(); } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIAttributes.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIAttributes.java index 66ac5cdc9a8..8ad495054fe 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIAttributes.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIAttributes.java @@ -30,11 +30,13 @@ public class UIAttributes extends HashMap { this.templateInfo = templateInfo; } + @Override public String put(String key, String value) { value = TemplateEngineHelper.externalizeTemplateString(templateInfo, value); return super.put(key, value); } + @Override public void putAll(Map map) { for(String key : map.keySet()) { String value = map.get(key); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIGroupTypeEnum.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIGroupTypeEnum.java index 2a6a9ed027a..42fc6aa6de4 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIGroupTypeEnum.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIGroupTypeEnum.java @@ -23,6 +23,7 @@ public class UIGroupTypeEnum { this.id = id; } + @Override public boolean equals(Object other) { if(other instanceof UIGroupTypeEnum) { return id.equals(((UIGroupTypeEnum)other).id); @@ -30,6 +31,7 @@ public class UIGroupTypeEnum { return false; } + @Override public int hashCode() { return id.hashCode(); } @@ -38,6 +40,7 @@ public class UIGroupTypeEnum { return id; } + @Override public String toString() { return id; } diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java index 6acedd1b2bd..f7cf5ef3c9b 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java @@ -62,6 +62,7 @@ public class UIBooleanWidget extends InputUIElement { /** * @return HashMap which contains the values in the Boolean Widget. */ + @Override public Map getValues() { Map values = new HashMap(); values.put(uiAttributes.get(InputUIElement.ID), Boolean.toString(booleanValue)); @@ -71,6 +72,7 @@ public class UIBooleanWidget extends InputUIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#setValues(java.util.Map) */ + @Override public void setValues(Map valueMap) { booleanValue = new Boolean(valueMap.get(uiAttributes.get(InputUIElement.ID))).booleanValue(); } @@ -78,6 +80,7 @@ public class UIBooleanWidget extends InputUIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#createWidgets(org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UIComposite) */ + @Override public void createWidgets(UIComposite uiComposite) { GridData gridData = null; this.uiComposite = uiComposite; @@ -101,6 +104,7 @@ public class UIBooleanWidget extends InputUIElement { button.setData(".uid", uiAttributes.get(UIElement.ID)); //$NON-NLS-1$ button.setSelection(new Boolean(booleanValue).booleanValue()); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { booleanValue = button.getSelection(); } @@ -110,6 +114,7 @@ public class UIBooleanWidget extends InputUIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#isValid() */ + @Override public boolean isValid() { boolean retVal= true; String mandatory= uiAttributes.get(InputUIElement.MANDATORY); @@ -122,6 +127,7 @@ public class UIBooleanWidget extends InputUIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#disposeWidget() */ + @Override public void disposeWidget() { label.dispose(); button.dispose(); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java index 7ba900a1f6c..4bc2e807208 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java @@ -63,6 +63,7 @@ public class UIBrowseWidget extends UITextWidget implements ModifyListener { * * @param composite */ + @Override public void createWidgets(UIComposite composite) { uiComposite = composite; @@ -92,6 +93,7 @@ public class UIBrowseWidget extends UITextWidget implements ModifyListener { button.setText(InputUIElement.BROWSELABEL); button.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { onBrowsePushed(); } @@ -115,6 +117,7 @@ public class UIBrowseWidget extends UITextWidget implements ModifyListener { * call the dispose method on the widgets. This is to ensure that the * widgets are properly disposed. */ + @Override public void disposeWidget() { label.dispose(); text.dispose(); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java index 4a63c175003..dac5d585472 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java @@ -67,6 +67,7 @@ public class UISelectWidget extends InputUIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#getValues() */ + @Override public Map getValues() { Map values = new HashMap(); if(currentValue != null) { @@ -78,6 +79,7 @@ public class UISelectWidget extends InputUIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#setValues(java.util.Map) */ + @Override public void setValues(Map valueMap) { defaultValue= valueMap.get(uiAttributes.get(InputUIElement.ID)); if (combo != null) { @@ -94,6 +96,7 @@ public class UISelectWidget extends InputUIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#createWidgets(org.eclipse.cdt.ui.templateengine.uitree.uiwidgets.UIComposite) */ + @Override public void createWidgets(final UIComposite uiComposite) { label= new Label(uiComposite, SWT.LEFT); label.setText(uiAttributes.get(InputUIElement.WIDGETLABEL)); @@ -118,6 +121,7 @@ public class UISelectWidget extends InputUIElement { } combo.select(defaultIndex); combo.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { currentValue= getValue(combo.getItem(combo.getSelectionIndex())); uiComposite.firePatternEvent(createPatternEvent()); @@ -135,6 +139,7 @@ public class UISelectWidget extends InputUIElement { * @return whether this widget has been set to a valid state. For this * widget type that means whether the user has selected a non-empty string name. */ + @Override public boolean isValid() { boolean retVal = true; if(Boolean.parseBoolean(uiAttributes.get(InputUIElement.MANDATORY))) { @@ -156,6 +161,7 @@ public class UISelectWidget extends InputUIElement { /* * @see org.eclipse.cdt.ui.templateengine.uitree.UIElement#disposeWidget() */ + @Override public void disposeWidget() { label.dispose(); combo.dispose(); diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java index bcd5a8d23da..a22d6b41f75 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java @@ -47,6 +47,7 @@ public class UISpecialListWidget extends UIStringListWidget { * * @param uiComposite */ + @Override public void createWidgets(final UIComposite uiComposite) { GridData gridData = null; @@ -85,6 +86,7 @@ public class UISpecialListWidget extends UIStringListWidget { * call the dispose method on the widgets. This is to ensure that the * widgets are properly disposed. */ + @Override public void disposeWidget() { label.dispose(); fileListControl = null; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java index 6a918d1e787..0b2113914d2 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java @@ -66,6 +66,7 @@ public class UIStringListWidget extends InputUIElement { /** * @return String_List value contained in the String_List Widget. */ + @Override public Map getValues() { Map retMap = new HashMap(); String itemString = new String(); @@ -82,6 +83,7 @@ public class UIStringListWidget extends InputUIElement { * * @param valueMap */ + @Override public void setValues(Map valueMap) { String items = (String) valueMap.get(uiAttributes.get(InputUIElement.ID)); @@ -101,6 +103,7 @@ public class UIStringListWidget extends InputUIElement { * * @param uiComposite */ + @Override public void createWidgets(final UIComposite uiComposite) { GridData gridData = null; @@ -149,6 +152,7 @@ public class UIStringListWidget extends InputUIElement { * * @return boolean. */ + @Override public boolean isValid() { boolean retVal = true; String mandatory = uiAttributes.get(InputUIElement.MANDATORY); @@ -163,6 +167,7 @@ public class UIStringListWidget extends InputUIElement { * call the dispose method on the widgets. This is to ensure that the * widgets are properly disposed. */ + @Override public void disposeWidget() { label.dispose(); fileListControl = null; diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java index b1413e72921..6b02b0ec63d 100644 --- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java +++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java @@ -78,6 +78,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener { /** * @return String, value contained in the Text Widget. */ + @Override public Map getValues() { Map retMap = new HashMap(); retMap.put(uiAttributes.get(InputUIElement.ID), textValue); @@ -90,6 +91,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener { * * @param valueMap */ + @Override public void setValues(Map valueMap) { String val = valueMap.get(uiAttributes.get(InputUIElement.ID)); String key = null; @@ -115,6 +117,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener { * * @param uiComposite */ + @Override public void createWidgets(UIComposite uiComposite) { GridData gd = new GridData(); @@ -144,6 +147,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener { * call the dispose method on the widgets. This is to ensure that the * widgets are properly disposed. */ + @Override public void disposeWidget() { label.dispose(); text.dispose(); @@ -253,6 +257,7 @@ public class UITextWidget extends InputUIElement implements ModifyListener { * * @return boolean. */ + @Override public boolean isValid() { boolean retVal = true; String mandatory = uiAttributes.get(InputUIElement.MANDATORY); diff --git a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java index 9851974fa69..09e3f28857f 100644 --- a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java +++ b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java @@ -112,6 +112,7 @@ public class FileListControl { /* (non-Javadoc) * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite) */ + @Override protected void createButtonsForButtonBar(Composite parent) { super.createButtonsForButtonBar(parent); @@ -121,6 +122,7 @@ public class FileListControl { /* Browse button for workspace folders/files */ final Button workspaceButton = createButton(parent, 3, WORKSPACEBUTTON_NAME, false); workspaceButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent ev) { /* Before opening the browse dialog we try to convert the current * path text to a valid workspace resource, so we can set it @@ -232,6 +234,7 @@ public class FileListControl { /* Browse button for external directories/files */ final Button externalButton = createButton(parent, 4, FILESYSTEMBUTTON_NAME, false); externalButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent ev) { String currentName; String result; @@ -426,6 +429,7 @@ public class FileListControl { list.addSelectionListener(getSelectionListener()); //Add a double-click event handler list.addMouseListener(new MouseAdapter() { + @Override public void mouseDoubleClick(MouseEvent e) { // Popup the editor on the selected item from the list editSelection(); @@ -436,6 +440,7 @@ public class FileListControl { /* (non-Javadoc) * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent) */ + @Override public void keyPressed(KeyEvent e) { // Is this the delete key if (e.keyCode == SWT.DEL) { @@ -535,6 +540,7 @@ public class FileListControl { */ private void createSelectionListener() { selectionListener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { Widget widget = event.widget; if (widget == addItem) { diff --git a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java index e5726b714d2..5f1287eda71 100644 --- a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java +++ b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java @@ -73,6 +73,7 @@ public class RadioButtonsArea extends Composite { createControl(parent, labelText); } + @Override public void setEnabled(boolean enabled) { for( int i = 0; i < radioButtons.length; i++ ) { radioButtons[i].setEnabled(enabled); @@ -121,6 +122,7 @@ public class RadioButtonsArea extends Composite { radioButtons = new Button[labelsAndValues.length]; listener = new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent event) { value = (String) (event.widget.getData()); fireSelectionEvent(event); // Infor any external listener diff --git a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/TabFolderLayout.java b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/TabFolderLayout.java index 35878043b95..4c662926108 100644 --- a/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/TabFolderLayout.java +++ b/core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/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); @@ -42,6 +43,7 @@ public class TabFolderLayout extends Layout { return new Point(maxWidth, maxHeight); } + @Override protected void layout (Composite composite, boolean flushCache) { Rectangle rect= composite.getClientArea();