Glitch in commit...

diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/Activator.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/Activator.java
new file mode 100644 (file)
index 0000000..9ca38df
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/Activator.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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 (fchouinard@gmail.com) - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.tmf;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * <b><u>Activator</u></b>
+ * <p>
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+    // ========================================================================
+    // Attributes
+    // ========================================================================
+
+       // The plug-in ID
+       public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf";
+
+       // The shared instance
+       private static Activator plugin;
+       
+    // ========================================================================
+    // Constructors
+    // ========================================================================
+
+       /**
+        * The constructor
+        */
+       public Activator() {
+       }
+
+    // ========================================================================
+    // Accessors
+    // ========================================================================
+
+    /**
+     * @return the shared instance
+     */
+    public static Activator getDefault() {
+        return plugin;
+    }
+
+    // ========================================================================
+    // Operators
+    // ========================================================================
+
+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+        */
+       public void start(BundleContext context) throws Exception {
+               super.start(context);
+               plugin = this;
+       }
+
+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+        */
+       public void stop(BundleContext context) throws Exception {
+               plugin = null;
+               super.stop(context);
+       }
+
+}

diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Activator.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Activator.java
deleted file mode 100644 (file)
index 9ca38df..0000000
--- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Activator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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 (fchouinard@gmail.com) - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.linuxtools.tmf;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <b><u>Activator</u></b>
- * <p>
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-    // ========================================================================
-    // Attributes
-    // ========================================================================
-
-       // The plug-in ID
-       public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf";
-
-       // The shared instance
-       private static Activator plugin;
-       
-    // ========================================================================
-    // Constructors
-    // ========================================================================
-
-       /**
-        * The constructor
-        */
-       public Activator() {
-       }
-
-    // ========================================================================
-    // Accessors
-    // ========================================================================
-
-    /**
-     * @return the shared instance
-     */
-    public static Activator getDefault() {
-        return plugin;
-    }
-
-    // ========================================================================
-    // Operators
-    // ========================================================================
-
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-        */
-       public void start(BundleContext context) throws Exception {
-               super.start(context);
-               plugin = this;
-       }
-
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-        */
-       public void stop(BundleContext context) throws Exception {
-               plugin = null;
-               super.stop(context);
-       }
-
-}