aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2013-04-18 05:44:13 -0400
committerTomasz Zarna2013-04-18 05:44:13 -0400
commitc4ef76516ec540dce37c3ea5aa853a3e293e912a (patch)
treee92af47b9e8b8ad45f1322f08d2a0507de45f42c
parent15e131be4da7ee8268e7462a7c965c4d6bb21fc4 (diff)
downloadeclipse.platform.team-c4ef76516ec540dce37c3ea5aa853a3e293e912a.zip
eclipse.platform.team-c4ef76516ec540dce37c3ea5aa853a3e293e912a.tar.gz
eclipse.platform.team-c4ef76516ec540dce37c3ea5aa853a3e293e912a.tar.xz
Fix ambiguous invocation of either an outer or inherited method
Found by FindBugs: An inner class is invoking a method that could be resolved to either a inherited method or a method defined in an outer class. By the Java semantics, it will be resolved to invoke the inherited method, which is intended. To make the intention clear to other readers of your code and to FindBugs that you want to invoke the inherited method, not the method in the outer class, invoke it by invoking the method on super (i.e. super.setEnabled(..)). Change-Id: If00f20701b6221ec0cc0c10485a43dc09a86afb4
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
index a06dc47..d716ef1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
@@ -135,7 +135,7 @@ public class MergeSourceViewer implements ISelectionChangedListener,
}
public void update() {
- this.setEnabled(isEnabled());
+ super.setEnabled(isEnabled());
}
}