diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java index 3266dbb844c..13f1aca43d9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/StructureSelectionAction.java @@ -45,7 +45,6 @@ public abstract class StructureSelectionAction extends TextEditorAction { } private final class ExpandSelectionJob extends SharedASTJob { - public ISourceRange newSourceRange; private SourceRange currentSourceRange; @@ -69,7 +68,6 @@ public abstract class StructureSelectionAction extends TextEditorAction { @Override public void run() { - IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); if (!(editorPart instanceof CEditor)) { return; @@ -108,13 +106,11 @@ public abstract class StructureSelectionAction extends TextEditorAction { protected boolean nodeContains(IASTNode node, int position) { IASTFileLocation fl = node.getFileLocation(); - return (position >= fl.getNodeOffset() && position <= fl.getNodeOffset() + fl.getNodeLength()); + return position >= fl.getNodeOffset() && position <= fl.getNodeOffset() + fl.getNodeLength(); } protected boolean samePosition(IASTNode node, SourceRange current) { IASTFileLocation fl = node.getFileLocation(); - return (fl.getNodeOffset() == current.getStartPos() && fl.getNodeLength() == current.getLength()); + return fl.getNodeOffset() == current.getStartPos() && fl.getNodeLength() == current.getLength(); } - - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/SharedASTJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/SharedASTJob.java index 731883094b1..befb5f0e164 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/SharedASTJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/text/SharedASTJob.java @@ -62,7 +62,6 @@ public abstract class SharedASTJob extends Job { */ public abstract IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException; - @Override protected final IStatus run(IProgressMonitor monitor) { ASTProvider provider = CUIPlugin.getDefault().getASTProvider();