Re-structure LTTng sub-project as per the Linux Tools guidelines

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / views / events / EventsTable.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
index c74bb960ebeb7aac9ccc42db5d161d96257ff5bf..c5e149bad63a08223e646edd8b31543bf0f90ea7 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/EventsTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************\r
- * Copyright (c) 2009, 2010 Ericsson\r
+ * Copyright (c) 2009, 2010, 2011 Ericsson\r
  * \r
  * All rights reserved. This program and the accompanying materials are\r
  * made available under the terms of the Eclipse Public License v1.0 which\r
@@ -8,19 +8,18 @@
  * \r
  * Contributors:\r
  *   Francois Chouinard - Initial API and implementation\r
+ *   Francois Chouinard - Aligned columns with domain terminology\r
  *******************************************************************************/\r
 \r
 package org.eclipse.linuxtools.lttng.ui.views.events;\r
 \r
-import org.eclipse.linuxtools.lttng.event.LttngEventContent;\r
-import org.eclipse.linuxtools.tmf.event.TmfEvent;\r
+import org.eclipse.linuxtools.lttng.core.event.LttngEventContent;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEvent;\r
+import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;\r
 import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable;\r
+import org.eclipse.linuxtools.tmf.ui.widgets.ColumnData;\r
 import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.events.SelectionEvent;\r
-import org.eclipse.swt.events.SelectionListener;\r
 import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Table;\r
-import org.eclipse.swt.widgets.TableColumn;\r
 \r
 public class EventsTable extends TmfEventsTable {\r
 \r
@@ -29,38 +28,22 @@ public class EventsTable extends TmfEventsTable {
     // ------------------------------------------------------------------------\r
 \r
     // Table column names\r
-    static private final String TIMESTAMP_COLUMN = "Timestamp";\r
-    static private final String SOURCE_COLUMN    = "Source";\r
-    static private final String TYPE_COLUMN      = "Type";\r
-    static private final String REFERENCE_COLUMN = "Reference";\r
-    static private final String CONTENT_COLUMN   = "Content";\r
-    static private final String[] COLUMN_NAMES =  new String[] {\r
-        TIMESTAMP_COLUMN,\r
-        SOURCE_COLUMN,\r
-        TYPE_COLUMN,\r
-        REFERENCE_COLUMN,\r
-        CONTENT_COLUMN\r
-    };\r
-\r
-    // Column data\r
-    static private class ColumnData {\r
-        public final String header;\r
-        public final int    width;\r
-        public final int    alignment;\r
-\r
-        public ColumnData(String h, int w, int a) {\r
-            header = h;\r
-            width = w;\r
-            alignment = a;\r
-        }\r
+    static private final String TIMESTAMP_COLUMN = Messages.EventsTable_timestampColumn;\r
+    static private final String TRACE_COLUMN = Messages.EventsTable_traceColumn;\r
+    static private final String MARKER_COLUMN = Messages.EventsTable_markerColumn;\r
+    static private final String CONTENT_COLUMN = Messages.EventsTable_contentColumn;\r
+    static private final String[] COLUMN_NAMES = new String[] {\r
+            TIMESTAMP_COLUMN,\r
+            TRACE_COLUMN,\r
+            MARKER_COLUMN,\r
+            CONTENT_COLUMN\r
     };\r
 \r
     static private final ColumnData[] COLUMN_DATA = new ColumnData[] {\r
-        new ColumnData(COLUMN_NAMES[0], 125, SWT.LEFT),\r
-        new ColumnData(COLUMN_NAMES[1], 100, SWT.LEFT),\r
-        new ColumnData(COLUMN_NAMES[2], 200, SWT.LEFT),\r
-        new ColumnData(COLUMN_NAMES[3], 200, SWT.LEFT),\r
-        new ColumnData(COLUMN_NAMES[4], 100, SWT.LEFT)\r
+            new ColumnData(COLUMN_NAMES[0], 150, SWT.LEFT),\r
+            new ColumnData(COLUMN_NAMES[1], 120, SWT.LEFT),\r
+            new ColumnData(COLUMN_NAMES[2], 200, SWT.LEFT),\r
+            new ColumnData(COLUMN_NAMES[3], 100, SWT.LEFT)\r
     };\r
 \r
     // ------------------------------------------------------------------------\r
@@ -68,31 +51,11 @@ public class EventsTable extends TmfEventsTable {
     // ------------------------------------------------------------------------\r
 \r
     public EventsTable(Composite parent, int cacheSize) {\r
-        super(parent, cacheSize);\r
-    }\r
-\r
-    /**\r
-     * @param table\r
-     * \r
-     * FIXME: Add support for column selection\r
-     */\r
-    @Override\r
-    protected void createColumnHeaders(Table table) {\r
-        for (int i = 0; i < COLUMN_DATA.length; i++) {\r
-            final TableColumn column = new TableColumn(table, COLUMN_DATA[i].alignment, i);\r
-            column.setText(COLUMN_DATA[i].header);\r
-            column.setWidth(COLUMN_DATA[i].width);\r
-            // TODO: Investigate why the column resizing doesn't work by default\r
-            // Anything to do with SWT_VIRTUAL?\r
-            column.addSelectionListener(new SelectionListener() {\r
-                public void widgetDefaultSelected(SelectionEvent e) {\r
-                    // TODO Auto-generated method stub\r
-                }\r
-                public void widgetSelected(SelectionEvent e) {\r
-                    column.pack();\r
-                }\r
-            });\r
-        }\r
+        super(parent, cacheSize, COLUMN_DATA);\r
+        fTable.getColumns()[0].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_TIMESTAMP);\r
+        fTable.getColumns()[1].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_REFERENCE);\r
+        fTable.getColumns()[2].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_TYPE);\r
+        fTable.getColumns()[3].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_CONTENT);\r
     }\r
 \r
     /**\r
@@ -102,15 +65,14 @@ public class EventsTable extends TmfEventsTable {
     @Override\r
     protected String[] extractItemFields(TmfEvent event) {\r
         String[] fields = new String[0];\r
-        \r
+\r
         if (event != null) {\r
             fields = new String[] {\r
                     event.getTimestamp().toString(),\r
-                    event.getSource().toString(),\r
-                    event.getType().toString(),\r
                     event.getReference().toString(),\r
-                    ((LttngEventContent)event.getContent()).toString() \r
-                };\r
+                    event.getType().toString(),\r
+                    ((LttngEventContent) event.getContent()).toString()\r
+            };\r
         }\r
         return fields;\r
     }\r