Internalize Callgraph Launch API.

25 files changed, 30 insertions, 30 deletions

diff --git a/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF
index 856122a8a4..995ae100e6 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Import-Package: org.eclipse.cdt.core.model,
  org.eclipse.debug.ui,
  org.eclipse.draw2d,
  org.eclipse.jface.viewers,
- org.eclipse.linuxtools.callgraph.launch,
+ org.eclipse.linuxtools.internal.callgraph.launch,
  org.eclipse.linuxtools.profiling.launch,
  org.eclipse.swt,
  org.eclipse.swt.graphics,
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/src/org/eclipse/linuxtools/sleepingthreads/launch/LaunchSleepingThreads.java b/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/src/org/eclipse/linuxtools/sleepingthreads/launch/LaunchSleepingThreads.java
index b429ea0211..a77b65eb49 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/src/org/eclipse/linuxtools/sleepingthreads/launch/LaunchSleepingThreads.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.genericzestdemo/src/org/eclipse/linuxtools/sleepingthreads/launch/LaunchSleepingThreads.java
@@ -2,7 +2,7 @@ package org.eclipse.linuxtools.sleepingthreads.launch;
 
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.callgraph.launch.SystemTapLaunchShortcut;
+import org.eclipse.linuxtools.internal.callgraph.launch.SystemTapLaunchShortcut;
 
 public class LaunchSleepingThreads extends SystemTapLaunchShortcut {
 	
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF
index da8c786376..969b60a17c 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF
@@ -15,8 +15,8 @@ Import-Package: org.eclipse.cdt.core.model,
  org.eclipse.cdt.launch,
  org.eclipse.core.resources,
  org.eclipse.debug.core,
- org.eclipse.linuxtools.callgraph.launch,
  org.eclipse.linuxtools.internal.callgraph.core,
+ org.eclipse.linuxtools.internal.callgraph.launch,
  org.eclipse.linuxtools.profiling.launch,
  org.eclipse.linuxtools.profiling.tests
 Bundle-Vendor: Eclipse
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java
index 59dab4d336..f55b5235ac 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java
@@ -21,8 +21,8 @@ import org.eclipse.debug.core.ILaunchConfigurationType;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
 import org.eclipse.linuxtools.profiling.tests.AbstractTest;
-import org.eclipse.linuxtools.callgraph.launch.SystemTapOptionsTab;
 import org.eclipse.linuxtools.internal.callgraph.core.PluginConstants;
+import org.eclipse.linuxtools.internal.callgraph.launch.SystemTapOptionsTab;
 import org.osgi.framework.Bundle;
 
 public abstract class AbstractStapTest extends AbstractTest {
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/ConfigurationTest.java b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/ConfigurationTest.java
index 29bab09019..9c3c492f55 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/ConfigurationTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/ConfigurationTest.java
@@ -17,9 +17,9 @@ import junit.framework.TestCase;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.callgraph.launch.LaunchStapGraph;
-import org.eclipse.linuxtools.callgraph.launch.SystemTapLaunchConfigurationDelegate;
 import org.eclipse.linuxtools.internal.callgraph.core.LaunchConfigurationConstants;
+import org.eclipse.linuxtools.internal.callgraph.launch.LaunchStapGraph;
+import org.eclipse.linuxtools.internal.callgraph.launch.SystemTapLaunchConfigurationDelegate;
 
 public class ConfigurationTest extends TestCase{
 	
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/LaunchShortcutsTest.java b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/LaunchShortcutsTest.java
index 92b6a56014..7649625008 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/LaunchShortcutsTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/LaunchShortcutsTest.java
@@ -11,8 +11,8 @@
 package org.eclipse.linuxtools.callgraph.launch.tests;
 
 import org.eclipse.cdt.core.model.IBinary;
-import org.eclipse.linuxtools.callgraph.launch.LaunchStapGraph;
 import org.eclipse.linuxtools.internal.callgraph.core.SystemTapUIErrorMessages;
+import org.eclipse.linuxtools.internal.callgraph.launch.LaunchStapGraph;
 import org.osgi.framework.Bundle;
 
 
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapCommandLineTest.java b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapCommandLineTest.java
index 9c4b1af4da..2f9ad2c886 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapCommandLineTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapCommandLineTest.java
@@ -23,8 +23,8 @@ import junit.framework.TestCase;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.callgraph.launch.LaunchStapGraph;
 import org.eclipse.linuxtools.internal.callgraph.core.LaunchConfigurationConstants;
+import org.eclipse.linuxtools.internal.callgraph.launch.LaunchStapGraph;
 
 public class SystemTapCommandLineTest extends TestCase {
 	File tmpfile = new File("");
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapTabTest.java b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapTabTest.java
index 2d606d622d..d019b04b16 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapTabTest.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapTabTest.java
@@ -16,8 +16,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.callgraph.launch.LaunchStapGraph;
-import org.eclipse.linuxtools.callgraph.launch.SystemTapOptionsTab;
+import org.eclipse.linuxtools.internal.callgraph.launch.LaunchStapGraph;
+import org.eclipse.linuxtools.internal.callgraph.launch.SystemTapOptionsTab;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF
index b79212fc88..9bb1f2479b 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.linuxtools.callgraph.launch;singleton:=true
 Bundle-Version: 0.10.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.callgraph.launch.CallgraphLaunchPlugin
+Bundle-Activator: org.eclipse.linuxtools.internal.callgraph.launch.CallgraphLaunchPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.ui,
@@ -27,5 +27,5 @@ Import-Package: org.eclipse.cdt.core.model,
  org.eclipse.ui.model,
  org.eclipse.ui.views.navigator
 Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.callgraph.launch
+Export-Package: org.eclipse.linuxtools.internal.callgraph.launch
 Bundle-Vendor: %Bundle-Vendor
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml b/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml
index df5cbd90e0..567e2811e0 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/plugin.xml
@@ -12,7 +12,7 @@
    <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
       <launchConfigurationType
-            delegate="org.eclipse.linuxtools.callgraph.launch.SystemTapLaunchConfigurationDelegate"
+            delegate="org.eclipse.linuxtools.internal.callgraph.launch.SystemTapLaunchConfigurationDelegate"
             id="org.eclipse.linuxtools.callgraph.launch.systemtapLaunch"
             modes="profile"
             name="%launchConfigurationType.name.0"
@@ -27,7 +27,7 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            class="org.eclipse.linuxtools.callgraph.launch.SystemTapLaunchConfigurationTabGroup"
+            class="org.eclipse.linuxtools.internal.callgraph.launch.SystemTapLaunchConfigurationTabGroup"
             description="%launchConfigurationTabGroup.description.0"
             id="org.eclipse.linuxtools.callgraph.launch.systemtapTabGroup"
             type="org.eclipse.linuxtools.callgraph.launch.systemtapLaunch">
@@ -38,7 +38,7 @@
 	<extension
          point="org.eclipse.debug.ui.launchShortcuts">
       <shortcut
-            class="org.eclipse.linuxtools.callgraph.launch.LaunchStapGraph"
+            class="org.eclipse.linuxtools.internal.callgraph.launch.LaunchStapGraph"
             id="org.eclipse.linuxtools.systemtap.quicklaunchStapGraph1"
             icon="icons/bar_graph.png"
             label="%launch.name"
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/CallgraphLaunchPlugin.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/CallgraphLaunchPlugin.java
index c2842e275c..f461c845f8 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/CallgraphLaunchPlugin.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/CallgraphLaunchPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 
 import org.eclipse.jface.resource.ImageDescriptor;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/ConfigurationOptionsSetter.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/ConfigurationOptionsSetter.java
index 10517e55de..bd06b14e76 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/ConfigurationOptionsSetter.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/ConfigurationOptionsSetter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/LaunchStapGraph.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchStapGraph.java
index 28a81e93ab..90f7cb7346 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/LaunchStapGraph.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchStapGraph.java
@@ -9,7 +9,7 @@
  *     Red Hat - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/LaunchWizard.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchWizard.java
index 9c8b9d4623..b54f3b3026 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/LaunchWizard.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/LaunchWizard.java
@@ -9,7 +9,7 @@
  *     Red Hat - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 
 import org.eclipse.core.resources.IResource;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/ListTreeContentProvider.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/ListTreeContentProvider.java
index ac66e616b8..de7fbf8239 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/ListTreeContentProvider.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/ListTreeContentProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/Messages.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/Messages.java
index bca74083bb..8a806b998f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/Messages.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/Messages.java
@@ -8,13 +8,13 @@
  * Contributors:
  *     Red Hat - initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.callgraph.launch.messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.callgraph.launch.messages"; //$NON-NLS-1$
 
 	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
 			.getBundle(BUNDLE_NAME);
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/RuledTreeSelectionDialog.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/RuledTreeSelectionDialog.java
index aa6c9c011a..a6d1c1d6fb 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/RuledTreeSelectionDialog.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/RuledTreeSelectionDialog.java
@@ -13,7 +13,7 @@
  *          CheckedTreeSelectionDialog#createSelectionButtons(Composite) fails to 
  *          align the selection buttons to the right
  *******************************************************************************/
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.ILabelProvider;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLCTG.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLCTG.java
index 82c48d8ba2..e1bf0e6a27 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLCTG.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLCTG.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchConfigurationDelegate.java
index 31f5c82ebc..587fe716cb 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationDelegate.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchConfigurationDelegate.java
@@ -9,7 +9,7 @@
  *     Red Hat - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationTabGroup.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchConfigurationTabGroup.java
index 478b6f89ee..49b14649ac 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchConfigurationTabGroup.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchConfigurationTabGroup.java
@@ -9,7 +9,7 @@
  *     Red Hat - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
 
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchShortcut.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java
index bc5372ae49..b8a124478a 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapLaunchShortcut.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapLaunchShortcut.java
@@ -9,7 +9,7 @@
  *     Red Hat - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapOptionsTab.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapOptionsTab.java
index 02b98f000e..0a5e53ea3f 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/SystemTapOptionsTab.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/SystemTapOptionsTab.java
@@ -9,7 +9,7 @@
  *     Red Hat - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/TranslationUnitVisitor.java b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/TranslationUnitVisitor.java
index 2dc96ccdfc..d0a227551c 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/TranslationUnitVisitor.java
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/TranslationUnitVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Red Hat - initial API and implementation
  *******************************************************************************/
-package org.eclipse.linuxtools.callgraph.launch;
+package org.eclipse.linuxtools.internal.callgraph.launch;
 
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ICElementVisitor;
diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/messages.properties
index b862a50683..b862a50683 100644
--- a/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/callgraph/launch/messages.properties
+++ b/systemtap/org.eclipse.linuxtools.callgraph.launch/src/org/eclipse/linuxtools/internal/callgraph/launch/messages.properties
diff --git a/systemtap/org.eclipse.linuxtools.threadprofiler/src/org/eclipse/linuxtools/threadprofiler/LaunchThreadProfiler.java b/systemtap/org.eclipse.linuxtools.threadprofiler/src/org/eclipse/linuxtools/threadprofiler/LaunchThreadProfiler.java
index 7af8e84f62..1cb2dde1bb 100644
--- a/systemtap/org.eclipse.linuxtools.threadprofiler/src/org/eclipse/linuxtools/threadprofiler/LaunchThreadProfiler.java
+++ b/systemtap/org.eclipse.linuxtools.threadprofiler/src/org/eclipse/linuxtools/threadprofiler/LaunchThreadProfiler.java
@@ -2,7 +2,7 @@ package org.eclipse.linuxtools.threadprofiler;
 
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.callgraph.launch.SystemTapLaunchShortcut;
+import org.eclipse.linuxtools.internal.callgraph.launch.SystemTapLaunchShortcut;
 
 public class LaunchThreadProfiler extends SystemTapLaunchShortcut{