summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorJean-Christian Kouamé2013-07-10 10:54:54 (EDT)
committer Alexandre Montplaisir2013-07-16 21:10:55 (EDT)
commit24117eb00b0515afeeeac94317699347db59eaae (patch)
tree97193abdfe6c7ae174b2bce9651c8b99006a62b6
parenteb89adf93e110820907276acac9ffb72b80aa8ee (diff)
downloadorg.eclipse.linuxtools-24117eb00b0515afeeeac94317699347db59eaae.zip
org.eclipse.linuxtools-24117eb00b0515afeeeac94317699347db59eaae.tar.gz
org.eclipse.linuxtools-24117eb00b0515afeeeac94317699347db59eaae.tar.bz2
tmf : show environment variables of traces under Experimentsrefs/changes/63/14463/3
Fixes bug 407756 Change-Id: Ia3576e9ad95a397ce4725d1a72eec8f8310119d6 Signed-off-by: Jean-Christian Kouamé <kadjo.gwandy.jean-christian.kouame@ericsson.com> Reviewed-on: https://git.eclipse.org/r/14463 Tested-by: Hudson CI Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im> IP-Clean: Alexandre Montplaisir <alexmonthy@voxpopuli.im> Tested-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java
index bb0c361..0abd421 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java
@@ -421,11 +421,13 @@ public class TmfTraceElement extends TmfWithFolderElement implements IActionFilt
* respectively as keys and values
*/
private Map<String, String> getTraceProperties() {
- for (ITmfTrace trace : TmfTraceManager.getInstance().getOpenedTraces()) {
- if (trace.getResource().equals(this.getResource())) {
- if (trace instanceof ITmfTraceProperties) {
- ITmfTraceProperties traceProperties = (ITmfTraceProperties) trace;
- return traceProperties.getTraceProperties();
+ for (ITmfTrace openedTrace : TmfTraceManager.getInstance().getOpenedTraces()) {
+ for (ITmfTrace singleTrace : TmfTraceManager.getTraceSet(openedTrace)) {
+ if (this.getLocation().toString().endsWith(singleTrace.getPath())) {
+ if (singleTrace instanceof ITmfTraceProperties) {
+ ITmfTraceProperties traceProperties = (ITmfTraceProperties) singleTrace;
+ return traceProperties.getTraceProperties();
+ }
}
}
}