tmf: Change Offset Dialog advanced mode layout

Change-Id: I06d67eed0b6a8c8cc341a36079baa069507eb065
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/35556
Tested-by: Hudson CI
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>

diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/dialogs/offset/OffsetDialog.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/dialogs/offset/OffsetDialog.java
index 78564a2ded7cd28c2baed0dfbe13ac1a557b52f2..ef6ffaa32ad692da77938362f8d247b77c208bd0 100644 (file)
--- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/dialogs/offset/OffsetDialog.java
+++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/dialogs/offset/OffsetDialog.java
@@ -96,8 +96,8 @@ public class OffsetDialog extends Dialog {
     private FilteredTree fViewer;
 
     private boolean fAdvancedMode = true;
-    private TreeColumn fRefTimeColumn;
     private TreeViewerColumn fButtonViewerColumn;
+    private TreeColumn fRefTimeColumn;
     private TreeColumn fTargetTimeColumn;
 
     private abstract class ColumnEditingSupport extends EditingSupport {
@@ -341,16 +341,6 @@ public class OffsetDialog extends Dialog {
             }
         });
 
-        column = createTreeViewerColumn(Messages.OffsetDialog_ReferenceTime, SWT.RIGHT);
-        column.setLabelProvider(new ColumnLabelProvider() {
-            @Override
-            public String getText(Object element) {
-                return super.getText(fRefTimeMap.get(element));
-            }
-        });
-        column.setEditingSupport(new RefTimeEditingSupport(fViewer.getViewer(), textCellEditor));
-        fRefTimeColumn = column.getColumn();
-
         column = createTreeViewerColumn(Messages.OffsetDialog_OffsetTime, SWT.RIGHT);
         column.setLabelProvider(new ColumnLabelProvider() {
             @Override
@@ -374,6 +364,16 @@ public class OffsetDialog extends Dialog {
         column.getColumn().setResizable(false);
         fButtonViewerColumn = column;
 
+        column = createTreeViewerColumn(Messages.OffsetDialog_ReferenceTime, SWT.RIGHT);
+        column.setLabelProvider(new ColumnLabelProvider() {
+            @Override
+            public String getText(Object element) {
+                return super.getText(fRefTimeMap.get(element));
+            }
+        });
+        column.setEditingSupport(new RefTimeEditingSupport(fViewer.getViewer(), textCellEditor));
+        fRefTimeColumn = column.getColumn();
+
         column = createTreeViewerColumn(Messages.OffsetDialog_TargetTime, SWT.RIGHT);
         column.setLabelProvider(new ColumnLabelProvider() {
             @Override
@@ -427,7 +427,7 @@ public class OffsetDialog extends Dialog {
             });
             treeEditor.grabHorizontal = true;
             treeEditor.minimumWidth = TREE_EDITOR_MIN_WIDTH;
-            treeEditor.setEditor(applyButton, treeItem, 3);
+            treeEditor.setEditor(applyButton, treeItem, 2);
             treeItem.setData(EDITOR_KEY, applyButton);
         }
 
@@ -487,19 +487,19 @@ public class OffsetDialog extends Dialog {
             Control editor = (Control) treeItem.getData(EDITOR_KEY);
             editor.setVisible(false);
         }
+        fTargetTimeColumn.setWidth(0);
+        fTargetTimeColumn.setResizable(false);
         fRefTimeColumn.setWidth(0);
         fRefTimeColumn.setResizable(false);
         fButtonViewerColumn.getColumn().setWidth(0);
-        fTargetTimeColumn.setWidth(0);
-        fTargetTimeColumn.setResizable(false);
         fAdvancedMessageLabel.setText("");  //$NON-NLS-1$
     }
 
     private void setAdvancedMode() {
         fAdvancedMode = true;
+        fButtonViewerColumn.getColumn().setWidth(TREE_EDITOR_MIN_WIDTH);
         fRefTimeColumn.setWidth((Integer) fRefTimeColumn.getData(WIDTH_KEY));
         fRefTimeColumn.setResizable(true);
-        fButtonViewerColumn.getColumn().setWidth(TREE_EDITOR_MIN_WIDTH);
         fTargetTimeColumn.setWidth((Integer) fTargetTimeColumn.getData(WIDTH_KEY));
         fTargetTimeColumn.setResizable(true);
         for (TreeItem treeItem : fViewer.getViewer().getTree().getItems()) {