aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christian Kouamé2013-05-07 13:59:27 (EDT)
committerAlexandre Montplaisir2013-05-09 15:28:06 (EDT)
commitb5664697b061e740e894de908a8cdedf7e247b03 (patch)
treec8c731f7f0e232c6bf8f41006a884c20000d5ae3
parent7648994de2bfc68231d5283d6bbf41a0bddf351b (diff)
downloadorg.eclipse.linuxtools-b5664697b061e740e894de908a8cdedf7e247b03.zip
org.eclipse.linuxtools-b5664697b061e740e894de908a8cdedf7e247b03.tar.gz
org.eclipse.linuxtools-b5664697b061e740e894de908a8cdedf7e247b03.tar.bz2
TMF: change callsite action textrefs/changes/91/12591/4
this commit change the word "callsite" for "source code" when we are looking for the source of a trace event. Change-Id: Ib5e467b9b7795cddba54114f9855c2e2fff8145b Reviewed-on: https://git.eclipse.org/r/12591 Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im> Reviewed-by: Jean-christian Kouamé <kadjo.gwandy.jean-christian.kouame@ericsson.com> Tested-by: Hudson CI Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com> IP-Clean: Patrick Tasse <patrick.tasse@gmail.com>
-rw-r--r--lttng/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki4
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java8
4 files changed, 12 insertions, 12 deletions
diff --git a/lttng/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki b/lttng/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki
index 11bc14b..0a19897 100644
--- a/lttng/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki
+++ b/lttng/org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki
@@ -418,9 +418,9 @@ To remove a bookmark, double-click its icon, select '''Remove Bookmark''' from t
For CTF traces using specification v1.8.2 or above, information can optionally be embedded in the trace to indicate the source of a trace event. This is accessed through the event context menu by right-clicking on an event in the table.
-==== Callsite ====
+==== Source Code ====
-If a callsite is available in the trace for the selected event, the item '''Open Callsite''' is shown in the context menu. Selecting this menu item will attempt to find the callsite source file in all opened projects in the workspace. If multiple candidates exist, a selection dialog will be shown to the user. The selected source file will be opened in its default language editor. If no candidate is found, an error dialog is shown displaying the callsite information.
+If a source file is available in the trace for the selected event, the item '''Open Source Code''' is shown in the context menu. Selecting this menu item will attempt to find the source file in all opened projects in the workspace. If multiple candidates exist, a selection dialog will be shown to the user. The selected source file will be opened, at the correct line, in its default language editor. If no candidate is found, an error dialog is shown displaying the source code information.
==== EMF Model ====
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java
index bfd43af..0770973 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Messages.java
@@ -72,9 +72,9 @@ public class Messages extends NLS {
public static String TmfEventsTable_FilterHint;
public static String TmfEventsTable_HideRawActionText;
public static String TmfEventsTable_HideTableActionText;
- public static String TmfEventsTable_OpenCallsiteActionText;
- public static String TmfEventsTable_OpenCallsiteNotFound;
- public static String TmfEventsTable_OpenCallsiteSelectFileDialogTitle;
+ public static String TmfEventsTable_OpenSourceCodeActionText;
+ public static String TmfEventsTable_OpenSourceCodeNotFound;
+ public static String TmfEventsTable_OpenSourceCodeSelectFileDialogTitle;
public static String TmfEventsTable_OpenModelActionText;
public static String TmfEventsTable_OpenModelUnsupportedURI;
public static String TmfEventsTable_ReferenceColumnHeader;
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties
index 3edfadf..27f9265 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/messages.properties
@@ -66,9 +66,9 @@ TmfEventsTable_ContentColumnHeader=Content
TmfEventsTable_FilterHint=<filter>
TmfEventsTable_HideRawActionText=Hide Raw
TmfEventsTable_HideTableActionText=Hide Table
-TmfEventsTable_OpenCallsiteActionText=Open Callsite
-TmfEventsTable_OpenCallsiteNotFound=can not be found in the workspace.
-TmfEventsTable_OpenCallsiteSelectFileDialogTitle=Select source file for callsite
+TmfEventsTable_OpenSourceCodeActionText=Open Source Code
+TmfEventsTable_OpenSourceCodeNotFound=can not be found in the workspace.
+TmfEventsTable_OpenSourceCodeSelectFileDialogTitle=Select source file for the call site
TmfEventsTable_OpenModelActionText=Open Model Element
TmfEventsTable_OpenModelUnsupportedURI=is not a supported model URI format.
TmfEventsTable_ReferenceColumnHeader=File
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
index a427771..e2697cb 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
@@ -584,7 +584,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
}
};
- final IAction openCallsiteAction = new Action(Messages.TmfEventsTable_OpenCallsiteActionText) {
+ final IAction openCallsiteAction = new Action(Messages.TmfEventsTable_OpenSourceCodeActionText) {
@Override
public void run() {
final TableItem items[] = fTable.getSelection();
@@ -625,8 +625,8 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
}
});
dialog.setInput(files);
- dialog.setTitle(Messages.TmfEventsTable_OpenCallsiteSelectFileDialogTitle);
- dialog.setMessage(Messages.TmfEventsTable_OpenCallsiteSelectFileDialogTitle + '\n' + cs.toString());
+ dialog.setTitle(Messages.TmfEventsTable_OpenSourceCodeSelectFileDialogTitle);
+ dialog.setMessage(Messages.TmfEventsTable_OpenSourceCodeSelectFileDialogTitle + '\n' + cs.toString());
dialog.open();
Object[] result = dialog.getResult();
if (result != null && result.length > 0) {
@@ -641,7 +641,7 @@ public class TmfEventsTable extends TmfComponent implements IGotoMarker, IColorS
IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), marker);
marker.delete();
} else if (files.size() == 0){
- displayException(new FileNotFoundException('\'' + cs.toString() + '\'' + '\n' + Messages.TmfEventsTable_OpenCallsiteNotFound));
+ displayException(new FileNotFoundException('\'' + cs.toString() + '\'' + '\n' + Messages.TmfEventsTable_OpenSourceCodeNotFound));
}
} catch (CoreException e) {
displayException(e);