Align Events table column with domain terminology

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 0460df6ad7badb9d928d4fb42821923b9678113f..c1c4a04bf0208aef59c6e46f6a5c959a3c06a71a 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,6 +8,7 @@
  * \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
@@ -28,24 +29,21 @@ public class EventsTable extends TmfEventsTable {
 \r
     // Table column names\r
     static private final String TIMESTAMP_COLUMN = Messages.EventsTable_timestampColumn;\r
-    static private final String SOURCE_COLUMN    = Messages.EventsTable_sourceColumn;\r
-    static private final String TYPE_COLUMN      = Messages.EventsTable_typeColumn;\r
-    static private final String REFERENCE_COLUMN = Messages.EventsTable_referenceColumn;\r
-    static private final String CONTENT_COLUMN   = Messages.EventsTable_contentColumn;\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
+    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
@@ -55,10 +53,9 @@ public class EventsTable extends TmfEventsTable {
     public EventsTable(Composite parent, int cacheSize) {\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_SOURCE);\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_REFERENCE);\r
-        fTable.getColumns()[4].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_CONTENT);\r
+        fTable.getColumns()[3].setData(Key.FIELD_ID, TmfEventContent.FIELD_ID_CONTENT);\r
     }\r
 \r
     /**\r
@@ -68,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

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java
index c3dfaa96950c93a661a4bc4837a32413d39c0d0b..26ffa955d9cc02831b7ac4e6f68ebd54d0eeced5 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/Messages.java
@@ -4,11 +4,10 @@ import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
        private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng.ui.views.events.messages"; //$NON-NLS-1$
-       public static String EventsTable_contentColumn;
-       public static String EventsTable_referenceColumn;
-       public static String EventsTable_sourceColumn;
+       public static String EventsTable_traceColumn;
        public static String EventsTable_timestampColumn;
-       public static String EventsTable_typeColumn;
+       public static String EventsTable_markerColumn;
+    public static String EventsTable_contentColumn;
        static {
                // initialize resource bundle
                NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties
index f7d177be182668b37c0b00f7046ac244b2c9622c..4e6dfa8c5de8ec82b27bb6f549c65f8adf936be7 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/events/messages.properties
@@ -1,5 +1,4 @@
-EventsTable_contentColumn=Content
-EventsTable_referenceColumn=Reference
-EventsTable_sourceColumn=Source
+EventsTable_traceColumn=Trace
 EventsTable_timestampColumn=Timestamp
-EventsTable_typeColumn=Type
+EventsTable_markerColumn=Marker
+EventsTable_contentColumn=Content