Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Schorn2008-04-09 11:24:27 +0000
committerMarkus Schorn2008-04-09 11:24:27 +0000
commita14a63c06081e95010c4c7b56ee169279c6465e9 (patch)
treea310df8ad2e4431942e3ce901adf1d5f42ceb28e
parent89abaeb3e8cdf7064e928ee01d754920a354d12c (diff)
downloadorg.eclipse.cdt-a14a63c06081e95010c4c7b56ee169279c6465e9.tar.gz
org.eclipse.cdt-a14a63c06081e95010c4c7b56ee169279c6465e9.tar.xz
org.eclipse.cdt-a14a63c06081e95010c4c7b56ee169279c6465e9.zip
Increased warning levels for ui-plugin, fixed warnings.
-rw-r--r--core/org.eclipse.cdt.ui/.settings/org.eclipse.jdt.core.prefs24
-rw-r--r--core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeDialog.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/AddIncludesOperation.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/codemanipulation/StubUtility.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContext.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CContextType.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CFormatter.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CodeTemplateContextType.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContext.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/CommentContextType.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContext.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/FileTemplateContextType.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContext.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/util/CodeFormatterUtil.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java33
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/BinaryPropertySource.java13
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CElementAdapterFactory.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CProjectAdapterFactory.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/DocumentInputStream.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/LineBackgroundPainter.java75
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ResourceAdapterFactory.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractToggleLinkingAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AbstractUpdateIndexAction.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/AddBlockCommentAction.java10
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/BlockCommentAction.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CompositeActionGroup.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/CreateParserLogAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FindWordAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FoldingActionGroup.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/FreshenIndexAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GoToNextPreviousMemberAction.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/GotoNextBookmarkAction.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/IndentAction.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/OpenActionUtil.java23
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RebuildIndexAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/RemoveBlockCommentAction.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectAllAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SelectionConverter.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/UpdateIndexWithModifiedFilesAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/WorkbenchRunnableAdapter.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java42
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java37
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ScrollLockAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHContentProvider.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHDropTargetListener.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryDropDownAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHHistoryListAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefChildNode.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHMultiDefNode.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CallHierarchyUI.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/OpenCallHierarchyAction.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AbstractMergeViewer.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/AsmMergeViewer.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreator.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/compare/CStructureCreatorVisitor.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java13
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewActionGroup.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewContentProvider.java22
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewFrameSource.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewLabelProvider.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMoveAction.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CollapseAllAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java15
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/DefaultAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/GotoActionGroup.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeRefContainer.java16
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/IncludeReferenceProxy.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/LibraryRefContainer.java20
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenProjectGroup.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/PasteAction.java17
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDragAdapter.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java40
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/ToggleLinkingAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/AbstractElementListSelectionDialog.java18
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/ElementListSelectionDialog.java16
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/OptionalMessageDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionList.java15
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/SelectionStatusDialog.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusDialog.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/StatusInfo.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedElementSelectionValidator.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/TypedViewerFilter.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/AbstractPathOptionBlock.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ArchiveFileFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElement.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementGroup.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementLabelProvider.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPElementSorter.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPListImageDescriptor.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerDescriptor.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerEntryPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerSelectionPage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathContainerWizard.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathFilterPathPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPage.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathIncludeSymbolEntryPerFilePage.java39
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathLibraryEntryPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOrderExportPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathOutputEntryPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathProjectsEntryPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathPropertyPage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathSourceEntryPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathTabBlock.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternDialog.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ExclusionPatternEntryDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/FolderSelectionDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/IncludesSymbolsPropertyPage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/MultipleFolderSelectionDialog.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewIncludesSymbolsTabBlock.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/NewSourceFolderDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/ProjectContainerPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentBlock.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/SourceAttachmentDialog.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/CDTViewerDragAdapter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/DelegatingDragAdapter.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java21
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDropAdapter.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDragAdapter.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextEditorDropAdapter.java17
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/TextViewerDragAdapter.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ASTProvider.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java24
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CContentOutlinerProvider.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewer.java19
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CSourceViewerDecorationSupport.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CStorageDocumentProvider.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/DefaultBinaryFileEditor.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchAnnotationModel.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ExternalSearchDocumentProvider.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoAnnotationAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/GotoMatchingBracketAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/IndentUtil.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/LexicalSortingAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingManager.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightings.java156
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SpecificContentAssistAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleCommentAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleMarkOccurrencesAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TogglePresentationAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/ToggleSourceAndHeaderAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/TranslationUnitAnnotationModelEvent.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/ASMEditorActionContributor.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmContentOutlinePage.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmSourceViewerConfiguration.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/asm/AsmTextEditor.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ArchiveFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ClosedProjectFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/CustomFiltersDialog.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ExecutableFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterDescriptor.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/MacroDirectiveFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NamePatternFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCElementFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/NonCProjectsFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/ObjectFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/SharedFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/UsingDirectiveFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CFunctionSummary.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpBook.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpEntry.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/help/CHelpTopic.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBFile.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBHistoryDropDownAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBSetInputJob.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBWorkingSetFilter.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/OpenIncludeBrowserAction.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/CountNodeAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/DiscardExternalDefsAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindDeclarationsAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/FindReferencesAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexLabelProvider.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexNode.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/IndexViewSearchQuery.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/OpenDefinitionAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/indexview/ToggleLinkingAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ContentTypeMappingDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/FileLanguageMappingPropertyPage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/LanguageMappingWidget.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectContentTypeMappingDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingPropertyPage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/ProjectLanguageMappingWidget.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceContentTypeMappingDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingPreferencePage.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/language/WorkspaceLanguageMappingWidget.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/AbstractCNavigatorActionGroup.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionProvider.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDragAdapterAssistant.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorDropAdapterAssistant.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionGroup.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorEditActionProvider.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenViewActionProvider.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorProblemsLabelDecorator.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorRefactorActionGroup.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorSearchActionProvider.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlockPreferencePage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildConsolePreferencePage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringConfigurationBlock.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorColoringPreferencePage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverPreferencePage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeAssociation.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypeDialog.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencePage.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CParserPreferencePage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CPluginPreferencePage.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedConfigurationBlock.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateBlock.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplateSourceViewerConfiguration.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/EditTemplateDialog.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingConfigurationBlock.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/FoldingPreferencePage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerPreferencePage.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/IndexerStrategyBlock.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/MarkOccurrencesPreferencePage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariableDialog.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablePreferencePage.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PathEntryVariablesGroup.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesAccess.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreviewSourceViewer.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ProjectSelectionDialog.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ScrolledPageContent.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingConfigurationBlock.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SmartTypingPreferencePage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/SpellingConfigurationBlock.java10
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskConfigurationBlock.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskInputDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/WorkInProgressPreferencePage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/AlreadyExistsDialog.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/BracesTabPage.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java10
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ControlStatementsTabPage.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CreateProfileDialog.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterModifyDialog.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileManager.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterProfileStore.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterTabPage.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/IndentationTabPage.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/LineWrappingTabPage.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialog.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ModifyDialogTabPage.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileManager.java22
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/ProfileStore.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/SnippetPreview.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/TranslationUnitPreview.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceOptions.java21
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/WhiteSpaceTabPage.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTManager.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/ASTSpecificNameVisitor.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/IOccurrencesFinder.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchElementQuery.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchPage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/DeclarationsSearchGroup.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsInWorkingSetAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindDeclarationsProjectAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindInWorkingSetAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsInWorkingSetAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/FindRefsProjectAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/ReferencesSearchGroup.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionSearchGroup.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/WorkingSetFindAction.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCScanner.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractCompareViewerInformationControl.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractInformationControl.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/AbstractSourceViewerInformationControl.java10
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CAutoIndentStrategy.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBraceRule.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CBreakIterator.java21
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeReader.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompositeReconcilingStrategy.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CFormattingStrategy.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CHeuristicScanner.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COperatorRule.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/COutlineInformationControl.java10
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CPairMatcher.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CReconciler.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java22
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringAutoIndentStrategy.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CStringDoubleClickSelector.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CWordIterator.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/DocumentCharacterIterator.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/FastCPartitioner.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTML2TextReader.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/HTMLAnnotationHover.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SequenceCharacterIterator.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SimpleCSourceViewerConfiguration.java11
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleCharReader.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SingleTokenCScanner.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/SubstitutionTextReader.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverDescriptor.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CInformationProvider.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroCompareViewer.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionControl.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java16
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionHover.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CProposalContextInformation.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionProposalComputerRegistry.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistHandler.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/HelpCompletionProposalComputer.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/KeywordCompletionProposalComputer.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionAssistant.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CCorrectionProcessor.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectAnnotationRulerAction.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CSelectRulerAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/CorrectionCommandHandler.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/correction/ProblemLocation.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentMultilineProposalComputer.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSinglelineProposalComputer.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/DocCommentSpellDictionary.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/doctools/EditorReopener.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingEngine.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingProblem.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingReconcileStrategy.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/CSpellingService.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/ChangeCaseProposal.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TaskTagDictionary.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/TextSpellingEngine.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/WordCompletionProposalComputer.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/LocaleSensitiveSpellDictionary.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/PersistentSpellDictionary.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/spelling/engine/RankedWordProposal.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateEngine.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/OpenTypeHierarchyAction.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THDropTargetListener.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THGraph.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryDropDownAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THHistoryListAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THInformationControl.java17
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/TypeHierarchyUI.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/BusyIndicatorRunnableContext.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteIProblemMarkerAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/DeleteTaskAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ExternalEditorInput.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/OpenExternalProblemAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTableViewer.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/ProblemTreeViewer.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeContentManager.java10
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/RemoteTreeViewer.java17
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/SWTUtil.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/StringMatcher.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/TableLayoutComposite.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AppearanceAwareLabelProvider.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeContentProvider.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/AsyncTreeWorkInProgressNode.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/CUILabelProvider.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/DecoratingCLabelProvider.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ExtendedTreeViewer.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ImageImageDescriptor.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilterAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/ProjectTemplateStore.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/SelectionListenerWithASTManager.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StandardCElementLabelProvider.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/StorageLabelProvider.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractOpenWizardAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/AbstractWizardDropDownAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewClassCreationWizard.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizard.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewElementWizardPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFileDropDownAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewFolderDropDownAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewProjectDropDownAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewTypeDropDownAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/OpenNewWizardAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/BaseClassesListDialogField.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/ConstructorMethodStub.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/DestructorMethodStub.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/MethodStubsListDialogField.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewBaseClassSelectionDialog.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/SourceFileSelectionDialog.java25
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/CheckedListDialogField.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ComboDialogField.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LayoutUtil.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/ListDialogField.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogField.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/SelectionButtonDialogFieldGroup.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/Separator.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringButtonDialogField.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/StringDialogField.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/TreeListDialogField.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizard.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/AbstractFileCreationWizardPage.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileFromTemplateWizard.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewHeaderFileCreationWizardPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewSourceFileCreationWizardPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/WizardNewFileFromTemplateCreationPage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewSourceFolderWizardPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableLabelProvider.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/StringVariableSelectionDialog.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/indexwizards/TeamProjectIndexExportWizard.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetPageContentProvider.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/CElementWorkingSetUpdater.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementContentProvider.java24
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementGrouping.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementImageDescriptor.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementLabelProvider.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPreferenceInitializer.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IncludesGrouping.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/NamespacesGrouping.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildConfigAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigContextAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeBuildConfigMenuAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ChangeConfigAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/CustomFiltersActionGroup.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/DeleteResConfigsAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/GenerateActionGroup.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/OpenAction.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/SelectionDispatchAction.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractBinaryParserPage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractErrorParserBlock.java8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractGNUBinaryParserPage.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java10
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CHelpConfigurationPropertyPage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java7
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerBlock.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerCombo.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/DocCommentOwnerComposite.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUSomBinaryParserPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUXCoffBinaryParserPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java15
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerOptionPropertyPage.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/MachOBinaryParserPage.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/NullIndexerBlock.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/PreferenceScopeBlock.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java17
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java26
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java21
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPrefPage.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPropertyDialog.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractSinglePage.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BinaryParsTab.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/BuildVarListDialog.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTUIListComparator.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationOutputTab.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationSourceTab.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CLocationTab.java17
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ConfigMultiSelectionDialog.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvDialog.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/EnvironmentTab.java21
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ErrorParsTab.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternDialog.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExPatternEntryDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ManageConfigDialog.java6
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/MultiLineTextFieldEditor.java15
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/NewConfigurationDialog.java5
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PageLayout.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/Page_head_general.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PrefPage_Abstract.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ProjectContentsArea.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RefsTab.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/RenameConfigurationDialog.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java12
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolDialog.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/SymbolTab.java17
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/TypedCDTViewerFilter.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ContentAssistInvocationContext.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/contentassist/ICompletionContributor.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/DefaultMultilineCommentAutoEditStrategy.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/doxygen/DoxygenMultilineAutoEditStrategy.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagCommentScanner.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/doctools/generic/GenericTagDoubleClickStrategy.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CCProjectWizard.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTCommonProjectWizard.java9
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java14
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTProjectWizard.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CProjectWizard.java2
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CWizardHandler.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/ICPathContainerPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCCProjectWizard.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java4
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewClassCreationWizardPage.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewHeaderFileCreationWizard.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFileCreationWizard.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewSourceFolderCreationWizard.java3
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConversionWizard.java18
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/conversion/ConvertProjectWizardPage.java10
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/internal/templateengine/wizard/TemplateCNewWizard.java2
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/AbstractWizardDataPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/ProjectSelectionPage.java2
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/SimpleElementException.java1
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/Template.java2
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateClassWizard.java7
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateDrivenWizard.java7
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplateListSelectionPage.java2
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/TemplatesChoiceWizard.java2
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/WizardNode.java5
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/event/PatternEvent.java1
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/NewProjectCreationPage.java2
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplateInputDialog.java4
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java3
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIPage.java1
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/UIWizardPage.java3
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/GenericUIElementGroup.java11
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/InputUIElement.java3
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/SimpleUIElementGroup.java5
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIAttributes.java2
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/UIGroupTypeEnum.java3
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBooleanWidget.java6
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIBrowseWidget.java3
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISelectWidget.java6
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UISpecialListWidget.java2
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UIStringListWidget.java5
-rw-r--r--core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/uitree/uiwidgets/UITextWidget.java5
-rw-r--r--core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/FileListControl.java6
-rw-r--r--core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/RadioButtonsArea.java2
-rw-r--r--core/org.eclipse.cdt.ui/utils.ui/org/eclipse/cdt/utils/ui/controls/TabFolderLayout.java2
581 files changed, 2606 insertions, 527 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<String, String> 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<String> required= new ArrayList<String>(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<String, String> 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<String, String> 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<String, String> 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<ICElement> list= new ArrayList<ICElement>();
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<Object> list = new ArrayList<Object>(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<Object> list = new ArrayList<Object>(children.length);
+ Map<String, NamespacesGrouping> map = new HashMap<String, NamespacesGrouping>();
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<Object> nonCResources = new ArrayList<Object>(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<IBinary> list = new ArrayList<IBinary>(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<IArchive> list = new ArrayList<IArchive>(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<Position> fPositions= new ArrayList<Position>();
/** Cached text positions */
- private List fLastPositions= new ArrayList();
+ private List<Position> fLastPositions= new ArrayList<Position>();
/** Temporary changed positions */
- private List fChangedPositions= new ArrayList();
+ private List<Position> fChangedPositions= new ArrayList<Position>();
/** 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<String, Color> fColorMap= new HashMap<String, Color>();
/**
* Creates a new painter for the given text viewer.
@@ -134,7 +134,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener {
*
* @param positions a list of <code>Position</code>s
*/
- public void setHighlightPositions(List positions) {
+ public void setHighlightPositions(List<Position> positions) {
boolean isActive= fIsActive;
deactivate(isActive);
fPositions.clear();
@@ -151,7 +151,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener {
*
* @param positions a list of <code>Position</code>s
*/
- public void addHighlightPositions(List positions) {
+ public void addHighlightPositions(List<Position> positions) {
boolean isActive= fIsActive;
deactivate(isActive);
fPositions.addAll(positions);
@@ -165,7 +165,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener {
*
* @param positions a list of <code>Position</code>s
*/
- public void removeHighlightPositions(List positions) {
+ public void removeHighlightPositions(List<Position> positions) {
boolean isActive= fIsActive;
deactivate(isActive);
fPositions.removeAll(positions);
@@ -180,7 +180,7 @@ public class LineBackgroundPainter implements IPainter, LineBackgroundListener {
* @param removePositions a list of <code>Position</code>s to remove
* @param addPositions a list of <code>Position</code>s to add
*/
- public void replaceHighlightPositions(List removePositions, List addPositions) {
+ public void replaceHighlightPositions(List<Position> removePositions, List<Position> 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<Position> 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<Position> 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<Position> 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 <code>null</code> if none changed.
*/
- private List getChangedPositions() {
+ private List<Position> getChangedPositions() {
if (fLastPositions.size() != fPositions.size()) {
return fLastPositions;
}
- List changedPositions= null;
+ List<Position> 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<Position> 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<ICElement> tuSelection= new ArrayList<ICElement>();
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<Edit> edits= new LinkedList<Edit>();
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<Edit> 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<Edit> 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<Edit> 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 <code>Edit</code>s
* @throws BadLocationException if an <code>Edit</code> 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<Edit> edits) throws BadLocationException {
+ for (Iterator<Edit> 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<ITranslationUnit> tuSelection= new ArrayList<ITranslationUnit>();
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<IMarker> {
+ 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,23 +14,22 @@ package org.eclipse.cdt.internal.ui.actions;
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Shell;
+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;
-import org.eclipse.cdt.ui.CElementLabelProvider;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
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<ISourceReference> filterResolveResults(ICElement[] codeResolveResults) {
int nResults= codeResolveResults.length;
- List refs= new ArrayList(nResults);
+ List<ISourceReference> refs= new ArrayList<ISourceReference>(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<Edit> edits= new LinkedList<Edit>();
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<IResource> result = new ArrayList<IResource>();
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<IProject, BuildConsolePartitioner> fConsoleMap = new HashMap<IProject, BuildConsolePartitioner>();
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<String, IAction> fGlobalActions = new HashMap<String, IAction>(10);
+ private List<String> fSelectionActions = new ArrayList<String>(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<String> 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<ITypedRegion> fPartitions = new ArrayList<ITypedRegion>(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<StreamEntry> fQueue = new Vector<StreamEntry>(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<ITypedRegion> list = new ArrayList<ITypedRegion>();
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<ITypedRegion> newParitions = new ArrayList<ITypedRegion>(fPartitions.size());
+ Iterator<ITypedRegion> 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<DocumentRangeNode> fStack = new Stack<DocumentRangeNode>();
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<ICElement> elements = new ArrayList<ICElement>();
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<ICElement> list = new ArrayList<ICElement>();
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<IBinary> list = new ArrayList<IBinary>(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<IResource> resources = new ArrayList<IResource>();
- 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.
* <p>
@@ -97,9 +98,10 @@ public class CopyAction extends SelectionListenerAction {
* on <code>IAction</code> 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 {
* <code>SelectionListenerAction</code> 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<ILibraryReference> list = new ArrayList<ILibraryReference>(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.
* <p>
@@ -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 <code>IAction</code>.
*/
+ @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 {
* <code>SelectionListenerAction</code> 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<ICElement> resources= new ArrayList<ICElement>(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 <code>setElements</code>. 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<Object> selected= new ArrayList<Object>(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<Object> 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 <code>true</code>, 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<Object> 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<TransferDragSourceListener> 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<Transfer> transfers= new ArrayList<Transfer>(fPossibleListeners.length);
+ fActiveListeners= new ArrayList<TransferDragSourceListener>(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<IResource> roots;
public RefreshOperation(List resources) {
super();
- roots = new HashSet(resources.size());
+ roots = new HashSet<IResource>(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<IResource> result = Collections.emptyList();
ISelection selection = provider.getSelection();
if (selection instanceof IStructuredSelection) {
IStructuredSelection structured = (IStructuredSelection) selection;
- result = new ArrayList(structured.size());
+ result = new ArrayList<IResource>(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<String> locations = new ArrayList<String>(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<IResource> resources = Collections.emptyList();
ISelection selection = provider.getSelection();
if (selection instanceof IStructuredSelection) {
IStructuredSelection structured = (IStructuredSelection) selection;
- resources = new ArrayList(structured.size());
+ resources = new ArrayList<IResource>(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<IResource> selectedResources = new ArrayList<IResource>();
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<DisplayName> pdomNames= new ArrayList<DisplayName>();
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<String> usings = new ArrayList<String>(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
* </p>
* @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.
* </p>
*/
+ @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 <code>IAction</code> 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 {
* <code>ITextOperationTarget</code> 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 "<functionSummary> : " + 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 "<helpBook title=\"" +title +"\" type=\"" + type + "\">"; //$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 "<entry keyword=\"" + keyword + "\">"; //$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 "<topic href=\"" + href + "\" title=\"" + title + "\">"; //$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<OverlayKey> overlayKeys = new ArrayList<OverlayKey>();
@@ -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 fCon