tmf: Make TmfTraceType static
authorPatrick Tasse <patrick.tasse@gmail.com>
Fri, 23 May 2014 19:51:49 +0000 (15:51 -0400)
committerPatrick Tasse <patrick.tasse@gmail.com>
Mon, 26 May 2014 17:39:54 +0000 (13:39 -0400)
Can avoid calling getInstance() for every code that uses it.

Change-Id: Ic239ab59c5b2c9bfff2bc9ff0dc38877792a9b45
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/27221
Tested-by: Hudson CI
21 files changed:
org.eclipse.linuxtools.tmf.analysis.xml.ui/src/org/eclipse/linuxtools/tmf/analysis/xml/ui/module/TmfAnalysisModuleHelperXml.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/analysis/AnalysisModuleHelperTest.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/analysis/TmfAnalysisModuleHelperConfigElement.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomTxtTraceDefinition.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/parsers/custom/CustomXmlTraceDefinition.java
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/project/model/TmfTraceType.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DropAdapterAssistant.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/SelectTraceTypeHandler.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/BatchImportTraceWizard.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/ImportTraceContentProvider.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardScanPage.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/TraceTypeContentProvider.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/tracepkg/importexport/TracePackageImportOperation.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfCommonProjectElement.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfNavigatorLabelProvider.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfOpenTraceHelper.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceTypeUIUtils.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/wizards/NewExperimentDialog.java

index a22601c63166716db46e774b3f6a34fa08ae08d3..c98966ce333a520a2072b3ccc63c2b5b222c4a14 100644 (file)
@@ -133,7 +133,7 @@ public class TmfAnalysisModuleHelperXml implements IAnalysisModuleHelper {
 
         for (Element element : elements) {
             String traceTypeId = element.getAttribute(TmfXmlStrings.ID);
-            TraceTypeHelper helper = TmfTraceType.getInstance().getTraceType(traceTypeId);
+            TraceTypeHelper helper = TmfTraceType.getTraceType(traceTypeId);
             if ((helper != null) && helper.getTrace().getClass().isAssignableFrom(traceClass)) {
                 return true;
             }
index b803dd7ecc848a8b5bac0939ae4ec8b0f0e6d5b6..264368d686186460e1ef02b0446ef419e7cb1696 100644 (file)
@@ -232,7 +232,7 @@ public class AnalysisModuleHelperTest {
      */
     @Test
     public void testGetValidTraceTypes() {
-        TraceTypeHelper traceTypeHelper = TmfTraceType.getInstance().getTraceType(VALID_TRACE_TYPE);
+        TraceTypeHelper traceTypeHelper = TmfTraceType.getTraceType(VALID_TRACE_TYPE);
         int traceTypeCount = 0;
         Iterable<Class<? extends ITmfTrace>> traceTypes = fReqModule.getValidTraceTypes();
         for (Class<? extends ITmfTrace> traceType : traceTypes) {
index e50762498ecf999d7928064169c213951ce59dae..2912283d58ed958e04ece8b27059ba319b279654 100644 (file)
@@ -123,7 +123,7 @@ public class TmfAnalysisModuleHelperConfigElement implements IAnalysisModuleHelp
     public Iterable<Class<? extends ITmfTrace>> getValidTraceTypes() {
         Set<Class<? extends ITmfTrace>> traceTypes = new HashSet<>();
 
-        for (TraceTypeHelper tth : TmfTraceType.getInstance().getTraceTypeHelpers()) {
+        for (TraceTypeHelper tth : TmfTraceType.getTraceTypeHelpers()) {
             if (appliesToTraceType(tth.getTraceClass())) {
                 traceTypes.add(tth.getTraceClass());
             }
index 175f991ec0950f4b934fd2adacefff34658d1d6a..e65aca6cb5592199b3b0d5bdc34807d581b64eb9 100644 (file)
@@ -540,7 +540,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition {
                 writer.write(xmlString);
             }
 
-            TmfTraceType.getInstance().addCustomTraceType(TmfTraceType.CUSTOM_TXT_CATEGORY, definitionName);
+            TmfTraceType.addCustomTraceType(TmfTraceType.CUSTOM_TXT_CATEGORY, definitionName);
 
         } catch (ParserConfigurationException e) {
             Activator.logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$
@@ -907,7 +907,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition {
                 writer.write(xmlString);
             }
 
-            TmfTraceType.getInstance().removeCustomTraceType(TmfTraceType.CUSTOM_TXT_CATEGORY, definitionName);
+            TmfTraceType.removeCustomTraceType(TmfTraceType.CUSTOM_TXT_CATEGORY, definitionName);
 
         } catch (ParserConfigurationException e) {
             Activator.logError("Error deleting CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$
index 0f8fb1b11a382827471b044302a9b2311e4061e1..44da114ea66fb05a10ea937be93d3bf0d11cfa45 100644 (file)
@@ -407,7 +407,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition {
                 writer.write(xmlString);
             }
 
-            TmfTraceType.getInstance().addCustomTraceType(TmfTraceType.CUSTOM_XML_CATEGORY, definitionName);
+            TmfTraceType.addCustomTraceType(TmfTraceType.CUSTOM_XML_CATEGORY, definitionName);
 
         } catch (ParserConfigurationException e) {
             Activator.logError("Error saving CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$
@@ -800,7 +800,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition {
                 writer.write(xmlString);
             }
 
-            TmfTraceType.getInstance().removeCustomTraceType(TmfTraceType.CUSTOM_XML_CATEGORY, definitionName);
+            TmfTraceType.removeCustomTraceType(TmfTraceType.CUSTOM_XML_CATEGORY, definitionName);
 
         } catch (ParserConfigurationException e) {
             Activator.logError("Error deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$
index 1949e39d425e8ca0d1736cb0da42960a684ee154..8f3fb53319e0675a6d69e2aedc1e77dcc2f0de31 100644 (file)
@@ -45,6 +45,10 @@ import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
  */
 public final class TmfTraceType {
 
+    // ------------------------------------------------------------------
+    // Constants
+    // ------------------------------------------------------------------
+
     private static final char SEPARATOR = ':';
 
     /** Extension point ID */
@@ -96,11 +100,14 @@ public final class TmfTraceType {
 
     // The mapping of available trace type IDs to their corresponding
     // configuration element
-    private final Map<String, IConfigurationElement> fTraceTypeAttributes = new HashMap<>();
-    private final Map<String, IConfigurationElement> fTraceCategories = new HashMap<>();
-    private final Map<String, TraceTypeHelper> fTraceTypes = new LinkedHashMap<>();
+    private static final Map<String, IConfigurationElement> TRACE_TYPE_ATTRIBUTES = new HashMap<>();
+    private static final Map<String, IConfigurationElement> TRACE_CATEGORIES = new HashMap<>();
+    private static final Map<String, TraceTypeHelper> TRACE_TYPES = new LinkedHashMap<>();
 
-    private static TmfTraceType fInstance = null;
+    static {
+        populateCategoriesAndTraceTypes();
+        populateCustomTraceTypes();
+    }
 
     /**
      * Enum to say whether a type applies to a trace or experiment
@@ -114,6 +121,17 @@ public final class TmfTraceType {
         EXPERIMENT,
     }
 
+    // ------------------------------------------------------------------
+    // Constructor
+    // ------------------------------------------------------------------
+
+    private TmfTraceType() {
+    }
+
+    // ------------------------------------------------------------------
+    // Operations
+    // ------------------------------------------------------------------
+
     /**
      * Retrieves the category name from the platform extension registry based on
      * the category ID
@@ -151,27 +169,6 @@ public final class TmfTraceType {
         return typeElements.toArray(new IConfigurationElement[typeElements.size()]);
     }
 
-    private TmfTraceType() {
-        populateCategoriesAndTraceTypes();
-        populateCustomTraceTypes();
-    }
-
-    /**
-     * The import utils instance
-     *
-     * @return the import utils instance
-     */
-    public static TmfTraceType getInstance() {
-        if (fInstance == null) {
-            fInstance = new TmfTraceType();
-        }
-        return fInstance;
-    }
-
-    // ------------------------------------------------------------------
-    // Get trace types
-    // ------------------------------------------------------------------
-
     /**
      * Retrieve the TraceTypeHelper for a given trace type ID
      *
@@ -180,8 +177,8 @@ public final class TmfTraceType {
      * @return The corresponding TraceTypeHelper, or null if there is none for
      *         the specified ID
      */
-    public TraceTypeHelper getTraceTypeHelper(String id) {
-        return fTraceTypes.get(id);
+    public static TraceTypeHelper getTraceTypeHelper(String id) {
+        return TRACE_TYPES.get(id);
     }
 
     /**
@@ -189,8 +186,8 @@ public final class TmfTraceType {
      *
      * @return The currently registered trace type IDs
      */
-    public Iterable<String> getTraceTypeIDs() {
-        return fTraceTypes.keySet();
+    public static Iterable<String> getTraceTypeIDs() {
+        return TRACE_TYPES.keySet();
     }
 
     /**
@@ -198,8 +195,8 @@ public final class TmfTraceType {
      *
      * @return The currently registered trace type helpers
      */
-    public Iterable<TraceTypeHelper> getTraceTypeHelpers() {
-        return fTraceTypes.values();
+    public static Iterable<TraceTypeHelper> getTraceTypeHelpers() {
+        return TRACE_TYPES.values();
     }
 
     /**
@@ -209,7 +206,7 @@ public final class TmfTraceType {
      *
      * @return returns a list of "category:tracetype , ..."
      */
-    public String[] getAvailableTraceTypes() {
+    public static String[] getAvailableTraceTypes() {
         return getAvailableTraceTypes(null);
     }
 
@@ -222,13 +219,13 @@ public final class TmfTraceType {
      *            Comparator class (type String) or null for alphabetical order.
      * @return sorted list according to the given comparator
      */
-    public String[] getAvailableTraceTypes(Comparator<String> comparator) {
+    public static String[] getAvailableTraceTypes(Comparator<String> comparator) {
 
         // Generate the list of Category:TraceType to populate the ComboBox
         List<String> traceTypes = new ArrayList<>();
 
-        for (String key : this.fTraceTypes.keySet()) {
-            TraceTypeHelper tt = this.fTraceTypes.get(key);
+        for (String key : TRACE_TYPES.keySet()) {
+            TraceTypeHelper tt = TRACE_TYPES.get(key);
             if (!tt.isExperimentType()) {
                 traceTypes.add(tt.getCategoryName() + SEPARATOR + tt.getName());
             }
@@ -287,13 +284,13 @@ public final class TmfTraceType {
         return traceTypes;
     }
 
-    private void populateCustomTraceTypes() {
+    private static void populateCustomTraceTypes() {
         // add the custom trace types
         for (CustomTxtTraceDefinition def : CustomTxtTraceDefinition.loadAll()) {
             String traceTypeId = CustomTxtTrace.class.getCanonicalName() + SEPARATOR + def.definitionName;
             ITmfTrace trace = new CustomTxtTrace(def);
             TraceTypeHelper tt = new TraceTypeHelper(traceTypeId, CUSTOM_TXT_CATEGORY, def.definitionName, trace, false, TraceElementType.TRACE);
-            fTraceTypes.put(traceTypeId, tt);
+            TRACE_TYPES.put(traceTypeId, tt);
             // Deregister trace as signal handler because it is only used for validation
             TmfSignalManager.deregister(trace);
         }
@@ -301,7 +298,7 @@ public final class TmfTraceType {
             String traceTypeId = CustomXmlTrace.class.getCanonicalName() + SEPARATOR + def.definitionName;
             ITmfTrace trace = new CustomXmlTrace(def);
             TraceTypeHelper tt = new TraceTypeHelper(traceTypeId, CUSTOM_XML_CATEGORY, def.definitionName, trace, false, TraceElementType.TRACE);
-            fTraceTypes.put(traceTypeId, tt);
+            TRACE_TYPES.put(traceTypeId, tt);
             // Deregister trace as signal handler because it is only used for validation
             TmfSignalManager.deregister(trace);
         }
@@ -315,7 +312,7 @@ public final class TmfTraceType {
      * @param definitionName
      *            The custom parser definition name to add or replace
      */
-    public void addCustomTraceType(String category, String definitionName) {
+    public static void addCustomTraceType(String category, String definitionName) {
         String traceTypeId = null;
         ITmfTrace trace = null;
 
@@ -334,12 +331,12 @@ public final class TmfTraceType {
         }
 
         if (traceTypeId != null && trace != null) {
-            TraceTypeHelper helper = fTraceTypes.get(traceTypeId);
+            TraceTypeHelper helper = TRACE_TYPES.get(traceTypeId);
             if (helper != null) {
                 helper.getTrace().dispose();
             }
             TraceTypeHelper tt = new TraceTypeHelper(traceTypeId, category, definitionName, trace, false, TraceElementType.TRACE);
-            fTraceTypes.put(traceTypeId, tt);
+            TRACE_TYPES.put(traceTypeId, tt);
             // Deregister trace as signal handler because it is only used for validation
             TmfSignalManager.deregister(trace);
         }
@@ -353,16 +350,16 @@ public final class TmfTraceType {
      * @param definitionName
      *            The custom parser definition name to add or replace
      */
-    public void removeCustomTraceType(String category, String definitionName) {
+    public static void removeCustomTraceType(String category, String definitionName) {
         if (category.equals(CUSTOM_TXT_CATEGORY)) {
             String traceTypeId = CustomTxtTrace.class.getCanonicalName() + SEPARATOR + definitionName;
-            TraceTypeHelper helper = fTraceTypes.remove(traceTypeId);
+            TraceTypeHelper helper = TRACE_TYPES.remove(traceTypeId);
             if (helper != null) {
                 helper.getTrace().dispose();
             }
         } else if (category.equals(CUSTOM_XML_CATEGORY)) {
             String traceTypeId = CustomXmlTrace.class.getCanonicalName() + SEPARATOR + definitionName;
-            TraceTypeHelper helper = fTraceTypes.remove(traceTypeId);
+            TraceTypeHelper helper = TRACE_TYPES.remove(traceTypeId);
             if (helper != null) {
                 helper.getTrace().dispose();
             }
@@ -376,30 +373,30 @@ public final class TmfTraceType {
      *            the ID of the trace
      * @return the return type
      */
-    public TraceTypeHelper getTraceType(String id) {
-        return fTraceTypes.get(id);
+    public static TraceTypeHelper getTraceType(String id) {
+        return TRACE_TYPES.get(id);
     }
 
-    private void populateCategoriesAndTraceTypes() {
-        if (fTraceTypes.isEmpty()) {
+    private static void populateCategoriesAndTraceTypes() {
+        if (TRACE_TYPES.isEmpty()) {
             // Populate the Categories and Trace Types
             IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(TmfTraceType.TMF_TRACE_TYPE_ID);
             for (IConfigurationElement ce : config) {
                 String elementName = ce.getName();
                 if (elementName.equals(TmfTraceType.TYPE_ELEM)) {
                     String traceTypeId = ce.getAttribute(TmfTraceType.ID_ATTR);
-                    fTraceTypeAttributes.put(traceTypeId, ce);
+                    TRACE_TYPE_ATTRIBUTES.put(traceTypeId, ce);
                 } else if (elementName.equals(TmfTraceType.CATEGORY_ELEM)) {
                     String categoryId = ce.getAttribute(TmfTraceType.ID_ATTR);
-                    fTraceCategories.put(categoryId, ce);
+                    TRACE_CATEGORIES.put(categoryId, ce);
                 } else if (elementName.equals(TmfTraceType.EXPERIMENT_ELEM)) {
                     String experimentTypeId = ce.getAttribute(TmfTraceType.ID_ATTR);
-                    fTraceTypeAttributes.put(experimentTypeId, ce);
+                    TRACE_TYPE_ATTRIBUTES.put(experimentTypeId, ce);
                 }
             }
             // create the trace types
-            for (String typeId : fTraceTypeAttributes.keySet()) {
-                IConfigurationElement ce = fTraceTypeAttributes.get(typeId);
+            for (String typeId : TRACE_TYPE_ATTRIBUTES.keySet()) {
+                IConfigurationElement ce = TRACE_TYPE_ATTRIBUTES.get(typeId);
                 final String category = getCategory(ce);
                 final String attribute = ce.getAttribute(TmfTraceType.NAME_ATTR);
                 ITmfTrace trace = null;
@@ -422,7 +419,7 @@ public final class TmfTraceType {
                     boolean isDir = Boolean.parseBoolean(dirString);
 
                     TraceTypeHelper tt = new TraceTypeHelper(typeId, category, attribute, trace, isDir, elementType);
-                    fTraceTypes.put(typeId, tt);
+                    TRACE_TYPES.put(typeId, tt);
                 } catch (CoreException e) {
                 }
 
@@ -430,10 +427,10 @@ public final class TmfTraceType {
         }
     }
 
-    private String getCategory(IConfigurationElement ce) {
+    private static String getCategory(IConfigurationElement ce) {
         final String categoryId = ce.getAttribute(TmfTraceType.CATEGORY_ATTR);
         if (categoryId != null) {
-            IConfigurationElement category = fTraceCategories.get(categoryId);
+            IConfigurationElement category = TRACE_CATEGORIES.get(categoryId);
             if (category != null && !category.getName().equals("")) { //$NON-NLS-1$
                 return category.getAttribute(TmfTraceType.NAME_ATTR);
             }
@@ -446,10 +443,10 @@ public final class TmfTraceType {
      *
      * @return the list of trace categories
      */
-    public List<String> getTraceCategories() {
+    public static List<String> getTraceCategories() {
         List<String> categoryNames = new ArrayList<>();
-        for (String key : fTraceTypes.keySet()) {
-            final String categoryName = fTraceTypes.get(key).getCategoryName();
+        for (String key : TRACE_TYPES.keySet()) {
+            final String categoryName = TRACE_TYPES.get(key).getCategoryName();
             if (!categoryNames.contains(categoryName)) {
                 categoryNames.add(categoryName);
             }
@@ -465,13 +462,13 @@ public final class TmfTraceType {
      *            the categoryName to lookup
      * @return a list of trace type helper classes {@link TraceTypeHelper}
      */
-    public List<TraceTypeHelper> getTraceTypes(String categoryName) {
+    public static List<TraceTypeHelper> getTraceTypes(String categoryName) {
         List<TraceTypeHelper> traceNames = new ArrayList<>();
-        for (String key : fTraceTypes.keySet()) {
-            if (!fTraceTypes.get(key).isExperimentType()) {
-                final String storedCategoryName = fTraceTypes.get(key).getCategoryName();
+        for (String key : TRACE_TYPES.keySet()) {
+            if (!TRACE_TYPES.get(key).isExperimentType()) {
+                final String storedCategoryName = TRACE_TYPES.get(key).getCategoryName();
                 if (storedCategoryName.equals(categoryName)) {
-                    traceNames.add(fTraceTypes.get(key));
+                    traceNames.add(TRACE_TYPES.get(key));
                 }
             }
         }
@@ -487,9 +484,9 @@ public final class TmfTraceType {
      *            the file name (and path)
      * @return true if the trace is of a valid type
      */
-    public boolean validate(String traceTypeName, String fileName) {
+    public static boolean validate(String traceTypeName, String fileName) {
         if (traceTypeName != null && !traceTypeName.isEmpty()) {
-            final TraceTypeHelper traceTypeHelper = fTraceTypes.get(traceTypeName);
+            final TraceTypeHelper traceTypeHelper = TRACE_TYPES.get(traceTypeName);
             if (!traceTypeHelper.validate(fileName).isOK()) {
                 return false;
             }
@@ -504,7 +501,7 @@ public final class TmfTraceType {
      *            the trace category (canonical name)
      * @return true if the trace is of a valid type
      */
-    public boolean validate(TraceValidationHelper traceToValidate) {
+    public static boolean validate(TraceValidationHelper traceToValidate) {
         return validate(traceToValidate.getTraceType(), traceToValidate.getTraceToScan());
     }
 
@@ -517,7 +514,7 @@ public final class TmfTraceType {
      *            the list of files to check if they are trace
      * @return true if all the traces are valid
      */
-    public boolean validateTraceFiles(String traceTypeName, List<File> traces) {
+    public static boolean validateTraceFiles(String traceTypeName, List<File> traces) {
         if (traceTypeName != null && !"".equals(traceTypeName) && //$NON-NLS-1$
                 !traceTypeName.startsWith(TmfTraceType.CUSTOM_TXT_CATEGORY) && !traceTypeName.startsWith(TmfTraceType.CUSTOM_XML_CATEGORY)) {
             for (File trace : traces) {
@@ -536,8 +533,8 @@ public final class TmfTraceType {
      *            the name canonical
      * @return the configuration element, can be null
      */
-    public IConfigurationElement getTraceAttributes(String traceType) {
-        return fTraceTypeAttributes.get(traceType);
+    public static IConfigurationElement getTraceAttributes(String traceType) {
+        return TRACE_TYPE_ATTRIBUTES.get(traceType);
     }
 
     /**
@@ -549,9 +546,9 @@ public final class TmfTraceType {
      *            like "kernel"
      * @return an id like "org.eclipse.linuxtools.blabla...
      */
-    public String getTraceTypeId(String category, String traceType) {
-        for (String key : fTraceTypes.keySet()) {
-            if (fTraceTypes.get(key).getCategoryName().equals(category.trim()) && fTraceTypes.get(key).getName().equals(traceType.trim())) {
+    public static String getTraceTypeId(String category, String traceType) {
+        for (String key : TRACE_TYPES.keySet()) {
+            if (TRACE_TYPES.get(key).getCategoryName().equals(category.trim()) && TRACE_TYPES.get(key).getName().equals(traceType.trim())) {
                 return key;
             }
         }
@@ -602,7 +599,7 @@ public final class TmfTraceType {
      *            the file name (and path)
      * @return <code>true</code> if the trace is a valid directory trace else <code>false</code>
      */
-    public boolean isDirectoryTrace(String path) {
+    public static boolean isDirectoryTrace(String path) {
         final Iterable<TraceTypeHelper> traceTypeHelpers = getTraceTypeHelpers();
         for (TraceTypeHelper traceTypeHelper : traceTypeHelpers) {
             if (traceTypeHelper.isDirectoryTraceType() &&
@@ -618,7 +615,7 @@ public final class TmfTraceType {
      *              the trace type
      * @return <code>true</code> it is a directory trace type else else <code>false</code>
      */
-    public boolean isDirectoryTraceType(String traceType) {
+    public static boolean isDirectoryTraceType(String traceType) {
         if (traceType != null) {
             TraceTypeHelper traceTypeHelper = getTraceType(traceType);
             if (traceTypeHelper != null) {
index 68eea0508b229d99424b4fde4e6cebdd797a0f25..1d8845ddfe2fef6efe3eabc860d99ffe56e039ca 100644 (file)
@@ -538,7 +538,7 @@ public class DropAdapterAssistant extends CommonDropAdapterAssistant {
         try {
             Map<QualifiedName, String> properties = resource.getPersistentProperties();
             String traceType = properties.get(TmfCommonConstants.TRACETYPE);
-            TraceTypeHelper traceTypeHelper = TmfTraceType.getInstance().getTraceType(traceType);
+            TraceTypeHelper traceTypeHelper = TmfTraceType.getTraceType(traceType);
 
             if (resource instanceof IFolder) {
                 IFolder folder = parentFolder.getFolder(targetName);
@@ -647,7 +647,7 @@ public class DropAdapterAssistant extends CommonDropAdapterAssistant {
     private static void setTraceType(IResource traceResource) {
         try {
             String traceType = traceResource.getPersistentProperties().get(TmfCommonConstants.TRACETYPE);
-            TraceTypeHelper traceTypeHelper = TmfTraceType.getInstance().getTraceType(traceType);
+            TraceTypeHelper traceTypeHelper = TmfTraceType.getTraceType(traceType);
             if (traceTypeHelper == null) {
                 traceTypeHelper = TmfTraceTypeUIUtils.selectTraceType(traceResource.getLocationURI().getPath(), null, null);
             }
index b8990b5575ccb3115de483530b20355334b3c3d6..e0d1723798325851f3e024d265687fbdb0a0e2c3 100644 (file)
@@ -175,7 +175,7 @@ public class SelectTraceTypeHandler extends AbstractHandler {
     private static IStatus propagateProperties(TmfCommonProjectElement element, String traceType)
             throws CoreException {
 
-        TraceTypeHelper traceTypeHelper = TmfTraceType.getInstance().getTraceType(traceType);
+        TraceTypeHelper traceTypeHelper = TmfTraceType.getTraceType(traceType);
         final IStatus validateTraceType = traceTypeHelper.validate(element.getLocation().getPath());
         if (!validateTraceType.isOK()) {
             return validateTraceType;
index 4f940518e7a7e6523172c367915b4df59729bda0..117347cbf42cfb99363c353fe59971827ceda38e 100644 (file)
@@ -319,7 +319,7 @@ public class BatchImportTraceWizard extends ImportTraceWizard {
             try {
                 // Set the trace type for this resource
                 String traceTypeId = traceToImport.getTraceTypeId();
-                TraceTypeHelper traceType = TmfTraceType.getInstance().getTraceType(traceTypeId);
+                TraceTypeHelper traceType = TmfTraceType.getTraceType(traceTypeId);
                 if (traceType != null) {
                     status = TmfTraceTypeUIUtils.setTraceType(resource, traceType);
                 }
index 4a7b699fb5baba94dd2ebabbe9f6d7bfeaea109c..eb1898a1e81164226a71fc0ffe9a87bdfd09723a 100644 (file)
@@ -54,7 +54,7 @@ class ImportTraceContentProvider implements ITreeContentProvider {
      *            the trace file.
      */
     public synchronized void addCandidate(String category, File traceToOpen) {
-        fTraceTypes.put(TmfTraceType.getInstance().getTraceType(category).getName(), category);
+        fTraceTypes.put(TmfTraceType.getTraceType(category).getName(), category);
         if (!fTraceFiles.containsKey(category)) {
             fTraceFiles.put(category, new TreeSet<FileAndName>());
         }
index 20b02602b96fd7d27e9bf0bee0dae16a9dd794b8..ea78907fe3258994e9958fcbca493aec6d786c17 100644 (file)
@@ -577,7 +577,7 @@ public class ImportTraceWizardPage extends WizardResourceImportPage {
         fTraceTypes.setLayoutData(data);
         fTraceTypes.setFont(parent.getFont());
 
-        String[] availableTraceTypes = TmfTraceType.getInstance().getAvailableTraceTypes();
+        String[] availableTraceTypes = TmfTraceType.getAvailableTraceTypes();
         String[] traceTypeList = new String[availableTraceTypes.length + 1];
         traceTypeList[0] = AUTO_DETECT;
         for (int i = 0; i < availableTraceTypes.length; i++) {
@@ -741,7 +741,7 @@ public class ImportTraceWizardPage extends WizardResourceImportPage {
             if (tokens.length < 2) {
                 return false;
             }
-            traceId = TmfTraceType.getInstance().getTraceTypeId(tokens[0], tokens[1]);
+            traceId = TmfTraceType.getTraceTypeId(tokens[0], tokens[1]);
         }
 
         // Save dialog settings
@@ -928,11 +928,11 @@ public class ImportTraceWizardPage extends WizardResourceImportPage {
                     return;
                 }
             } else {
-                boolean isDirectoryTraceType = TmfTraceType.getInstance().isDirectoryTraceType(fTraceType);
+                boolean isDirectoryTraceType = TmfTraceType.isDirectoryTraceType(fTraceType);
                 if (fileSystemElement.isDirectory() != isDirectoryTraceType) {
                     return;
                 }
-                traceTypeHelper = TmfTraceType.getInstance().getTraceType(fTraceType);
+                traceTypeHelper = TmfTraceType.getTraceType(fTraceType);
 
                 if (traceTypeHelper == null) {
                     // Trace type not found
@@ -1056,7 +1056,7 @@ public class ImportTraceWizardPage extends WizardResourceImportPage {
         private boolean isDirectoryTrace(FileSystemElement fileSystemElement) {
             File file = (File) fileSystemElement.getFileSystemObject();
             String path = file.getAbsolutePath();
-            if (TmfTraceType.getInstance().isDirectoryTrace(path)) {
+            if (TmfTraceType.isDirectoryTrace(path)) {
                 return true;
             }
             return false;
index 4532d9d5ccb53afa07ad042cf80c2c59111bc251..6a19be7f9cb17cbf9ca766c4733539e5dd10e903 100644 (file)
@@ -478,7 +478,7 @@ public class ImportTraceWizardScanPage extends AbstractImportTraceWizardPage {
                     final TraceValidationHelper traceToScan = fTracesToScan.take();
 
                     if (!getBatchWizard().hasScanned(traceToScan)) {
-                        getBatchWizard().addResult(traceToScan, TmfTraceType.getInstance().validate(traceToScan));
+                        getBatchWizard().addResult(traceToScan, TmfTraceType.validate(traceToScan));
                     }
 
                     /*
index 1b5be00c275e7fb8392d83544aceda751961a994..d52e43511dac9bbd60b659135b38cfa30fd787ee 100644 (file)
@@ -40,8 +40,8 @@ public class TraceTypeContentProvider implements ITreeContentProvider {
         fTraceType.clear();
         fTraceCategory.clear();
 
-        for (String category : TmfTraceType.getInstance().getTraceCategories()) {
-            List<TraceTypeHelper> value = TmfTraceType.getInstance().getTraceTypes(category);
+        for (String category : TmfTraceType.getTraceCategories()) {
+            List<TraceTypeHelper> value = TmfTraceType.getTraceTypes(category);
             if (!value.isEmpty()) {
                 fTraceCategory.add(category);
                 fTraceType.put(category, value);
index c7c87ab89c013dab9203550fd7873dfa2cd4dfa6..b2e958712346ba0dd90c2cbfc8e3543cb66a9559 100644 (file)
@@ -352,7 +352,7 @@ public class TracePackageImportOperation extends AbstractTracePackageOperation i
         TraceTypeHelper traceType = null;
         String traceTypeStr = traceElement.getTraceType();
         if (traceTypeStr != null) {
-            traceType = TmfTraceType.getInstance().getTraceType(traceTypeStr);
+            traceType = TmfTraceType.getTraceType(traceTypeStr);
             if (traceType == null) {
                 return new Status(IStatus.ERROR, Activator.PLUGIN_ID, MessageFormat.format(Messages.ImportTracePackageWizardPage_ErrorSettingTraceType, traceElement.getTraceType(), destinationName));
             }
index c37a60a44250098bd1dce280a7a049bf31ef6942..b313f024c53665625e14ecf6095fbafd171a1adb 100644 (file)
@@ -110,7 +110,7 @@ public abstract class TmfCommonProjectElement extends TmfProjectModelElement {
             childrenMap.put(analysis.getAnalysisId(), analysis);
         }
 
-        TraceTypeHelper helper = TmfTraceType.getInstance().getTraceType(getTraceType());
+        TraceTypeHelper helper = TmfTraceType.getTraceType(getTraceType());
 
         Class<? extends ITmfTrace> traceClass = null;
 
index 0d37c55426eeba82b47575201bc7c64251c2b759..b25ccce11b6d68aaf73b65a771a7b051065b0036 100644 (file)
@@ -213,7 +213,7 @@ public class TmfExperimentElement extends TmfCommonProjectElement implements IPr
     public void refreshTraceType() {
         super.refreshTraceType();
         if (getTraceType() == null) {
-            IConfigurationElement ce = TmfTraceType.getInstance().getTraceAttributes(TmfTraceType.DEFAULT_EXPERIMENT_TYPE);
+            IConfigurationElement ce = TmfTraceType.getTraceAttributes(TmfTraceType.DEFAULT_EXPERIMENT_TYPE);
             if (ce != null) {
                 try {
                     IFolder experimentFolder = getResource();
@@ -257,7 +257,7 @@ public class TmfExperimentElement extends TmfCommonProjectElement implements IPr
         IWorkspace workspace = ResourcesPlugin.getWorkspace();
         try {
             String traceTypeId = trace.getResource().getPersistentProperty(TmfCommonConstants.TRACETYPE);
-            TraceTypeHelper traceType = TmfTraceType.getInstance().getTraceType(traceTypeId);
+            TraceTypeHelper traceType = TmfTraceType.getTraceType(traceTypeId);
 
             if (resource instanceof IFolder) {
                 IFolder folder = experiment.getFolder(trace.getElementPath());
index a12fb76bc042f1be4dae7ef9661f4ae80a9f422d..e9a9baad2ce4b6bd6c5ec7533dbaa4a367dc06fc 100644 (file)
@@ -111,7 +111,7 @@ public class TmfNavigatorLabelProvider implements ICommonLabelProvider, IStyledL
             TmfCommonProjectElement trace = (TmfCommonProjectElement) element;
             try {
                 String traceType = trace.getResource().getPersistentProperty(TmfCommonConstants.TRACETYPE);
-                if (traceType == null || TmfTraceType.getInstance().getTraceType(traceType) == null) {
+                if (traceType == null || TmfTraceType.getTraceType(traceType) == null) {
                     return fUnknownTraceIcon;
                 }
 
index 6d431c667ffbaa10040fa089c0ddd31db00ad8e9..49ad262fdc02efb92a0c2b4bf140a4fc9dbba72f 100644 (file)
@@ -164,14 +164,14 @@ public class TmfOpenTraceHelper {
             // First check parent
             File parent = file.getParentFile();
             String pathToUse = parent.getAbsolutePath();
-            if (TmfTraceType.getInstance().isDirectoryTrace(pathToUse)) {
+            if (TmfTraceType.isDirectoryTrace(pathToUse)) {
                 return pathToUse;
             }
             // Second check grandparent
             File grandParent = parent.getParentFile();
             if (grandParent != null) {
                 pathToUse = grandParent.getAbsolutePath();
-                if (TmfTraceType.getInstance().isDirectoryTrace(pathToUse)) {
+                if (TmfTraceType.isDirectoryTrace(pathToUse)) {
                     return pathToUse;
                 }
             }
index cc37e5d211eaea72f33dac1c188ef47c711b462a..5e2ad50b536354a55e987031f74a66413c2b6874 100644 (file)
@@ -115,7 +115,7 @@ public class TmfTraceFolder extends TmfProjectModelElement implements IPropertyS
                         (resource.getPersistentProperty(TmfCommonConstants.TRACETYPE) == null);
                 ITmfProjectModelElement element = childrenMap.get(name);
                 if (isFolder && !(element instanceof TmfTraceFolder) && !(element instanceof TmfTraceElement)) {
-                    if (TmfTraceType.getInstance().isDirectoryTrace(resource.getLocationURI().getPath())) {
+                    if (TmfTraceType.isDirectoryTrace(resource.getLocationURI().getPath())) {
                         element = new TmfTraceElement(name, resource, this);
                     } else {
                         element = new TmfTraceFolder(name, (IFolder) resource, this);
index fa0bd8291666ba3cfc6d5f77d5b62c8bafe40818..2c381e6b409791c8f9644be6e3815a509ec62eef 100644 (file)
@@ -126,14 +126,14 @@ public final class TmfTraceTypeUIUtils {
      * @return true if the trace is a custom type
      */
     private static boolean isCustomTraceId(String traceTypeId) {
-        TraceTypeHelper traceType = TmfTraceType.getInstance().getTraceType(traceTypeId);
+        TraceTypeHelper traceType = TmfTraceType.getTraceType(traceTypeId);
         if (traceType != null) {
             return TmfTraceType.isCustomTrace(traceType.getCategoryName() + SEPARATOR + traceType.getName());
         }
         return false;
     }
 
-    private static TraceTypeHelper getTraceTypeToSet(TmfTraceType type, List<Pair<Integer, TraceTypeHelper>> candidates, Shell shell) {
+    private static TraceTypeHelper getTraceTypeToSet(List<Pair<Integer, TraceTypeHelper>> candidates, Shell shell) {
         final Map<String, String> names = new HashMap<>();
         Shell shellToShow = new Shell(shell);
         shellToShow.setText(Messages.TmfTraceType_SelectTraceType);
@@ -170,7 +170,7 @@ public final class TmfTraceTypeUIUtils {
                 display.sleep();
             }
         }
-        return type.getTraceTypeHelper(candidatesToSet[0]);
+        return TmfTraceType.getTraceTypeHelper(candidatesToSet[0]);
     }
 
     /**
@@ -191,7 +191,6 @@ public final class TmfTraceTypeUIUtils {
      *             file
      */
     public static TraceTypeHelper selectTraceType(String path, Shell shell, String traceTypeHint) throws TmfTraceImportException {
-        TmfTraceType type = TmfTraceType.getInstance();
 
         Comparator<Pair<Integer, TraceTypeHelper>> comparator = new Comparator<Pair<Integer, TraceTypeHelper>>() {
             @Override
@@ -204,7 +203,7 @@ public final class TmfTraceTypeUIUtils {
             }
         };
         TreeSet<Pair<Integer, TraceTypeHelper>> validCandidates = new TreeSet<>(comparator);
-        final Iterable<TraceTypeHelper> traceTypeHelpers = type.getTraceTypeHelpers();
+        final Iterable<TraceTypeHelper> traceTypeHelpers = TmfTraceType.getTraceTypeHelpers();
         for (TraceTypeHelper traceTypeHelper : traceTypeHelpers) {
             if (traceTypeHelper.isExperimentType()) {
                 continue;
@@ -243,7 +242,7 @@ public final class TmfTraceTypeUIUtils {
                         traceTypeToSet = candidate.getSecond();
                     }
                 } else {
-                    traceTypeToSet = getTraceTypeToSet(type, reducedCandidates, shell);
+                    traceTypeToSet = getTraceTypeToSet(reducedCandidates, shell);
                 }
             }
         } else {
index 5df507e91a14a298e8eb436f3fa5c4b666eb8d5c..b77969d570289843666a816b7ff6bd4f2172511e 100644 (file)
@@ -193,7 +193,7 @@ public class NewExperimentDialog extends SelectionStatusDialog {
                      * Experiments can be set to the default experiment type. No
                      * need to force user to select an experiment type
                      */
-                    IConfigurationElement ce = TmfTraceType.getInstance().getTraceAttributes(TmfTraceType.DEFAULT_EXPERIMENT_TYPE);
+                    IConfigurationElement ce = TmfTraceType.getTraceAttributes(TmfTraceType.DEFAULT_EXPERIMENT_TYPE);
                     if (ce != null) {
                         try {
                             experimentFolder.setPersistentProperty(TmfCommonConstants.TRACETYPE, ce.getAttribute(TmfTraceType.ID_ATTR));
This page took 0.043706 seconds and 5 git commands to generate.