tmf: move trace type detection utility to tmf.core
authorBernd Hufmann <Bernd.Hufmann@ericsson.com>
Fri, 12 Feb 2016 15:52:04 +0000 (10:52 -0500)
committerBernd Hufmann <bernd.hufmann@ericsson.com>
Tue, 23 Feb 2016 20:29:43 +0000 (15:29 -0500)
and have the UI utility call this method. But doing this the trace
type detection can be run independently from the UI.

Change-Id: I6ec3043791647773a7768f4117f1dcdef2211e32
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/66530
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF
tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/project/model/Messages.java [new file with mode: 0644]
tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/project/model/messages.properties [new file with mode: 0644]
tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/project/model/TmfTraceType.java
tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/Messages.java
tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/TmfTraceTypeUIUtils.java
tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/project/model/messages.properties

index 1ce1d551238935831be4dfffe72d8e92059e8ba5..29d62ac1bd7ae1568f1dfb6a9a94a332d07984d0 100644 (file)
@@ -20,6 +20,7 @@ Export-Package: org.eclipse.tracecompass.internal.tmf.core;x-friends:="org.eclip
  org.eclipse.tracecompass.internal.tmf.core.component;x-friends:="org.eclipse.tracecompass.tmf.core.tests",
  org.eclipse.tracecompass.internal.tmf.core.filter;x-friends:="org.eclipse.tracecompass.tmf.core.tests,org.eclipse.tracecompass.tmf.ui",
  org.eclipse.tracecompass.internal.tmf.core.parsers.custom;x-friends:="org.eclipse.tracecompass.tmf.ui",
+ org.eclipse.tracecompass.internal.tmf.core.project.model;x-internal:=true,
  org.eclipse.tracecompass.internal.tmf.core.request;x-friends:="org.eclipse.tracecompass.tmf.core.tests",
  org.eclipse.tracecompass.internal.tmf.core.statesystem.backends.partial;x-friends:="org.eclipse.tracecompass.statesystem.core.tests",
  org.eclipse.tracecompass.internal.tmf.core.statesystem.mipmap;x-friends:="org.eclipse.tracecompass.tmf.core.tests",
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/project/model/Messages.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/project/model/Messages.java
new file mode 100644 (file)
index 0000000..5efffd2
--- /dev/null
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Ericsson
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.internal.tmf.core.project.model;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Message strings for TMF model handling.
+ *
+ * @author Bernd Hufmann
+ */
+public class Messages extends NLS {
+
+    private static final String BUNDLE_NAME = "org.eclipse.tracecompass.internal.tmf.core.project.model.messages"; //$NON-NLS-1$
+
+    /** No trace type match */
+    public static String TmfOpenTraceHelper_NoTraceTypeMatch;
+
+    static {
+        // initialize resource bundle
+        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+    }
+
+    private Messages() {
+    }
+}
diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/project/model/messages.properties b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/project/model/messages.properties
new file mode 100644 (file)
index 0000000..8f6d469
--- /dev/null
@@ -0,0 +1,11 @@
+###############################################################################
+# Copyright (c) 2016 Ericsson
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+
+TmfOpenTraceHelper_NoTraceTypeMatch=No trace types found to match location {0}
+
index a8932bf787da92a2be791d2e591b59096c9e2e84..e9acc8ff6034b879d85f65ea217ba977f1a2dbc1 100644 (file)
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2015 Ericsson, École Polytechnique de Montréal
+ * Copyright (c) 2011, 2016 Ericsson, École Polytechnique de Montréal
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -15,6 +15,7 @@
 
 package org.eclipse.tracecompass.tmf.core.project.model;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -24,13 +25,17 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.TreeSet;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.tracecompass.internal.tmf.core.Activator;
+import org.eclipse.tracecompass.internal.tmf.core.project.model.Messages;
 import org.eclipse.tracecompass.tmf.core.TmfCommonConstants;
 import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomTxtTrace;
 import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomTxtTraceDefinition;
@@ -38,6 +43,7 @@ import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomXmlTrace;
 import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomXmlTraceDefinition;
 import org.eclipse.tracecompass.tmf.core.signal.TmfSignalManager;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
+import org.eclipse.tracecompass.tmf.core.util.Pair;
 
 /**
  * Utility class for accessing TMF trace type extensions from the platform's
@@ -578,4 +584,122 @@ public final class TmfTraceType {
         return traceTypeId;
     }
 
+    /**
+     * This method figures out the trace type of a given trace.
+     *
+     * @param path
+     *            The path of trace to import (file or directory for directory traces)
+     * @param traceTypeHint
+     *            the ID of a trace (like "o.e.l.specifictrace" )
+     * @return a list of {@link TraceTypeHelper} sorted by confidence (highest first)
+     *
+     * @throws TmfTraceImportException
+     *             if there are errors in the trace file or no trace type found
+     *             for a directory trace
+     * @since 2.0
+     */
+    public static @NonNull List<TraceTypeHelper> selectTraceType(String path, String traceTypeHint) throws TmfTraceImportException {
+
+        Comparator<Pair<Integer, TraceTypeHelper>> comparator = new Comparator<Pair<Integer, TraceTypeHelper>>() {
+            @Override
+            public int compare(Pair<Integer, TraceTypeHelper> o1, Pair<Integer, TraceTypeHelper> o2) {
+                int res = -o1.getFirst().compareTo(o2.getFirst()); // invert so that highest confidence is first
+                if (res == 0) {
+                    res = o1.getSecond().getName().compareTo(o2.getSecond().getName());
+                }
+                return res;
+            }
+        };
+
+        TreeSet<Pair<Integer, TraceTypeHelper>> validCandidates = new TreeSet<>(comparator);
+        final Iterable<TraceTypeHelper> traceTypeHelpers = TmfTraceType.getTraceTypeHelpers();
+        for (TraceTypeHelper traceTypeHelper : traceTypeHelpers) {
+            if (traceTypeHelper.isExperimentType()) {
+                continue;
+            }
+            int confidence = traceTypeHelper.validateWithConfidence(path);
+            if (confidence >= 0) {
+                // insert in the tree map, ordered by confidence (highest confidence first) then name
+                Pair<Integer, TraceTypeHelper> element = new Pair<>(confidence, traceTypeHelper);
+                validCandidates.add(element);
+            }
+        }
+
+        List<TraceTypeHelper> returned = new ArrayList<>();
+        if (validCandidates.isEmpty()) {
+            File traceFile = new File(path);
+            if (traceFile.isFile()) {
+                return returned;
+            }
+            final String errorMsg = NLS.bind(Messages.TmfOpenTraceHelper_NoTraceTypeMatch, path);
+            throw new TmfTraceImportException(errorMsg);
+        }
+
+        if (validCandidates.size() != 1) {
+            List<Pair<Integer, TraceTypeHelper>> candidates = new ArrayList<>(validCandidates);
+            List<Pair<Integer, TraceTypeHelper>> reducedCandidates = reduce(candidates);
+            for (Pair<Integer, TraceTypeHelper> candidatePair : reducedCandidates) {
+                TraceTypeHelper candidate = candidatePair.getSecond();
+                if (candidate.getTraceTypeId().equals(traceTypeHint)) {
+                    returned.add(candidate);
+                    break;
+                }
+            }
+            if (returned.size() == 0) {
+                if (reducedCandidates.size() == 0) {
+                    throw new TmfTraceImportException("Error reducing trace type candidates"); //$NON-NLS-1$
+                } else if (reducedCandidates.size() == 1) {
+                    // Don't select the trace type if it has the lowest confidence
+                    if (reducedCandidates.get(0).getFirst() > 0) {
+                        returned.add(reducedCandidates.get(0).getSecond());
+                    }
+                } else {
+                    for (Pair<Integer, TraceTypeHelper> candidatePair : reducedCandidates) {
+                        returned.add(candidatePair.getSecond());
+                    }
+                }
+            }
+        } else {
+            // Don't select the trace type if it has the lowest confidence
+            if (validCandidates.first().getFirst() > 0) {
+                returned.add(validCandidates.first().getSecond());
+            }
+        }
+        return returned;
+    }
+
+    private static List<Pair<Integer, TraceTypeHelper>> reduce(List<Pair<Integer, TraceTypeHelper>> candidates) {
+        List<Pair<Integer, TraceTypeHelper>> retVal = new ArrayList<>();
+
+        // get all the tracetypes that are unique in that stage
+        for (Pair<Integer, TraceTypeHelper> candidatePair : candidates) {
+            TraceTypeHelper candidate = candidatePair.getSecond();
+            if (isUnique(candidate, candidates)) {
+                retVal.add(candidatePair);
+            }
+        }
+        return retVal;
+    }
+
+    /*
+     * Only return the leaves of the trace types. Ignore custom trace types.
+     */
+    private static boolean isUnique(TraceTypeHelper trace, List<Pair<Integer, TraceTypeHelper>> set) {
+        if (trace.getTraceClass().equals(CustomTxtTrace.class) ||
+                trace.getTraceClass().equals(CustomXmlTrace.class)) {
+            return true;
+        }
+        // check if the trace type is the leaf. we make an instance of the trace
+        // type and if it is only an instance of itself, it is a leaf
+        final ITmfTrace tmfTrace = trace.getTrace();
+        int count = -1;
+        for (Pair<Integer, TraceTypeHelper> child : set) {
+            final ITmfTrace traceCandidate = child.getSecond().getTrace();
+            if (tmfTrace.getClass().isInstance(traceCandidate)) {
+                count++;
+            }
+        }
+        return count == 0;
+    }
+
 }
index fb7c323a4b55f9ff88c9480841d7b3a2426a0796..ccc068db483e123f3a8d7f937e09383432870b2f 100644 (file)
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2014 Ericsson
+ * Copyright (c) 2013, 2016 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -109,12 +109,8 @@ public class Messages extends NLS {
     public static String TmfOpenTraceHelper_ErrorOpeningElement;
     /** Could not link trace */
     public static String TmfOpenTraceHelper_LinkFailed;
-    /** No trace type match */
-    public static String TmfOpenTraceHelper_NoTraceTypeMatch;
     /** Open trace or experiment */
     public static String TmfOpenTraceHelper_OpenElement;
-    /** Reduce was too efficient, no candidates found! */
-    public static String TmfOpenTraceHelper_ReduceError;
     /** No trace or experiment type */
     public static String TmfOpenTraceHelper_NoTraceOrExperimentType;
     /** No trace type */
index 9fd78c82e897583e446ee4df5caa812f577ca373..9707ac26b4e451ae600ef1b9d693aeb4cb23774d 100644 (file)
 
 package org.eclipse.tracecompass.tmf.ui.project.model;
 
-import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeSet;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -32,7 +28,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -42,14 +37,11 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.tracecompass.tmf.core.TmfCommonConstants;
-import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomTxtTrace;
-import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomXmlTrace;
 import org.eclipse.tracecompass.tmf.core.project.model.TmfTraceImportException;
 import org.eclipse.tracecompass.tmf.core.project.model.TmfTraceType;
 import org.eclipse.tracecompass.tmf.core.project.model.TmfTraceType.TraceElementType;
 import org.eclipse.tracecompass.tmf.core.project.model.TraceTypeHelper;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
-import org.eclipse.tracecompass.tmf.core.util.Pair;
 import org.eclipse.tracecompass.tmf.ui.viewers.events.TmfEventsTable;
 import org.osgi.framework.Bundle;
 
@@ -93,47 +85,12 @@ public final class TmfTraceTypeUIUtils {
     private TmfTraceTypeUIUtils() {
     }
 
-    private static List<Pair<Integer, TraceTypeHelper>> reduce(List<Pair<Integer, TraceTypeHelper>> candidates) {
-        List<Pair<Integer, TraceTypeHelper>> retVal = new ArrayList<>();
-
-        // get all the tracetypes that are unique in that stage
-        for (Pair<Integer, TraceTypeHelper> candidatePair : candidates) {
-            TraceTypeHelper candidate = candidatePair.getSecond();
-            if (isUnique(candidate, candidates)) {
-                retVal.add(candidatePair);
-            }
-        }
-        return retVal;
-    }
-
-    /*
-     * Only return the leaves of the trace types. Ignore custom trace types.
-     */
-    private static boolean isUnique(TraceTypeHelper trace, List<Pair<Integer, TraceTypeHelper>> set) {
-        if (trace.getTraceClass().equals(CustomTxtTrace.class) ||
-                trace.getTraceClass().equals(CustomXmlTrace.class)) {
-            return true;
-        }
-        // check if the trace type is the leaf. we make an instance of the trace
-        // type and if it is only an instance of itself, it is a leaf
-        final ITmfTrace tmfTrace = trace.getTrace();
-        int count = -1;
-        for (Pair<Integer, TraceTypeHelper> child : set) {
-            final ITmfTrace traceCandidate = child.getSecond().getTrace();
-            if (tmfTrace.getClass().isInstance(traceCandidate)) {
-                count++;
-            }
-        }
-        return count == 0;
-    }
-
-    private static TraceTypeHelper getTraceTypeToSet(List<Pair<Integer, TraceTypeHelper>> candidates, Shell shell) {
+    private static TraceTypeHelper getTraceTypeToSet(List<TraceTypeHelper> candidates, Shell shell) {
         final Map<String, String> names = new HashMap<>();
         Shell shellToShow = new Shell(shell);
         shellToShow.setText(Messages.TmfTraceType_SelectTraceType);
         final String candidatesToSet[] = new String[1];
-        for (Pair<Integer, TraceTypeHelper> candidatePair : candidates) {
-            TraceTypeHelper candidate = candidatePair.getSecond();
+        for (TraceTypeHelper candidate : candidates) {
             Button b = new Button(shellToShow, SWT.RADIO);
             final String displayName = candidate.getCategoryName() + ':' + candidate.getName();
             b.setText(displayName);
@@ -168,93 +125,35 @@ public final class TmfTraceTypeUIUtils {
     }
 
     /**
-     * This member figures out the trace type of a given file. It will prompt
+     * This member figures out the trace type of a given trace. It will prompt
      * the user if it needs more information to properly pick the trace type.
      *
      * @param path
-     *            The path of file to import
+     *            The path of trace to import (file or directory for directory
+     *            traces)
      * @param shell
-     *            a shell to display the message to. If it is null, it is
-     *            assumed to be cancelled.
+     *            a shell to query user in case of multiple valid trace types.
+     *            If it is null, than the first one alphabetically is selected.
      * @param traceTypeHint
      *            the ID of a trace (like "o.e.l.specifictrace" )
-     * @return null if the request is cancelled or a TraceTypeHelper if it
-     *         passes.
+     * @return {@link TraceTypeHelper} for valid trace type or null if no valid
+     *         trace type was found in case of single file trace
      * @throws TmfTraceImportException
-     *             if the traces don't match or there are errors in the trace
-     *             file
+     *             if there are errors in the trace file or no trace type found
+     *             for a directory trace
      */
-    public static TraceTypeHelper selectTraceType(String path, Shell shell, String traceTypeHint) throws TmfTraceImportException {
-
-        Comparator<Pair<Integer, TraceTypeHelper>> comparator = new Comparator<Pair<Integer, TraceTypeHelper>>() {
-            @Override
-            public int compare(Pair<Integer, TraceTypeHelper> o1, Pair<Integer, TraceTypeHelper> o2) {
-                int res = -o1.getFirst().compareTo(o2.getFirst()); // invert so that highest confidence is first
-                if (res == 0) {
-                    res = o1.getSecond().getName().compareTo(o2.getSecond().getName());
-                }
-                return res;
-            }
-        };
-        TreeSet<Pair<Integer, TraceTypeHelper>> validCandidates = new TreeSet<>(comparator);
-        final Iterable<TraceTypeHelper> traceTypeHelpers = TmfTraceType.getTraceTypeHelpers();
-        for (TraceTypeHelper traceTypeHelper : traceTypeHelpers) {
-            if (traceTypeHelper.isExperimentType()) {
-                continue;
-            }
-            int confidence = traceTypeHelper.validateWithConfidence(path);
-            if (confidence >= 0) {
-                // insert in the tree map, ordered by confidence (highest confidence first) then name
-                Pair<Integer, TraceTypeHelper> element = new Pair<>(confidence, traceTypeHelper);
-                validCandidates.add(element);
-            }
-        }
+    public static @Nullable TraceTypeHelper selectTraceType(String path, Shell shell, String traceTypeHint) throws TmfTraceImportException {
+        List<TraceTypeHelper> candidates = TmfTraceType.selectTraceType(path, traceTypeHint);
 
-        TraceTypeHelper traceTypeToSet = null;
-        if (validCandidates.isEmpty()) {
-            File traceFile = new File(path);
-            if (traceFile.isFile()) {
-                return null;
-            }
-            final String errorMsg = NLS.bind(Messages.TmfOpenTraceHelper_NoTraceTypeMatch, path);
-            throw new TmfTraceImportException(errorMsg);
+        if (candidates.isEmpty()) {
+            return null;
         }
 
-        if (validCandidates.size() != 1) {
-            List<Pair<Integer, TraceTypeHelper>> candidates = new ArrayList<>(validCandidates);
-            List<Pair<Integer, TraceTypeHelper>> reducedCandidates = reduce(candidates);
-            for (Pair<Integer, TraceTypeHelper> candidatePair : reducedCandidates) {
-                TraceTypeHelper candidate = candidatePair.getSecond();
-                if (candidate.getTraceTypeId().equals(traceTypeHint)) {
-                    traceTypeToSet = candidate;
-                    break;
-                }
-            }
-            if (traceTypeToSet == null) {
-                if (reducedCandidates.size() == 0) {
-                    throw new TmfTraceImportException(Messages.TmfOpenTraceHelper_ReduceError);
-                } else if (reducedCandidates.size() == 1) {
-                    // Don't select the trace type if it has the lowest confidence
-                    if (reducedCandidates.get(0).getFirst() > 0) {
-                        traceTypeToSet = reducedCandidates.get(0).getSecond();
-                    }
-                } else if (shell == null) {
-                    Pair<Integer, TraceTypeHelper> candidate = reducedCandidates.get(0);
-                    // if the best match has lowest confidence, don't select it
-                    if (candidate.getFirst() > 0) {
-                        traceTypeToSet = candidate.getSecond();
-                    }
-                } else {
-                    traceTypeToSet = getTraceTypeToSet(reducedCandidates, shell);
-                }
-            }
-        } else {
-            // Don't select the trace type if it has the lowest confidence
-            if (validCandidates.first().getFirst() > 0) {
-                traceTypeToSet = validCandidates.first().getSecond();
-            }
+        if ((candidates.size() == 1) || (shell == null)) {
+            return candidates.get(0);
         }
-        return traceTypeToSet;
+
+        return getTraceTypeToSet(candidates, shell);
     }
 
     /**
@@ -272,20 +171,21 @@ public final class TmfTraceTypeUIUtils {
     public static IStatus setTraceType(IResource resource, TraceTypeHelper traceType) throws CoreException {
         return setTraceType(resource, traceType, true);
     }
-        /**
-         * Set the trace type of a {@link TraceTypeHelper}. Should only be
-         * used internally by this project.
-         *
-         * @param resource
-         *            the resource to set
-         * @param traceType
-         *            the {@link TraceTypeHelper} to set the trace type to.
-         * @param refresh
-         *            Flag for refreshing the project
-         * @return Status.OK_Status if successful, error is otherwise.
-         * @throws CoreException
-         *             An exception caused by accessing eclipse project items.
-         */
+
+    /**
+     * Set the trace type of a {@link TraceTypeHelper}. Should only be
+     * used internally by this project.
+     *
+     * @param resource
+     *            the resource to set
+     * @param traceType
+     *            the {@link TraceTypeHelper} to set the trace type to.
+     * @param refresh
+     *            Flag for refreshing the project
+     * @return Status.OK_Status if successful, error is otherwise.
+     * @throws CoreException
+     *             An exception caused by accessing eclipse project items.
+     */
     public static IStatus setTraceType(IResource resource, TraceTypeHelper traceType, boolean refresh) throws CoreException {
         String traceTypeId = traceType.getTraceTypeId();
 
index 6d34d2757ad8bff50b15a890666bdb4751b0b42c..8252f3de43e20b0ada66706c2bf71e627d410b1d 100644 (file)
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2013, 2014 Ericsson
+# Copyright (c) 2013, 2016 Ericsson
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -41,9 +41,7 @@ TmfTraceType_SelectTraceType=Select Trace Type
 # Open trace error messages
 TmfOpenTraceHelper_ErrorOpeningElement=Error opening {0}
 TmfOpenTraceHelper_LinkFailed=Link creation failed
-TmfOpenTraceHelper_NoTraceTypeMatch=No trace types found to match location {0}
 TmfOpenTraceHelper_OpenElement=Open {0}
-TmfOpenTraceHelper_ReduceError=Something went wrong
 TmfOpenTraceHelper_NoTraceType = No trace type associated to that trace\nPlease select a valid type
 TmfOpenTraceHelper_NoTraceOrExperimentType=No experiment type associated to that {0}\nPlease select a valid type
 TmfOpenTraceHelper_ErrorElement=Error opening {0}.
This page took 0.037045 seconds and 5 git commands to generate.