Update GDB Tracepoint Analysis tests

Also rename package org.eclipse.linuxtools.internal.gdbtrace to
org.eclipse.linuxtools.internal.gdbtrace.core.

Change-Id: I72d623344ebbbcb9c6dcc7afd2e499e9d5495e35
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/11139
Tested-by: Hudson CI
Reviewed-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
IP-Clean: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Tested-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>

17 files changed, 125 insertions, 33 deletions

diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/src/org/eclipse/linuxtools/gdbtrace/core/tests/AllGdbTraceCoreTests.java b/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/src/org/eclipse/linuxtools/gdbtrace/core/tests/AllGdbTraceCoreTests.java
index 2218ec8cc9..6b43da5bc8 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/src/org/eclipse/linuxtools/gdbtrace/core/tests/AllGdbTraceCoreTests.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/src/org/eclipse/linuxtools/gdbtrace/core/tests/AllGdbTraceCoreTests.java
@@ -20,6 +20,7 @@ import org.junit.runners.Suite;
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
+    GdbTraceCorePluginTest.class
 })
 
 public class AllGdbTraceCoreTests {
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/src/org/eclipse/linuxtools/gdbtrace/core/tests/GdbTraceCorePluginTest.java b/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/src/org/eclipse/linuxtools/gdbtrace/core/tests/GdbTraceCorePluginTest.java
new file mode 100644
index 0000000000..9c7bf5d871
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core.tests/src/org/eclipse/linuxtools/gdbtrace/core/tests/GdbTraceCorePluginTest.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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:
+ *   Patrick Tasse - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.gdbtrace.core.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.linuxtools.internal.gdbtrace.core.GdbTraceCorePlugin;
+import org.junit.Test;
+
+@SuppressWarnings({ "nls", "javadoc" })
+public class GdbTraceCorePluginTest {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+    // Plug-in instantiation
+    private final static Plugin fPlugin = GdbTraceCorePlugin.getDefault();
+
+    // ------------------------------------------------------------------------
+    // Test cases
+    // ------------------------------------------------------------------------
+
+    @Test
+    public void testPluginId() {
+        assertEquals("Plugin ID", "org.eclipse.linuxtools.gdbtrace.core", GdbTraceCorePlugin.PLUGIN_ID);
+    }
+
+    @Test
+    public void testGetDefault() {
+        Plugin plugin = GdbTraceCorePlugin.getDefault();
+        assertEquals("getDefault()", plugin, fPlugin); //$NON-NLS-1$
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
index b77bed5b7c..6ed1676c95 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.linuxtools.internal.gdbtrace.GdbTraceCorePlugin
+Bundle-Activator: org.eclipse.linuxtools.internal.gdbtrace.core.GdbTraceCorePlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.ide,
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.linuxtools.internal.gdbtrace;x-internal:=true,
- org.eclipse.linuxtools.internal.gdbtrace.event;x-friends:="org.eclipse.linuxtools.gdbtrace.ui",
- org.eclipse.linuxtools.internal.gdbtrace.trace;x-friends:="org.eclipse.linuxtools.gdbtrace.ui"
+Export-Package: org.eclipse.linuxtools.internal.gdbtrace.core;x-internal:=true,
+ org.eclipse.linuxtools.internal.gdbtrace.core.event;x-friends:="org.eclipse.linuxtools.gdbtrace.ui",
+ org.eclipse.linuxtools.internal.gdbtrace.core.trace;x-friends:="org.eclipse.linuxtools.gdbtrace.ui"
 Import-Package: org.eclipse.cdt.dsf.concurrent,
  org.eclipse.cdt.dsf.datamodel,
  org.eclipse.cdt.dsf.debug.service,
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/GdbTraceCorePlugin.java b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/GdbTraceCorePlugin.java
index e5ff16666e..230323df25 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/GdbTraceCorePlugin.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/GdbTraceCorePlugin.java
@@ -11,7 +11,7 @@
  *   Patrick Tasse - Updated for TMF 2.0
  *******************************************************************************/
 
-package org.eclipse.linuxtools.internal.gdbtrace;
+package org.eclipse.linuxtools.internal.gdbtrace.core;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
@@ -27,7 +27,7 @@ public class GdbTraceCorePlugin extends Plugin {
     // ------------------------------------------------------------------------
 
     /** The plug-in ID */
-    public static final String PLUGIN_ID = "org.eclipse.linuxtools.gdbtrace"; //$NON-NLS-1$
+    public static final String PLUGIN_ID = "org.eclipse.linuxtools.gdbtrace.core"; //$NON-NLS-1$
 
     private static GdbTraceCorePlugin plugin;
 
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/event/GdbTraceEvent.java b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/event/GdbTraceEvent.java
index 1b91f8300c..874e4b33e6 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/event/GdbTraceEvent.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/event/GdbTraceEvent.java
@@ -11,9 +11,9 @@
  *   Patrick Tasse - Updated for TMF 2.0
  *******************************************************************************/
 
-package org.eclipse.linuxtools.internal.gdbtrace.event;
+package org.eclipse.linuxtools.internal.gdbtrace.core.event;
 
-import org.eclipse.linuxtools.internal.gdbtrace.trace.GdbTrace;
+import org.eclipse.linuxtools.internal.gdbtrace.core.trace.GdbTrace;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventType;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/event/GdbTraceEventContent.java b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/event/GdbTraceEventContent.java
index ecb3e1c490..bac5fc8bd6 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/event/GdbTraceEventContent.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/event/GdbTraceEventContent.java
@@ -11,7 +11,7 @@
  *   Patrick Tasse - Updated for TMF 2.0
  *******************************************************************************/
 
-package org.eclipse.linuxtools.internal.gdbtrace.event;
+package org.eclipse.linuxtools.internal.gdbtrace.core.event;
 
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/trace/DsfGdbAdaptor.java b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/trace/DsfGdbAdaptor.java
index 604dc65932..301ba61e9f 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/trace/DsfGdbAdaptor.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/trace/DsfGdbAdaptor.java
@@ -13,7 +13,7 @@
  *   Bernd Hufmann - Fixed deadlock during shutdown
  *******************************************************************************/
 
-package org.eclipse.linuxtools.internal.gdbtrace.trace;
+package org.eclipse.linuxtools.internal.gdbtrace.core.trace;
 
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -75,9 +75,9 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.linuxtools.internal.gdbtrace.GdbTraceCorePlugin;
-import org.eclipse.linuxtools.internal.gdbtrace.event.GdbTraceEvent;
-import org.eclipse.linuxtools.internal.gdbtrace.event.GdbTraceEventContent;
+import org.eclipse.linuxtools.internal.gdbtrace.core.GdbTraceCorePlugin;
+import org.eclipse.linuxtools.internal.gdbtrace.core.event.GdbTraceEvent;
+import org.eclipse.linuxtools.internal.gdbtrace.core.event.GdbTraceEventContent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventType;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/trace/GdbTrace.java b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/trace/GdbTrace.java
index f0a05a53b0..c234cf438d 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/trace/GdbTrace.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.core/src/org/eclipse/linuxtools/internal/gdbtrace/core/trace/GdbTrace.java
@@ -12,14 +12,14 @@
  *   Patrick Tasse - Updated for TMF 2.0
  *******************************************************************************/
 
-package org.eclipse.linuxtools.internal.gdbtrace.trace;
+package org.eclipse.linuxtools.internal.gdbtrace.core.trace;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.linuxtools.internal.gdbtrace.GdbTraceCorePlugin;
-import org.eclipse.linuxtools.internal.gdbtrace.event.GdbTraceEvent;
+import org.eclipse.linuxtools.internal.gdbtrace.core.GdbTraceCorePlugin;
+import org.eclipse.linuxtools.internal.gdbtrace.core.event.GdbTraceEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp;
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/src/org/eclipse/linuxtools/gdbtrace/ui/tests/AllGdbTraceUITests.java b/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/src/org/eclipse/linuxtools/gdbtrace/ui/tests/AllGdbTraceUITests.java
index b60e38e5a3..119111a035 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/src/org/eclipse/linuxtools/gdbtrace/ui/tests/AllGdbTraceUITests.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/src/org/eclipse/linuxtools/gdbtrace/ui/tests/AllGdbTraceUITests.java
@@ -20,6 +20,7 @@ import org.junit.runners.Suite;
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
+    GdbTraceUIPluginTest.class
 })
 
 public class AllGdbTraceUITests {
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/src/org/eclipse/linuxtools/gdbtrace/ui/tests/GdbTraceUIPluginTest.java b/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/src/org/eclipse/linuxtools/gdbtrace/ui/tests/GdbTraceUIPluginTest.java
new file mode 100644
index 0000000000..0fadbc14cd
--- /dev/null
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui.tests/src/org/eclipse/linuxtools/gdbtrace/ui/tests/GdbTraceUIPluginTest.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2013 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:
+ *   Patrick Tasse - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.linuxtools.gdbtrace.ui.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.linuxtools.internal.gdbtrace.ui.GdbTraceUIPlugin;
+import org.junit.Test;
+
+@SuppressWarnings({ "nls", "javadoc" })
+public class GdbTraceUIPluginTest {
+
+    // ------------------------------------------------------------------------
+    // Attributes
+    // ------------------------------------------------------------------------
+
+    // Plug-in instantiation
+    private final static Plugin fPlugin = GdbTraceUIPlugin.getDefault();
+
+    // ------------------------------------------------------------------------
+    // Test cases
+    // ------------------------------------------------------------------------
+
+    @Test
+    public void testPluginId() {
+        assertEquals("Plugin ID", "org.eclipse.linuxtools.gdbtrace.core", GdbTraceUIPlugin.PLUGIN_ID);
+    }
+
+    @Test
+    public void testGetDefault() {
+        Plugin plugin = GdbTraceUIPlugin.getDefault();
+        assertEquals("getDefault()", plugin, fPlugin); //$NON-NLS-1$
+    }
+}
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
index c3e4a3fc36..c532435e85 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.linuxtools.gdbtrace.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.linuxtools.internal.gdbtrace.ui.GdbTraceUiPlugin
+Bundle-Activator: org.eclipse.linuxtools.internal.gdbtrace.ui.GdbTraceUIPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/plugin.xml b/lttng/org.eclipse.linuxtools.gdbtrace.ui/plugin.xml
index 04cf2dec17..a559494823 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/plugin.xml
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/plugin.xml
@@ -26,11 +26,11 @@
       </category>
       <type
             category="org.eclipse.linuxtools.gdbtrace.ui.category"
-            event_type="org.eclipse.linuxtools.internal.gdbtrace.event.GdbTraceEvent"
+            event_type="org.eclipse.linuxtools.internal.gdbtrace.core.event.GdbTraceEvent"
             icon="icons/obj16/gdb_icon16.png"
             id="org.eclipse.linuxtools.gdbtrace.ui.type.gdb"
             name="GDB Trace"
-            trace_type="org.eclipse.linuxtools.internal.gdbtrace.trace.GdbTrace">
+            trace_type="org.eclipse.linuxtools.internal.gdbtrace.core.trace.GdbTrace">
          <eventsTableType
                class="org.eclipse.linuxtools.internal.gdbtrace.ui.views.events.GdbEventsTable">
          </eventsTableType>
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/GdbTraceUiPlugin.java b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/GdbTraceUIPlugin.java
index c647154aed..3a11d4ba6c 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/GdbTraceUiPlugin.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/GdbTraceUIPlugin.java
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
  * GDB Tracepoint Analysis UI plug-in activator
  * @author Francois Chouinard
  */
-public class GdbTraceUiPlugin extends AbstractUIPlugin {
+public class GdbTraceUIPlugin extends AbstractUIPlugin {
 
     // ------------------------------------------------------------------------
     // Attributes
@@ -29,7 +29,7 @@ public class GdbTraceUiPlugin extends AbstractUIPlugin {
     /** The plug-in ID */
     public static final String PLUGIN_ID = "org.eclipse.linuxtools.gdbtrace.ui"; //$NON-NLS-1$
 
-    private static GdbTraceUiPlugin plugin;
+    private static GdbTraceUIPlugin plugin;
 
     // ------------------------------------------------------------------------
     // Constructor
@@ -38,7 +38,7 @@ public class GdbTraceUiPlugin extends AbstractUIPlugin {
     /**
      * Constructor
      */
-    public GdbTraceUiPlugin() {
+    public GdbTraceUIPlugin() {
     }
 
     // ------------------------------------------------------------------------
@@ -66,7 +66,7 @@ public class GdbTraceUiPlugin extends AbstractUIPlugin {
      *
      * @return the GDB Tracepoints UI plug-in instance
      */
-    public static GdbTraceUiPlugin getDefault() {
+    public static GdbTraceUIPlugin getDefault() {
         return plugin;
     }
 
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/GdbPerspectiveFactory.java b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/GdbPerspectiveFactory.java
index 58e0539aa5..28b03dcb3a 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/GdbPerspectiveFactory.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/GdbPerspectiveFactory.java
@@ -14,7 +14,7 @@
 package org.eclipse.linuxtools.internal.gdbtrace.ui.views;
 
 import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.linuxtools.internal.gdbtrace.ui.GdbTraceUiPlugin;
+import org.eclipse.linuxtools.internal.gdbtrace.ui.GdbTraceUIPlugin;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
@@ -31,7 +31,7 @@ public class GdbPerspectiveFactory implements IPerspectiveFactory {
     // ------------------------------------------------------------------------
 
     /** The perspective ID */
-    public static final String ID = GdbTraceUiPlugin.PLUGIN_ID + ".perspective"; //$NON-NLS-1$
+    public static final String ID = GdbTraceUIPlugin.PLUGIN_ID + ".perspective"; //$NON-NLS-1$
 
     // Folders
     private static final String EditorArea         = IPageLayout.ID_EDITOR_AREA;
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/events/GdbEventsTable.java b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/events/GdbEventsTable.java
index c842d3ec67..03b54d18f3 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/events/GdbEventsTable.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/events/GdbEventsTable.java
@@ -14,9 +14,9 @@ package org.eclipse.linuxtools.internal.gdbtrace.ui.views.events;
 
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.linuxtools.internal.gdbtrace.event.GdbTraceEvent;
-import org.eclipse.linuxtools.internal.gdbtrace.event.GdbTraceEventContent;
-import org.eclipse.linuxtools.internal.gdbtrace.trace.GdbTrace;
+import org.eclipse.linuxtools.internal.gdbtrace.core.event.GdbTraceEvent;
+import org.eclipse.linuxtools.internal.gdbtrace.core.event.GdbTraceEventContent;
+import org.eclipse.linuxtools.internal.gdbtrace.core.trace.GdbTrace;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/project/dialogs/SelectTraceExecutableDialog.java b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/project/dialogs/SelectTraceExecutableDialog.java
index b27711e646..259b077029 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/project/dialogs/SelectTraceExecutableDialog.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/project/dialogs/SelectTraceExecutableDialog.java
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.linuxtools.internal.gdbtrace.ui.GdbTraceUiPlugin;
+import org.eclipse.linuxtools.internal.gdbtrace.ui.GdbTraceUIPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -51,9 +51,9 @@ import org.eclipse.ui.dialogs.SelectionStatusDialog;
  */
 public class SelectTraceExecutableDialog extends SelectionStatusDialog {
 
-    private final IStatus OK_STATUS = new Status(IStatus.OK, GdbTraceUiPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-    private final IStatus PATH_ERROR_STATUS = new Status(IStatus.ERROR, GdbTraceUiPlugin.PLUGIN_ID, Messages.SelectTraceExecutableDialog_Message);
-    private final IStatus BINARY_ERROR_STATUS = new Status(IStatus.ERROR, GdbTraceUiPlugin.PLUGIN_ID, Messages.SelectTraceExecutableDialog_BinaryError);
+    private final IStatus OK_STATUS = new Status(IStatus.OK, GdbTraceUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
+    private final IStatus PATH_ERROR_STATUS = new Status(IStatus.ERROR, GdbTraceUIPlugin.PLUGIN_ID, Messages.SelectTraceExecutableDialog_Message);
+    private final IStatus BINARY_ERROR_STATUS = new Status(IStatus.ERROR, GdbTraceUIPlugin.PLUGIN_ID, Messages.SelectTraceExecutableDialog_BinaryError);
 
     private Text fExecutableNameEntry;
     private IPath fExecutablePath;
diff --git a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/project/handlers/SelectTraceExecutableHandler.java b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/project/handlers/SelectTraceExecutableHandler.java
index ce45bb8714..51e63f1ab9 100644
--- a/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/project/handlers/SelectTraceExecutableHandler.java
+++ b/lttng/org.eclipse.linuxtools.gdbtrace.ui/src/org/eclipse/linuxtools/internal/gdbtrace/ui/views/project/handlers/SelectTraceExecutableHandler.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
-import org.eclipse.linuxtools.internal.gdbtrace.trace.GdbTrace;
+import org.eclipse.linuxtools.internal.gdbtrace.core.trace.GdbTrace;
 import org.eclipse.linuxtools.internal.gdbtrace.ui.views.project.dialogs.SelectTraceExecutableDialog;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement;
 import org.eclipse.swt.widgets.MessageBox;