From 8a834d59702025a3d1f44f379977b80068189213 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Mon, 14 Dec 2015 11:06:00 +0200 Subject: [PATCH] Cleanups. Remove useless: * casts. * suppress warnings unchecked. * @see comments Change-Id: I4713e9ddf90195cf1e465b3743f5f0bc7e41d338 Signed-off-by: Alexander Kurtakov --- .../text/makefile/FunctionReferenceRule.java | 4 ++-- .../ui/editor/CElementHyperlinkDetector.java | 2 +- .../cdt/internal/ui/editor/CSourceViewer.java | 4 ++-- .../internal/ui/text/PreprocessorRule.java | 2 +- .../template/TemplateVariableProcessor.java | 1 - .../ui/text/CSourceViewerConfiguration.java | 4 ---- .../cdt/debug/internal/ui/CDebugUIUtils.java | 1 - .../AbstractToggleBreakpointAdapter.java | 1 - .../ui/disassembly/DisassemblyPart.java | 4 ---- ...DsfStepIntoSelectionHyperlinkDetector.java | 19 +------------------ 10 files changed, 7 insertions(+), 35 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java index f2f49c5676c..1208163d943 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java @@ -83,7 +83,7 @@ public class FunctionReferenceRule extends WordRule { if (c == tagDetector.closedBracket) { if (tagDetector.bracketNesting > 0) { tagDetector.bracketNesting--; - return (IToken)fWords.get(endSeq); + return fWords.get(endSeq); } return fDefaultToken; } @@ -100,7 +100,7 @@ public class FunctionReferenceRule extends WordRule { String buffer= fBuffer.toString(); - IToken token= (IToken)fWords.get(buffer); + IToken token= fWords.get(buffer); if (token != null) { if (buffer.equals(startSeq + GNUMakefileConstants.FUNCTION_CALL) || buffer.equals('$' + startSeq + GNUMakefileConstants.FUNCTION_CALL)) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java index c7fc670694a..18e6a45d8ae 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java @@ -53,7 +53,7 @@ public class CElementHyperlinkDetector extends AbstractHyperlinkDetector { @Override public IHyperlink[] detectHyperlinks(final ITextViewer textViewer, final IRegion region, boolean canShowMultipleHyperlinks) { - ITextEditor textEditor= (ITextEditor) getAdapter(ITextEditor.class); + ITextEditor textEditor= getAdapter(ITextEditor.class); if (region == null || !(textEditor instanceof CEditor)) return null; 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 ea6bacdb341..e49fba91db9 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 @@ -185,7 +185,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi if (fMacroExplorationPresenter != null) { fMacroExplorationPresenter.install(this); } - String[] defaultIndentPrefixes= (String[])fIndentChars.get(IDocument.DEFAULT_CONTENT_TYPE); + String[] defaultIndentPrefixes= fIndentChars.get(IDocument.DEFAULT_CONTENT_TYPE); if (defaultIndentPrefixes != null && defaultIndentPrefixes.length > 0) { final int indentWidth= cConfiguration.getIndentWidth(this); final boolean useSpaces= cConfiguration.useSpacesOnly(this); @@ -409,7 +409,7 @@ public class CSourceViewer extends ProjectionViewer implements IPropertyChangeLi public void prependTextPresentationListener(ITextPresentationListener listener) { Assert.isNotNull(listener); - @SuppressWarnings("unchecked") // using list from base class + // using list from base class List textPresentationListeners= fTextPresentationListeners; if (textPresentationListeners == null) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java index 38fc9121a2f..9edf88df4d7 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/PreprocessorRule.java @@ -139,7 +139,7 @@ public class PreprocessorRule extends WordRule { } scanner.unread(); } - IToken token = (IToken) fWords.get(fBuffer.toString()); + IToken token = fWords.get(fBuffer.toString()); if (token != null) return token; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java index 0b29d7d5854..7111e898b5e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/template/TemplateVariableProcessor.java @@ -100,7 +100,6 @@ public class TemplateVariableProcessor implements IContentAssistProcessor { int length= end - offset; - @SuppressWarnings("unchecked") final Iterator resolvers = fContextType.resolvers(); while (resolvers.hasNext()) { TemplateVariableResolver variable= resolvers.next(); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java index f5ad8891917..f7479147181 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/CSourceViewerConfiguration.java @@ -1049,12 +1049,8 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { }; } - /* - * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkDetectorTargets(org.eclipse.jface.text.source.ISourceViewer) - */ @Override protected Map getHyperlinkDetectorTargets(ISourceViewer sourceViewer) { - @SuppressWarnings("unchecked") Map targets= super.getHyperlinkDetectorTargets(sourceViewer); targets.put("org.eclipse.cdt.ui.cCode", fTextEditor); //$NON-NLS-1$ return targets; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java index 4496fc7c524..c9d16847604 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java @@ -297,7 +297,6 @@ public class CDebugUIUtils { IAnnotationModel annotationModel = editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput()); if (annotationModel != null) { - @SuppressWarnings("unchecked") Iterator iterator = annotationModel.getAnnotationIterator(); while (iterator.hasNext()) { Object object = iterator.next(); diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java index fc97308fbfa..95b04e7897c 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/AbstractToggleBreakpointAdapter.java @@ -846,7 +846,6 @@ abstract public class AbstractToggleBreakpointAdapter IAnnotationModel annotationModel = editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput()); IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput()); if (annotationModel != null) { - @SuppressWarnings("unchecked") Iterator iterator = annotationModel.getAnnotationIterator(); while (iterator.hasNext()) { Object object = iterator.next(); diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java index b7815a3b83b..fa96dd120c3 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java @@ -2829,11 +2829,7 @@ public abstract class DisassemblyPart extends WorkbenchPart implements IDisassem */ protected abstract void closePart(); - /* - * @see org.eclipse.jface.text.ITextPresentationListener#applyTextPresentation(org.eclipse.jface.text.TextPresentation) - */ @Override - @SuppressWarnings("unchecked") public void applyTextPresentation(TextPresentation textPresentation) { IRegion coverage = textPresentation.getExtent(); if (coverage == null) { diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionHyperlinkDetector.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionHyperlinkDetector.java index cff45b3af83..7477cbb2e67 100644 --- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionHyperlinkDetector.java +++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/actions/DsfStepIntoSelectionHyperlinkDetector.java @@ -65,33 +65,21 @@ public class DsfStepIntoSelectionHyperlinkDetector extends AbstractHyperlinkDete fSelectionResolver = selectionResolver; } - /** - * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion() - */ @Override public IRegion getHyperlinkRegion() { return new Region(fSelection.getOffset(), fSelection.getLength()); } - /** - * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText() - */ @Override public String getHyperlinkText() { return Messages.DsfUIStepIntoEditorSelection; } - /** - * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel() - */ @Override public String getTypeLabel() { return null; } - /** - * @see org.eclipse.jface.text.hyperlink.IHyperlink#open() - */ @Override public void open() { // Resolve the debug context @@ -111,15 +99,10 @@ public class DsfStepIntoSelectionHyperlinkDetector extends AbstractHyperlinkDete } } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion, boolean) - */ @Override public IHyperlink[] detectHyperlinks(ITextViewer textViewer, final IRegion region, boolean canShowMultipleHyperlinks) { // Only valid in the context of a selection within the CEditor - ITextEditor editor = (ITextEditor) getAdapter(ITextEditor.class); + ITextEditor editor = getAdapter(ITextEditor.class); if (editor == null || region == null || !(editor instanceof CEditor)) return null;