tmf: Rename "Next/Previous Event" action to "Next/Previous State Change"

The "Select Next/Previous Event" action in time graph views
semantically selects the next state change, not necessarily
the next event. Rectify the name of the action accordingly.

Change-Id: I3ba52210f11d437f48cf9385945d4d380eff19d1
Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>

diff --git a/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki b/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki
index 6245831a2002483f8759848f76b48ead72f94944..717d516e3e72c2ce652d14eb975e1739d29d5b82 100644 (file)
--- a/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki
+++ b/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki
@@ -1871,11 +1871,11 @@ The Control Flow View '''toolbar''', located at the top right of the view, has s
 | Resets the zoom window to the full range.
 |-
 | [[Image:images/prev_event.gif]]
-| Select Previous Event
+| Select Previous State Change
 | Selects the previous state for the selected process. Pressing the '''Shift''' key at the same time will update the selection end time of the current selection range.
 |-
 | [[Image:images/next_event.gif]]
-| Select Next Event
+| Select Next State Change
 | Selects the next state for the selected process. Pressing the '''Shift''' key at the same time will update the selection end time of the current selection range.
 |-
 | [[Image:images/add_bookmark.gif]]
@@ -2013,11 +2013,11 @@ The Resources View '''toolbar''', located at the top right of the view, has shor
 | Resets the zoom window to the full range.
 |-
 | [[Image:images/prev_event.gif]]
-| Select Previous Event
+| Select Previous State Change
 | Selects the previous state for the selected resource. Pressing the '''Shift''' key at the same time will update the selection end time of the current selection range.
 |-
 | [[Image:images/next_event.gif]]
-| Select Next Event
+| Select Next State Change
 | Selects the next state for the selected resource. Pressing the '''Shift''' key at the same time will update the selection end time of the current selection range.
 |-
 | [[Image:images/add_bookmark.gif]]
@@ -2292,7 +2292,7 @@ Shift-clicking on the time graph will select a time range. When the selection is
 
 Double-clicking on a call stack event will zoom the time graph to the selected function's range of execution.
 
-Clicking the '''Select Next Event''' or '''Select Previous Event''' or using the left and right arrows will navigate to the next or previous call stack event, and select the function currently at the top of the call stack. Note that pressing the '''Shift''' key at the same time will update the selection end time of the current selection.
+Clicking the '''Select Next State Change''' or '''Select Previous State Change''' or using the left and right arrows will navigate to the next or previous call stack event, and select the function currently at the top of the call stack. Note that pressing the '''Shift''' key at the same time will update the selection end time of the current selection.
 
 Clicking the '''Import Mapping File''' ([[Image:images/import.gif]]) icon will open a file selection dialog, allowing you to import a text file containing mappings from function addresses to function names. If the callstack provider for the current trace type only provides function addresses, a mapping file will be required to get the function names in the view. See the following sections for an example with LTTng-UST traces.
 

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ControlFlowViewTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ControlFlowViewTest.java
index 0a5a77fc830020143befd6d578daeb0b0315592f..62b81255a789a22b1fb7c78e552d0be86d136f20 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ControlFlowViewTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ControlFlowViewTest.java
@@ -67,8 +67,8 @@ public class ControlFlowViewTest extends KernelTestBase {
 
     private static final String FOLLOW_CPU_BACKWARD = "Follow CPU Backward";
     private static final String FOLLOW_CPU_FORWARD = "Follow CPU Forward";
-    private static final String SELECT_PREVIOUS_EVENT = "Select Previous Event";
-    private static final String SELECT_NEXT_EVENT = "Select Next Event";
+    private static final String SELECT_PREVIOUS_STATE_CHANGE = "Select Previous State Change";
+    private static final String SELECT_NEXT_STATE_CHANGE = "Select Next State Change";
     private static final String SELECT_NEXT_PROCESS = "Select Next Process";
     private static final Keyboard KEYBOARD = KeyboardFactory.getSWTKeyboard();
     private static final @NonNull ITmfTimestamp START_TIME = TmfTimestamp.fromNanos(1368000272650993664L);
@@ -110,14 +110,14 @@ public class ControlFlowViewTest extends KernelTestBase {
     }
 
     /**
-     * Test tool bar buttons "Select Next Event" and "Select Previous Event"
+     * Test tool bar buttons "Select Next State Change" and "Select Previous State Change"
      */
     @Test
-    public void testToolBarSelectNextPreviousEvent() {
-        testNextPreviousEvent(() -> fViewBot.toolbarButton(SELECT_NEXT_EVENT).click(),
-                () -> fViewBot.toolbarButton(SELECT_NEXT_EVENT).click(SWT.SHIFT),
-                () -> fViewBot.toolbarButton(SELECT_PREVIOUS_EVENT).click(),
-                () -> fViewBot.toolbarButton(SELECT_PREVIOUS_EVENT).click(SWT.SHIFT));
+    public void testToolBarSelectNextPreviousStateChange() {
+        testNextPreviousEvent(() -> fViewBot.toolbarButton(SELECT_NEXT_STATE_CHANGE).click(),
+                () -> fViewBot.toolbarButton(SELECT_NEXT_STATE_CHANGE).click(SWT.SHIFT),
+                () -> fViewBot.toolbarButton(SELECT_PREVIOUS_STATE_CHANGE).click(),
+                () -> fViewBot.toolbarButton(SELECT_PREVIOUS_STATE_CHANGE).click(SWT.SHIFT));
     }
 
     private void testNextPreviousEvent(Runnable selectNext, Runnable shiftSelectNext, Runnable selectPrevious, Runnable shiftSelectPrevious) {
@@ -144,7 +144,7 @@ public class ControlFlowViewTest extends KernelTestBase {
             }
         });
 
-        /* click "Select Next Event" 3 times */
+        /* click "Select Next State Change" 3 times */
         selectNext.run();
         timeGraphIsReadyCondition(new TmfTimeRange(TID1_TIME1, TID1_TIME1));
         selectNext.run();
@@ -154,7 +154,7 @@ public class ControlFlowViewTest extends KernelTestBase {
         fBot.waitUntil(ConditionHelpers.selectionRange(new TmfTimeRange(TID1_TIME3, TID1_TIME3)));
         assertTrue(TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange().contains(TID1_TIME3));
 
-        /* shift-click "Select Next Event" 3 times */
+        /* shift-click "Select Next State Change" 3 times */
         shiftSelectNext.run();
         timeGraphIsReadyCondition(new TmfTimeRange(TID1_TIME3, TID1_TIME4));
         shiftSelectNext.run();
@@ -164,7 +164,7 @@ public class ControlFlowViewTest extends KernelTestBase {
         fBot.waitUntil(ConditionHelpers.selectionRange(new TmfTimeRange(TID1_TIME3, TID1_TIME6)));
         assertTrue(TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange().contains(TID1_TIME6));
 
-        /* shift-click "Select Previous Event" 4 times */
+        /* shift-click "Select Previous State Change" 4 times */
         shiftSelectPrevious.run();
         timeGraphIsReadyCondition(new TmfTimeRange(TID1_TIME3, TID1_TIME5));
         shiftSelectPrevious.run();
@@ -176,7 +176,7 @@ public class ControlFlowViewTest extends KernelTestBase {
         fBot.waitUntil(ConditionHelpers.selectionRange(new TmfTimeRange(TID1_TIME3, TID1_TIME2)));
         assertTrue(TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange().contains(TID1_TIME2));
 
-        /* click "Select Next Event" 2 times */
+        /* click "Select Next State Change" 2 times */
         selectNext.run();
         timeGraphIsReadyCondition(new TmfTimeRange(TID1_TIME3, TID1_TIME3));
         selectNext.run();
@@ -184,7 +184,7 @@ public class ControlFlowViewTest extends KernelTestBase {
         fBot.waitUntil(ConditionHelpers.selectionRange(new TmfTimeRange(TID1_TIME4, TID1_TIME4)));
         assertTrue(TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange().contains(TID1_TIME4));
 
-        /* shift-click "Select Previous Event" 3 times */
+        /* shift-click "Select Previous State Change" 3 times */
         shiftSelectPrevious.run();
         timeGraphIsReadyCondition(new TmfTimeRange(TID1_TIME4, TID1_TIME3));
         shiftSelectPrevious.run();
@@ -194,7 +194,7 @@ public class ControlFlowViewTest extends KernelTestBase {
         fBot.waitUntil(ConditionHelpers.selectionRange(new TmfTimeRange(TID1_TIME4, TID1_TIME1)));
         assertTrue(TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange().contains(TID1_TIME1));
 
-        /* shift-click "Select Next Event" 4 times */
+        /* shift-click "Select Next State Change" 4 times */
         shiftSelectNext.run();
         timeGraphIsReadyCondition(new TmfTimeRange(TID1_TIME4, TID1_TIME2));
         shiftSelectNext.run();
@@ -206,7 +206,7 @@ public class ControlFlowViewTest extends KernelTestBase {
         fBot.waitUntil(ConditionHelpers.selectionRange(new TmfTimeRange(TID1_TIME4, TID1_TIME5)));
         assertTrue(TmfTraceManager.getInstance().getCurrentTraceContext().getWindowRange().contains(TID1_TIME5));
 
-        /* click "Select Previous Event" 5 times */
+        /* click "Select Previous State Change" 5 times */
         selectPrevious.run();
         timeGraphIsReadyCondition(new TmfTimeRange(TID1_TIME4, TID1_TIME4));
         selectPrevious.run();

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesViewTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesViewTest.java
index c3fa7469c6f11f15e11e739e84ff9a0469f08096..8e1ae21d178f83e668a613ae318e94d47d2694c7 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesViewTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesViewTest.java
@@ -54,8 +54,8 @@ public class ResourcesViewTest extends KernelTestBase {
 
     private static final String NEXT_MARKER = "Next Marker";
     private static final String PREVIOUS_MARKER = "Previous Marker";
-    private static final String SELECT_NEXT_EVENT = "Select Next Event";
-    private static final String SELECT_PREVIOUS_EVENT = "Select Previous Event";
+    private static final String SELECT_NEXT_STATE_CHANGE = "Select Next State Change";
+    private static final String SELECT_PREVIOUS_STATE_CHANGE = "Select Previous State Change";
     private static final String ADD_BOOKMARK = "Add Bookmark...";
     private static final String REMOVE_BOOKMARK = "Remove Bookmark";
     private static final String ADD_BOOKMARK_DIALOG = "Add Bookmark";
@@ -235,10 +235,10 @@ public class ResourcesViewTest extends KernelTestBase {
         KEYBOARD.pressShortcut(Keystrokes.HOME);
         KEYBOARD.pressShortcut(Keystrokes.DOWN);
 
-        /* click "Select Next Event" 2 times */
-        fViewBot.toolbarButton(SELECT_NEXT_EVENT).click();
+        /* click "Select Next State Change" 2 times */
+        fViewBot.toolbarButton(SELECT_NEXT_STATE_CHANGE).click();
         timeGraphIsReadyCondition(new TmfTimeRange(CPU0_TIME1, CPU0_TIME1), CPU0_TIME1);
-        fViewBot.toolbarButton(SELECT_NEXT_EVENT).click();
+        fViewBot.toolbarButton(SELECT_NEXT_STATE_CHANGE).click();
         timeGraphIsReadyCondition(new TmfTimeRange(CPU0_TIME2, CPU0_TIME2), CPU0_TIME2);
 
         /* click "Add Bookmark..." and fill Add Bookmark dialog */
@@ -247,12 +247,12 @@ public class ResourcesViewTest extends KernelTestBase {
         dialogBot.text().setText("B1");
         dialogBot.button(OK).click();
 
-        /* click "Select Next Event" 2 times and shift-click "Select Next Event*/
-        fViewBot.toolbarButton(SELECT_NEXT_EVENT).click();
+        /* click "Select Next State Change" 2 times and shift-click "Select Next State Change*/
+        fViewBot.toolbarButton(SELECT_NEXT_STATE_CHANGE).click();
         timeGraphIsReadyCondition(new TmfTimeRange(CPU0_TIME3, CPU0_TIME3), CPU0_TIME3);
-        fViewBot.toolbarButton(SELECT_NEXT_EVENT).click();
+        fViewBot.toolbarButton(SELECT_NEXT_STATE_CHANGE).click();
         timeGraphIsReadyCondition(new TmfTimeRange(CPU0_TIME4, CPU0_TIME4), CPU0_TIME4);
-        fViewBot.toolbarButton(SELECT_NEXT_EVENT).click(SWT.SHIFT);
+        fViewBot.toolbarButton(SELECT_NEXT_STATE_CHANGE).click(SWT.SHIFT);
         timeGraphIsReadyCondition(new TmfTimeRange(CPU0_TIME4, CPU0_TIME5), CPU0_TIME5);
 
         /* click "Add Bookmark..." and fill Add Bookmark dialog */
@@ -279,8 +279,8 @@ public class ResourcesViewTest extends KernelTestBase {
         fViewBot.toolbarButton(PREVIOUS_MARKER).click();
         timeGraphIsReadyCondition(new TmfTimeRange(CPU0_TIME4, CPU0_TIME5), CPU0_TIME5);
 
-        /* click "Select Previous Event" */
-        fViewBot.toolbarButton(SELECT_PREVIOUS_EVENT).click();
+        /* click "Select Previous State Change" */
+        fViewBot.toolbarButton(SELECT_PREVIOUS_STATE_CHANGE).click();
         timeGraphIsReadyCondition(new TmfTimeRange(CPU0_TIME4, CPU0_TIME4), CPU0_TIME4);
     }
 

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java
index 89cb7cc3d87f3573fa7bae1dc9b45cded8910665..1bbad5616128554e9a3f5c522cd18d2beee1a782 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java
@@ -111,8 +111,8 @@ public class CallStackViewTest {
     private static final @NonNull String SHOW_VIEW_FILTERS = "Show View Filters";
     // Separator
     private static final @NonNull String RESET_TIME_SCALE = "Reset the Time Scale to Default";
-    private static final @NonNull String SELECT_PREVIOUS_EVENT = "Select Previous Event";
-    private static final @NonNull String SELECT_NEXT_EVENT = "Select Next Event";
+    private static final @NonNull String SELECT_PREVIOUS_STATE_CHANGE = "Select Previous State Change";
+    private static final @NonNull String SELECT_NEXT_STATE_CHANGE = "Select Next State Change";
     // Separator
     private static final @NonNull String ADD_BOOKMARK = "Add Bookmark...";
     private static final @NonNull String PREVIOUS_MARKER = "Previous Marker";
@@ -131,7 +131,7 @@ public class CallStackViewTest {
             "",
             SHOW_VIEW_FILTERS,
             "",
-            RESET_TIME_SCALE, SELECT_PREVIOUS_EVENT, SELECT_NEXT_EVENT,
+            RESET_TIME_SCALE, SELECT_PREVIOUS_STATE_CHANGE, SELECT_NEXT_STATE_CHANGE,
             "",
             ADD_BOOKMARK, PREVIOUS_MARKER, NEXT_MARKER,
             "",
@@ -228,7 +228,7 @@ public class CallStackViewTest {
         final SWTBotView viewBot = fBot.viewById(CallStackView.ID);
         // forward 10 times
         for (int i = 0; i < 10; i++) {
-            viewBot.toolbarPushButton(SELECT_NEXT_EVENT).click();
+            viewBot.toolbarPushButton(SELECT_NEXT_STATE_CHANGE).click();
             currentEventOffset++;
             fBot.waitUntil(ConditionHelpers.selectionInEventsTable(fBot, TIMESTAMPS[currentEventOffset]));
             SWTBotUtils.waitForJobs();
@@ -237,7 +237,7 @@ public class CallStackViewTest {
         }
         // back twice
         for (int i = 0; i < 2; i++) {
-            viewBot.toolbarPushButton(SELECT_PREVIOUS_EVENT).click();
+            viewBot.toolbarPushButton(SELECT_PREVIOUS_STATE_CHANGE).click();
             currentEventOffset--;
             fBot.waitUntil(ConditionHelpers.selectionInEventsTable(fBot, TIMESTAMPS[currentEventOffset]));
             SWTBotUtils.waitForJobs();

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java b/tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java
index dfb53eb9b8709e75fcc83c6e14aff320e240b55f..8e5c49b57775828337b33793499884b729c4a834 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.tests/widgetStubs/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/test/stub/views/TsfTraceAnalysisView.java
@@ -426,7 +426,7 @@ public class TsfTraceAnalysisView extends ViewPart implements
             }
         };
         nextTrace.setText("NextTrace");
-        nextTrace.setToolTipText("Select Next Event");
+        nextTrace.setToolTipText("Select Next State Change");
 
         // action8
         prevTrace = new Action() {

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/ITmfImageConstants.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/ITmfImageConstants.java
index fe36eef1876a567a4c623df7599b4af63b95f396..68411426c3064a397c6eba91d518b44ccffa5bc0 100755 (executable)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/ITmfImageConstants.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/ITmfImageConstants.java
@@ -36,8 +36,8 @@ public interface ITmfImageConstants {
     String IMG_UI_FIRST_PAGE = ICONS_PATH + "elcl16/backward_nav.gif";
     String IMG_UI_LAST_PAGE = ICONS_PATH + "elcl16/forward_nav.gif";
     String IMG_UI_SHOW_LEGEND = ICONS_PATH + "elcl16/show_legend.gif";
-    String IMG_UI_NEXT_EVENT = ICONS_PATH + "elcl16/next_event.gif";
-    String IMG_UI_PREV_EVENT = ICONS_PATH + "elcl16/prev_event.gif";
+    String IMG_UI_NEXT_STATE_CHANGE = ICONS_PATH + "elcl16/next_event.gif";
+    String IMG_UI_PREV_STATE_CHANGE = ICONS_PATH + "elcl16/prev_event.gif";
     String IMG_UI_ADD_BOOKMARK = ICONS_PATH + "elcl16/add_bookmark.gif";
     String IMG_UI_NEXT_BOOKMARK = ICONS_PATH + "elcl16/next_bookmark.gif";
     String IMG_UI_PREVIOUS_BOOKMARK = ICONS_PATH + "elcl16/prev_bookmark.gif";

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
index 1151ab56aeb127390983201953d6a5bb8fb053d5..ee43e12fb21dd2cf98e9d5c09722af646beca0e4 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/Messages.java
@@ -116,10 +116,10 @@ public class Messages extends NLS {
     public static String TmfTimeGraphViewer_ResetScaleActionToolTipText;
     public static String TmfTimeGraphViewer_LegendActionNameText;
     public static String TmfTimeGraphViewer_LegendActionToolTipText;
-    public static String TmfTimeGraphViewer_NextEventActionNameText;
-    public static String TmfTimeGraphViewer_NextEventActionToolTipText;
-    public static String TmfTimeGraphViewer_PreviousEventActionNameText;
-    public static String TmfTimeGraphViewer_PreviousEventActionToolTipText;
+    public static String TmfTimeGraphViewer_NextStateChangeActionNameText;
+    public static String TmfTimeGraphViewer_NextStateChangeActionToolTipText;
+    public static String TmfTimeGraphViewer_PreviousStateChangeActionNameText;
+    public static String TmfTimeGraphViewer_PreviousStateChangeActionToolTipText;
     public static String TmfTimeGraphViewer_NextItemActionNameText;
     public static String TmfTimeGraphViewer_NextItemActionToolTipText;
     public static String TmfTimeGraphViewer_PreviousItemActionNameText;

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
index 6fd59177cf82a70d17ef8bd76a914994b1ca04f9..acd5432b20de8dc3ba5257d777ff4b4ece157062 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/messages.properties
@@ -113,10 +113,10 @@ TmfTimeGraphViewer_ResetScaleActionNameText=Reset
 TmfTimeGraphViewer_ResetScaleActionToolTipText=Reset the Time Scale to Default
 TmfTimeGraphViewer_LegendActionNameText=Legend
 TmfTimeGraphViewer_LegendActionToolTipText=Show Legend
-TmfTimeGraphViewer_NextEventActionNameText=Next Event
-TmfTimeGraphViewer_NextEventActionToolTipText=Select Next Event
-TmfTimeGraphViewer_PreviousEventActionNameText=Previous Event
-TmfTimeGraphViewer_PreviousEventActionToolTipText=Select Previous Event
+TmfTimeGraphViewer_NextStateChangeActionNameText=Next State Change
+TmfTimeGraphViewer_NextStateChangeActionToolTipText=Select Next State Change
+TmfTimeGraphViewer_PreviousStateChangeActionNameText=Previous State Change
+TmfTimeGraphViewer_PreviousStateChangeActionToolTipText=Select Previous State Change
 TmfTimeGraphViewer_NextItemActionNameText=Next Item
 TmfTimeGraphViewer_NextItemActionToolTipText=Select Next Item
 TmfTimeGraphViewer_PreviousItemActionNameText=Previous Item

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackView.java
index 3bd838adef6391b17c84fbe2292a4e5584411115..f5eb13beeb1bbc75b1145daa147e0404c861f514 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/CallStackView.java
@@ -1003,9 +1003,9 @@ public class CallStackView extends AbstractTimeGraphView {
                 }
             };
 
-            fNextEventAction.setText(Messages.TmfTimeGraphViewer_NextEventActionNameText);
-            fNextEventAction.setToolTipText(Messages.TmfTimeGraphViewer_NextEventActionToolTipText);
-            fNextEventAction.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_NEXT_EVENT));
+            fNextEventAction.setText(Messages.TmfTimeGraphViewer_NextStateChangeActionNameText);
+            fNextEventAction.setToolTipText(Messages.TmfTimeGraphViewer_NextStateChangeActionToolTipText);
+            fNextEventAction.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_NEXT_STATE_CHANGE));
         }
 
         return fNextEventAction;
@@ -1048,9 +1048,9 @@ public class CallStackView extends AbstractTimeGraphView {
                 }
             };
 
-            fPrevEventAction.setText(Messages.TmfTimeGraphViewer_PreviousEventActionNameText);
-            fPrevEventAction.setToolTipText(Messages.TmfTimeGraphViewer_PreviousEventActionToolTipText);
-            fPrevEventAction.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_PREV_EVENT));
+            fPrevEventAction.setText(Messages.TmfTimeGraphViewer_PreviousStateChangeActionNameText);
+            fPrevEventAction.setToolTipText(Messages.TmfTimeGraphViewer_PreviousStateChangeActionToolTipText);
+            fPrevEventAction.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_PREV_STATE_CHANGE));
         }
 
         return fPrevEventAction;

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
index 976eafec7bb79eee227e700b0371c688ad2ed8bb..2696a1d5b23e21e82d2255a7afb13e2976f5f7f1 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
@@ -1939,9 +1939,9 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
                 }
             };
 
-            fNextEventAction.setText(Messages.TmfTimeGraphViewer_NextEventActionNameText);
-            fNextEventAction.setToolTipText(Messages.TmfTimeGraphViewer_NextEventActionToolTipText);
-            fNextEventAction.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_NEXT_EVENT));
+            fNextEventAction.setText(Messages.TmfTimeGraphViewer_NextStateChangeActionNameText);
+            fNextEventAction.setToolTipText(Messages.TmfTimeGraphViewer_NextStateChangeActionToolTipText);
+            fNextEventAction.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_NEXT_STATE_CHANGE));
         }
 
         return fNextEventAction;
@@ -1962,9 +1962,9 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
                 }
             };
 
-            fPrevEventAction.setText(Messages.TmfTimeGraphViewer_PreviousEventActionNameText);
-            fPrevEventAction.setToolTipText(Messages.TmfTimeGraphViewer_PreviousEventActionToolTipText);
-            fPrevEventAction.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_PREV_EVENT));
+            fPrevEventAction.setText(Messages.TmfTimeGraphViewer_PreviousStateChangeActionNameText);
+            fPrevEventAction.setToolTipText(Messages.TmfTimeGraphViewer_PreviousStateChangeActionToolTipText);
+            fPrevEventAction.setImageDescriptor(Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_PREV_STATE_CHANGE));
         }
 
         return fPrevEventAction;