Internalize lttng.ui Activator

diff --git a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
index 7cb60a3171ccab6325c916ab293c018fe11d5907..5af50111c4c7f3625818ab282eef6333cbed22cb 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.ui;singleton:=true
 Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.lttng.ui.Activator
+Bundle-Activator: org.eclipse.linuxtools.internal.lttng.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.ui.ide;bundle-version="3.7.0",
@@ -21,8 +21,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.lttng.ui,
- org.eclipse.linuxtools.internal.lttng.ui;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
+Export-Package: org.eclipse.linuxtools.internal.lttng.ui;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
  org.eclipse.linuxtools.internal.lttng.ui.model.trange;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
  org.eclipse.linuxtools.internal.lttng.ui.tracecontrol;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",
  org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions;x-friends:="org.eclipse.linuxtools.lttng.ui.tests",

diff --git a/org.eclipse.linuxtools.lttng.ui/plugin.xml b/org.eclipse.linuxtools.lttng.ui/plugin.xml
index 63532f0fe913ae204757f6ce3b1679fab7e05bf0..1025b522b0ac83c3d4346c0a5d8e252a6454ee90 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/plugin.xml
+++ b/org.eclipse.linuxtools.lttng.ui/plugin.xml
@@ -98,7 +98,7 @@
          point="org.eclipse.core.resources.natures">
       <runtime>
          <run
-               class="org.eclipse.linuxtools.lttng.core.LTTngProjectNature">
+               class="org.eclipse.linuxtools.internal.lttng.core.LTTngProjectNature">
          </run>
       </runtime>
    </extension>

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/Activator.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/Activator.java
new file mode 100644 (file)
index 0000000..e002259
--- /dev/null
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/Activator.java
@@ -0,0 +1,139 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 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
+ * 
+ * Contributors:
+ *   Francois Chouinard - Initial API and implementation
+ *   Bernd Hufmann - Updated for LTTng trace control
+ *   
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.internal.lttng.ui;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.core.runtime.IAdapterManager;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
+import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.TraceAdapterFactory;
+import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
+import org.eclipse.rse.services.clientserver.messages.SystemMessage;
+import org.eclipse.rse.ui.SystemBasePlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends SystemBasePlugin {
+
+       // The plug-in ID
+       public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.ui"; //$NON-NLS-1$
+
+    // Icon names
+    public static final String ICON_ID_PROVIDER = "ICON_ID_PROVIDER"; //$NON-NLS-1$
+    public static final String ICON_ID_TARGET = "ICON_ID_TARGET"; //$NON-NLS-1$
+    public static final String ICON_ID_TRACE = "ICON_ID_TRACE"; //$NON-NLS-1$
+    public static final String ICON_ID_NEW_TRACE = "ICON_ID_NEW_TRACE"; //$NON-NLS-1$
+    public static final String ICON_ID_CONFIG_MARKERS = "ICON_ID_CONFIG_MARKERS"; //$NON-NLS-1$
+    public static final String ICON_ID_CONFIG_TRACE = "ICON_ID_CONFIG_TRACE"; //$NON-NLS-1$
+    public static final String ICON_ID_CHECKED = "ICON_ID_CHECKED"; //$NON-NLS-1$
+    public static final String ICON_ID_UNCHECKED = "ICON_ID_UNCHECKED"; //$NON-NLS-1$
+    public static final String ICON_ID_IMPORT_TRACE = "ICON_ID_IMPORT_TRACE"; //$NON-NLS-1$
+    public static final String ICON_ID_EDIT = "ICON_ID_EDIT"; //$NON-NLS-1$
+       
+       // The shared instance
+       private static Activator plugin;
+       
+       /**
+        * The constructor
+        */
+       public Activator() {
+       }
+
+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+        */
+       @Override
+       public void start(BundleContext context) throws Exception {
+               super.start(context);
+               TraceDebug.init();
+               
+        // Trace control initialization
+        IAdapterManager manager = Platform.getAdapterManager();
+        TraceAdapterFactory factory = new TraceAdapterFactory();
+        manager.registerAdapters(factory, ProviderResource.class);
+        manager.registerAdapters(factory, TargetResource.class);
+        manager.registerAdapters(factory, TraceResource.class);
+        
+        // Assign shared instance
+               plugin = this;
+       }
+
+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+        */
+       @Override
+       public void stop(BundleContext context) throws Exception {
+               TraceDebug.stop();
+               plugin = null;
+               super.stop(context);
+       }
+
+       /**
+        * Returns the shared instance
+        *
+        * @return the shared instance
+        */
+       public static Activator getDefault() {
+               return plugin;
+       }
+    
+    /**
+     * Create a System Message for given throwable
+     * 
+     * @param x - The throwable the message is for
+     * @return
+     */
+    public SystemMessage getMessage(Throwable x) {
+        String msg = x.getMessage();
+        if (msg == null) {
+            msg = ""; //$NON-NLS-1$
+        }
+        if ((x instanceof ExecutionException) && (((ExecutionException)x).getCause() != null)) {
+            msg += " (" + ((ExecutionException)x).getCause().getMessage() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        }
+        if (x instanceof TimeoutException) {
+            msg += " (" + Messages.Ltt_TimeoutMsg + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+        }
+        return new SimpleSystemMessage(PLUGIN_ID, SystemMessage.ERROR, msg, x);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.eclipse.rse.ui.SystemBasePlugin#initializeImageRegistry()
+     */
+    @Override
+    protected void initializeImageRegistry() {
+        String path = getIconPath();
+        putImageInRegistry(ICON_ID_PROVIDER, path + "obj16/providers.gif"); //$NON-NLS-1$
+        putImageInRegistry(ICON_ID_TARGET, path + "obj16/targets.gif"); //$NON-NLS-1$
+        putImageInRegistry(ICON_ID_TRACE, path + "obj16/trace.gif"); //$NON-NLS-1$
+        putImageInRegistry(ICON_ID_NEW_TRACE, path + "elcl16/new_trace.gif"); //$NON-NLS-1$
+        putImageInRegistry(ICON_ID_CONFIG_MARKERS, path + "elcl16/configure_markers.gif"); //$NON-NLS-1$ 
+        putImageInRegistry(ICON_ID_CONFIG_TRACE, path + "elcl16/configure_trace.gif"); //$NON-NLS-1$ 
+        putImageInRegistry(ICON_ID_CHECKED, path + "elcl16/checked.gif"); //$NON-NLS-1$
+        putImageInRegistry(ICON_ID_UNCHECKED, path + "elcl16/unchecked.gif"); //$NON-NLS-1$
+        putImageInRegistry(ICON_ID_IMPORT_TRACE, path + "elcl16/import_trace.gif"); //$NON-NLS-1$
+        putImageInRegistry(ICON_ID_EDIT, path + "elcl16/edit.gif"); //$NON-NLS-1$
+    }
+}

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/LTTngUILogger.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/LTTngUILogger.java
index 8be34cbc671dcfd745f358bb727abb372b2f857b..ca825b005e92a6bd0c28fd823e09c639a6f1a852 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/LTTngUILogger.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/LTTngUILogger.java
@@ -12,7 +12,6 @@
 
 package org.eclipse.linuxtools.internal.lttng.ui;
 
-import org.eclipse.linuxtools.lttng.ui.Activator;
 
 /**
  * <b><u>LTTngUILogger</u></b>

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/TraceDebug.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/TraceDebug.java
index d2872e3ae47f797d782f61a41bdf2dcf1b5f7baf..1487357800481c90eba4e5d233dd30d5e1c9aaad 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/TraceDebug.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/TraceDebug.java
@@ -12,7 +12,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;\r
 import org.eclipse.core.runtime.Plugin;\r
 import org.eclipse.core.runtime.Status;\r
-import org.eclipse.linuxtools.lttng.ui.Activator;\r
 \r
 @SuppressWarnings("nls")\r
 public class TraceDebug {\r

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
index d35cd53fe2fefe0cfb5b53494d8dd1ac9f6f37c3..d6d922b3c209fc6e4a913523706a0ff5e459f539 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java
@@ -24,11 +24,11 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs.ConfigureMarkersDialog;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java
index d7a593c0769d3ff835637e42180c30e91398e53b..06bc44f6084a28323a906c7cf42ea01bef21511f 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java
@@ -27,11 +27,11 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.Trac
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.wizards.ConfigureTraceWizard;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java
index c5f852ebf8e150c8ee9535fdac02fa4399fc932c..99c1af26873664e0e428ea82244cc0523bb117d8 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java
@@ -27,11 +27,11 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResour
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs.NewTraceDialog;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ImportToProject.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ImportToProject.java
index 28dc8f4e41901dd161fc3ef8eebe9a1f0761a540..34bb52653e49f42dc9e9a224ae69c6d18be66244 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ImportToProject.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ImportToProject.java
@@ -30,9 +30,9 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs.ImportTraceDialog;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement;
 import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java
index aba32e633db15203df4d27873a0e8961640089cf..0f3c02cef346ebb870602888ddbbeceefe640aa3 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java
@@ -24,10 +24,10 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java
index 7d5e87c10501123a126036e4d8b1dddd8e8649d1..99c8ab3e69447b00dafc6e43745dd92a84e7b25e 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java
@@ -28,11 +28,11 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResour
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility.LiveTraceManager;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.dialogs.SelectTracePathDialog;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java
index b608f116ee921e215ea83a68a5f0135968588a6b..b51165b9556c6e382b4af3095d2eea2d3594860c 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java
@@ -26,10 +26,10 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResour
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility.LiveTraceManager;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.core.events.ISystemRemoteChangeEvents;
 import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
index da09db6348646edaa8b26ded5db1977c5e4c6982..035a8f6248c6b9e12a6b5473450c38a8a20e2b8b 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java
@@ -19,10 +19,10 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.SWT;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
index d2d10992677b6d0ccd0abddac844b18fb78309bd..a43eff76c26c2333325dd95033b51040a537e5a4 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ImportTraceDialog.java
@@ -20,8 +20,8 @@ import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.linuxtools.internal.lttng.core.LTTngProjectNature;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
index 338949f55cf1b86cd12b811d805209e3c59f59fd..10c02f597f642c2713188c20db179d2d2ddafa92 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/NewTraceDialog.java
@@ -22,10 +22,10 @@ import org.eclipse.linuxtools.internal.lttng.core.LTTngProjectNature;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.ui.SystemBasePlugin;
 import org.eclipse.swt.SWT;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
index 93d3627153c3e4e29784368bf01f74c1316e5bb3..8cd0598475ade8a40aec3aa4c598bd5645a957fa 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/ProviderResourceAdapter.java
@@ -18,10 +18,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.ProviderResource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.ui.SystemMenuManager;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TargetResourceAdapter.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
index 1e7d49723dc3ab41c60e75a2c3d7fd26aff9e539..33d4fd3b5992e3ac55e222eab2e6356478cc2a7d 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TargetResourceAdapter.java
@@ -18,9 +18,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.ui.SystemMenuManager;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
 import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TraceResourceAdapter.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
index 76aff98fa04f6a648492bfab2e7ec94ccc67217d..54c323eefd63db79b24b2fc951e4667d4c2ef4ea 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/TraceResourceAdapter.java
@@ -24,9 +24,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.PropertyInfo;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.ui.SystemMenuManager;
 import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
index 9e66fb3f243ede5f82ecbf9067f896728005e9da..a9d16383686126b8ae57a75101849a5c1ea740a2 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/model/config/TraceChannelTableLabelProvider.java
@@ -15,7 +15,7 @@ package org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannel;
-import org.eclipse.linuxtools.lttng.ui.Activator;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.swt.graphics.Image;
 
 /**

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
index 09f6ff81036cfecc9847f8b15fc3a0b31998a545..854d7b840d98e6e98abf354ac6e6f12bcf077a9f 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java
@@ -30,12 +30,12 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.Trac
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.LttControllerServiceProxy;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.utility.LiveTraceManager;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.ImportToProject;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.actions.PauseTrace;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.connectorservice.TraceConnectorService;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.rse.core.events.ISystemResourceChangeEvents;
 import org.eclipse.rse.core.events.SystemResourceChangeEvent;
 import org.eclipse.rse.core.filters.ISystemFilter;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
index db3dfa293eb6d787c137f1c15a54473ff776c4a6..270f84f04fa85311098315c8db4ad665ecdaa357 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java
@@ -22,9 +22,9 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.Trac
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;\r
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig;\r
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService;\r
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;\r
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstants;\r
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;\r
-import org.eclipse.linuxtools.lttng.ui.Activator;\r
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;\r
 import org.eclipse.rse.ui.SystemBasePlugin;\r
 import org.eclipse.tm.tcf.protocol.IToken;\r

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
index b815d465b8b14bdc14ce2e4362f03623e5585367..58226ee8f7b8aeb30173a106292f36a6f77495c9 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/KernelTraceChannelConfigurationPage.java
@@ -32,11 +32,11 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource.TraceState;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannel;
 import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceChannels;
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config.TraceChannelCellModifier;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config.TraceChannelTableContentProvider;
 import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.config.TraceChannelTableLabelProvider;
-import org.eclipse.linuxtools.lttng.ui.Activator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/AbstractDialog.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/AbstractDialog.java
index a27e4f991229ba49d894ae5cf74716abc2033fb4..0a850215485917bfe16bb2d668e358b40a836668 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/AbstractDialog.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/views/latency/dialogs/AbstractDialog.java
@@ -20,8 +20,8 @@ import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;\r
 import org.eclipse.linuxtools.internal.lttng.core.latency.analyzer.EventMatcher;\r
 import org.eclipse.linuxtools.internal.lttng.core.util.EventsPair;\r
+import org.eclipse.linuxtools.internal.lttng.ui.Activator;\r
 import org.eclipse.linuxtools.internal.lttng.ui.views.latency.model.LatencyController;\r
-import org.eclipse.linuxtools.lttng.ui.Activator;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r
 import org.eclipse.swt.widgets.Display;\r

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/Activator.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/Activator.java
deleted file mode 100644 (file)
index b3d5974..0000000
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/Activator.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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
- * 
- * Contributors:
- *   Francois Chouinard - Initial API and implementation
- *   Bernd Hufmann - Updated for LTTng trace control
- *   
- *******************************************************************************/
-
-package org.eclipse.linuxtools.lttng.ui;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.ProviderResource;
-import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TargetResource;
-import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResource;
-import org.eclipse.linuxtools.internal.lttng.ui.TraceDebug;
-import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.Messages;
-import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.model.TraceAdapterFactory;
-import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends SystemBasePlugin {
-
-       // The plug-in ID
-       public static final String PLUGIN_ID = "org.eclipse.linuxtools.lttng.ui"; //$NON-NLS-1$
-
-    // Icon names
-    public static final String ICON_ID_PROVIDER = "ICON_ID_PROVIDER"; //$NON-NLS-1$
-    public static final String ICON_ID_TARGET = "ICON_ID_TARGET"; //$NON-NLS-1$
-    public static final String ICON_ID_TRACE = "ICON_ID_TRACE"; //$NON-NLS-1$
-    public static final String ICON_ID_NEW_TRACE = "ICON_ID_NEW_TRACE"; //$NON-NLS-1$
-    public static final String ICON_ID_CONFIG_MARKERS = "ICON_ID_CONFIG_MARKERS"; //$NON-NLS-1$
-    public static final String ICON_ID_CONFIG_TRACE = "ICON_ID_CONFIG_TRACE"; //$NON-NLS-1$
-    public static final String ICON_ID_CHECKED = "ICON_ID_CHECKED"; //$NON-NLS-1$
-    public static final String ICON_ID_UNCHECKED = "ICON_ID_UNCHECKED"; //$NON-NLS-1$
-    public static final String ICON_ID_IMPORT_TRACE = "ICON_ID_IMPORT_TRACE"; //$NON-NLS-1$
-    public static final String ICON_ID_EDIT = "ICON_ID_EDIT"; //$NON-NLS-1$
-       
-       // The shared instance
-       private static Activator plugin;
-       
-       /**
-        * The constructor
-        */
-       public Activator() {
-       }
-
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-        */
-       @Override
-       public void start(BundleContext context) throws Exception {
-               super.start(context);
-               TraceDebug.init();
-               
-        // Trace control initialization
-        IAdapterManager manager = Platform.getAdapterManager();
-        TraceAdapterFactory factory = new TraceAdapterFactory();
-        manager.registerAdapters(factory, ProviderResource.class);
-        manager.registerAdapters(factory, TargetResource.class);
-        manager.registerAdapters(factory, TraceResource.class);
-        
-        // Assign shared instance
-               plugin = this;
-       }
-
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-        */
-       @Override
-       public void stop(BundleContext context) throws Exception {
-               TraceDebug.stop();
-               plugin = null;
-               super.stop(context);
-       }
-
-       /**
-        * Returns the shared instance
-        *
-        * @return the shared instance
-        */
-       public static Activator getDefault() {
-               return plugin;
-       }
-    
-    /**
-     * Create a System Message for given throwable
-     * 
-     * @param x - The throwable the message is for
-     * @return
-     */
-    public SystemMessage getMessage(Throwable x) {
-        String msg = x.getMessage();
-        if (msg == null) {
-            msg = ""; //$NON-NLS-1$
-        }
-        if ((x instanceof ExecutionException) && (((ExecutionException)x).getCause() != null)) {
-            msg += " (" + ((ExecutionException)x).getCause().getMessage() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        if (x instanceof TimeoutException) {
-            msg += " (" + Messages.Ltt_TimeoutMsg + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        return new SimpleSystemMessage(PLUGIN_ID, SystemMessage.ERROR, msg, x);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.rse.ui.SystemBasePlugin#initializeImageRegistry()
-     */
-    @Override
-    protected void initializeImageRegistry() {
-        String path = getIconPath();
-        putImageInRegistry(ICON_ID_PROVIDER, path + "obj16/providers.gif"); //$NON-NLS-1$
-        putImageInRegistry(ICON_ID_TARGET, path + "obj16/targets.gif"); //$NON-NLS-1$
-        putImageInRegistry(ICON_ID_TRACE, path + "obj16/trace.gif"); //$NON-NLS-1$
-        putImageInRegistry(ICON_ID_NEW_TRACE, path + "elcl16/new_trace.gif"); //$NON-NLS-1$
-        putImageInRegistry(ICON_ID_CONFIG_MARKERS, path + "elcl16/configure_markers.gif"); //$NON-NLS-1$ 
-        putImageInRegistry(ICON_ID_CONFIG_TRACE, path + "elcl16/configure_trace.gif"); //$NON-NLS-1$ 
-        putImageInRegistry(ICON_ID_CHECKED, path + "elcl16/checked.gif"); //$NON-NLS-1$
-        putImageInRegistry(ICON_ID_UNCHECKED, path + "elcl16/unchecked.gif"); //$NON-NLS-1$
-        putImageInRegistry(ICON_ID_IMPORT_TRACE, path + "elcl16/import_trace.gif"); //$NON-NLS-1$
-        putImageInRegistry(ICON_ID_EDIT, path + "elcl16/edit.gif"); //$NON-NLS-1$
-    }
-}