Bug 574572: [R-DataEditor] Fix focus if message/dummy is displayed
Change-Id: If612296c0a0ee68bb4d5c0559f6658f1e11b4b0e
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/dataeditor/RDataTableViewer.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/dataeditor/RDataTableViewer.java
index 50d0b59..8971078 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/dataeditor/RDataTableViewer.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/dataeditor/RDataTableViewer.java
@@ -988,10 +988,10 @@
public boolean setFocus() {
- if (this.layout == null || this.layout.topControl == null) {
- return false;
- }
- return this.layout.topControl.forceFocus();
+ Control control;
+ return ((this.layout != null && (control= this.layout.topControl) != null
+ && control.forceFocus() )
+ || this.composite.forceFocus() );
}
public void revealColumn(final long index) {
