tmf: Consolidate all enviornment-related methods in CtfTmfTrace

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / tmf / ui / views / environment / TmfEnvironmentView.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java
index 5e7d0745eefd15db7f363a529aae5a7af78819a6..836a588c73cdcbde354be964e748cee1da7d5cc4 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/environment/TmfEnvironmentView.java
@@ -12,6 +12,8 @@
  *******************************************************************************/
 package org.eclipse.linuxtools.tmf.ui.views.environment;
 
+import java.util.Map;
+
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace;
 import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
 import org.eclipse.linuxtools.tmf.core.signal.TmfTraceClosedSignal;
@@ -78,14 +80,18 @@ public class TmfEnvironmentView extends TmfView {
         }
 
         for (ITmfTrace trace : TmfTraceManager.getTraceSet(fTrace)) {
+            // FIXME This should be replaced with a method in ITmfTrace maybe?
+            // Other trace types might want to supply environment variables.
             if (trace instanceof CtfTmfTrace) {
                 TreeItem item = new TreeItem(fTree, SWT.NONE);
                 item.setText(0, trace.getName());
+
                 CtfTmfTrace ctfTrace = (CtfTmfTrace) trace;
-                for (String varName : ctfTrace.getEnvNames()) {
+                Map <String, String> env = ctfTrace.getEnvironment();
+                for (Map.Entry<String, String> entry : env.entrySet()) {
                     TreeItem subItem = new TreeItem(item, SWT.NONE);
-                    subItem.setText(0, varName);
-                    subItem.setText(1, ctfTrace.getEnvValue(varName));
+                    subItem.setText(0, entry.getKey()); // Variable name
+                    subItem.setText(1, entry.getValue()); // Variable value
                 }
             }
         }