[#456] - move Activator classes to the internal name space

Author: ilg-ul

plugins/org.eclipse.embedcdt.codered.ui/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.embedcdt.codered.ui;singleton:=true
 Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.embedcdt.codered.ui.Activator
+Bundle-Activator: org.eclipse.embedcdt.internal.codered.ui.Activator
 Require-Bundle: org.eclipse.cdt.ui;bundle-version="7.0.0",
  org.eclipse.core.filesystem;bundle-version="1.7.700",
  org.eclipse.core.runtime;bundle-version="3.19.0",
@@ -20,6 +20,5 @@ Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %bundle.vendor
 Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.embedcdt.codered.ui
-Export-Package: org.eclipse.embedcdt.codered.ui,
- org.eclipse.embedcdt.internal.codered.ui;x-internal:=true,
+Export-Package: org.eclipse.embedcdt.internal.codered.ui;x-internal:=true,
  org.eclipse.embedcdt.internal.codered.ui.perspectives;x-internal:=true

plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/codered/ui/Activator.java renamed to plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/internal/codered/ui/Activator.java

@@ -12,9 +12,9 @@
  *     Liviu Ionescu - initial implementation.
  *******************************************************************************/
 
-package org.eclipse.embedcdt.codered.ui;
+package org.eclipse.embedcdt.internal.codered.ui;
 
-import org.eclipse.embedcdt.ui.AbstractUIActivator;
+import org.eclipse.embedcdt.internal.ui.AbstractUIActivator;
 import org.osgi.framework.BundleContext;
 
 /**

plugins/org.eclipse.embedcdt.codered.ui/src/org/eclipse/embedcdt/internal/codered/ui/perspectives/CodeRedPerspectiveFactory.java

@@ -25,7 +25,7 @@
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.embedcdt.codered.ui.Activator;
+import org.eclipse.embedcdt.internal.codered.ui.Activator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;

plugins/org.eclipse.embedcdt.core/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.embedcdt.core;singleton:=true
 Bundle-Version: 6.0.0.qualifier
-Bundle-Activator: org.eclipse.embedcdt.core.Activator
+Bundle-Activator: org.eclipse.embedcdt.internal.core.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %bundle.vendor
@@ -59,6 +59,7 @@ Export-Package: org.eclipse.embedcdt.core,
    org.eclipse.embedcdt.templates.stm,
    org.eclipse.embedcdt.templates.stm.ui,
    org.eclipse.embedcdt.ui",
+ org.eclipse.embedcdt.internal.core;x-internal:=true,
  org.eclipse.embedcdt.core.liqp.exceptions;
   x-friends:="org.eclipse.embedcdt,
    org.eclipse.embedcdt.codered,

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/AltWindowsRegistry.java

@@ -15,6 +15,8 @@
 
 package org.eclipse.embedcdt.core;
 
+import org.eclipse.embedcdt.internal.core.Activator;
+
 public class AltWindowsRegistry {
 
 	public static String query(String location, String key) {

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/AltWindowsRegistryStreamReader.java

@@ -21,6 +21,8 @@
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 
+import org.eclipse.embedcdt.internal.core.Activator;
+
 /**
  * A thread collecting lines containing a key from a reader into a string.
  */

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/CProjectPacksStorage.java

@@ -24,6 +24,7 @@
 import org.eclipse.cdt.managedbuilder.internal.core.Configuration;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.embedcdt.internal.core.Activator;
 
 @SuppressWarnings("restriction")
 public class CProjectPacksStorage {

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/EclipseUtils.java

@@ -40,6 +40,7 @@
 import org.eclipse.core.variables.IValueVariable;
 import org.eclipse.core.variables.VariablesPlugin;
 import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.embedcdt.internal.core.Activator;
 
 /**
  * Various utilities that use Eclipse global classes, grouped together more like

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/preferences/DefaultPreferences.java

@@ -26,9 +26,9 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.embedcdt.core.Activator;
 import org.eclipse.embedcdt.core.EclipseUtils;
 import org.eclipse.embedcdt.core.XpackUtils;
+import org.eclipse.embedcdt.internal.core.Activator;
 
 public class DefaultPreferences {
 

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/preferences/Discoverer.java

@@ -23,10 +23,10 @@
 import org.eclipse.cdt.utils.WindowsRegistry;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.embedcdt.core.Activator;
 import org.eclipse.embedcdt.core.AltWindowsRegistry;
 import org.eclipse.embedcdt.core.EclipseUtils;
 import org.eclipse.embedcdt.core.StringUtils;
+import org.eclipse.embedcdt.internal.core.Activator;
 
 /**
  * Helper class used by debuggers.

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/preferences/PersistentPreferences.java

@@ -22,7 +22,7 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.embedcdt.core.Activator;
+import org.eclipse.embedcdt.internal.core.Activator;
 import org.osgi.service.prefs.BackingStoreException;
 import org.osgi.service.prefs.Preferences;
 

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/AbstractActivator.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/internal/core/AbstractActivator.java

@@ -12,7 +12,7 @@
  *     Liviu Ionescu - initial implementation.
  *******************************************************************************/
 
-package org.eclipse.embedcdt.core;
+package org.eclipse.embedcdt.internal.core;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/Activator.java renamed to plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/internal/core/Activator.java

@@ -12,7 +12,7 @@
  *     Liviu Ionescu - initial implementation.
  *******************************************************************************/
 
-package org.eclipse.embedcdt.core;
+package org.eclipse.embedcdt.internal.core;
 
 import org.osgi.framework.BundleContext;
 

plugins/org.eclipse.embedcdt.debug.core/META-INF/MANIFEST.MF

@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.embedcdt.debug.core;singleton:=true
 Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.embedcdt.debug.core.Activator
+Bundle-Activator: org.eclipse.embedcdt.internal.debug.core.Activator
 Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.0.0",
  org.eclipse.cdt.managedbuilder.core;bundle-version="9.0.0",
  org.eclipse.core.runtime;bundle-version="3.19.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %bundle.vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Export-Package: org.eclipse.embedcdt.debug.core,
+Export-Package: org.eclipse.embedcdt.internal.debug.core;x-internal:=true,
  org.eclipse.embedcdt.debug.core.data
 Automatic-Module-Name: org.eclipse.embedcdt.debug.core

plugins/org.eclipse.embedcdt.debug.core/src/org/eclipse/embedcdt/debug/core/Activator.java renamed to plugins/org.eclipse.embedcdt.debug.core/src/org/eclipse/embedcdt/internal/debug/core/Activator.java

@@ -12,9 +12,9 @@
  *     Liviu Ionescu - initial version
  *******************************************************************************/
 
-package org.eclipse.embedcdt.debug.core;
+package org.eclipse.embedcdt.internal.debug.core;
 
-import org.eclipse.embedcdt.core.AbstractActivator;
+import org.eclipse.embedcdt.internal.core.AbstractActivator;
 import org.osgi.framework.BundleContext;
 
 /**

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.embedcdt.debug.gdbjtag.core;singleton:=true
 Bundle-Version: 5.0.0.qualifier
-Bundle-Activator: org.eclipse.embedcdt.debug.gdbjtag.core.Activator
+Bundle-Activator: org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator
 Require-Bundle: org.eclipse.embedcdt.core;bundle-version="6.0.0",
  org.eclipse.embedcdt.debug.core;bundle-version="2.0.0",
  org.eclipse.embedcdt.packs.core;bundle-version="3.0.0",
@@ -29,7 +29,8 @@ Export-Package: org.eclipse.embedcdt.debug.gdbjtag.core,
  org.eclipse.embedcdt.debug.gdbjtag.core.preferences,
  org.eclipse.embedcdt.debug.gdbjtag.core.properties,
  org.eclipse.embedcdt.debug.gdbjtag.core.services,
- org.eclipse.embedcdt.debug.gdbjtag.core.viewmodel.peripheral
+ org.eclipse.embedcdt.debug.gdbjtag.core.viewmodel.peripheral,
+ org.eclipse.embedcdt.internal.debug.gdbjtag.core;x-internal:=true
 Import-Package: org.eclipse.embedcdt.packs.core.data.xcdl,
  org.eclipse.jface.preference
 Automatic-Module-Name: org.eclipse.embedcdt.debug.gdbjtag.core

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/DebugUtils.java

@@ -73,6 +73,7 @@
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.embedcdt.core.EclipseUtils;
 import org.eclipse.embedcdt.core.StringUtils;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 @SuppressWarnings("restriction")
 public class DebugUtils {

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/data/CProjectExtraDataManagerProxy.java

@@ -24,7 +24,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.embedcdt.debug.core.data.ICProjectExtraDataManager;
 import org.eclipse.embedcdt.debug.core.data.ICProjectExtraDataManagerFactory;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 public class CProjectExtraDataManagerProxy implements ICProjectExtraDataManager {
 

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/data/SVDPathManagerProxy.java

@@ -22,7 +22,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.embedcdt.debug.core.data.ISVDPathManager;
 import org.eclipse.embedcdt.debug.core.data.ISVDPathManagerFactory;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 public class SVDPathManagerProxy implements ISVDPathManager {
 

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/datamodel/PeripheralDMNode.java

@@ -17,7 +17,7 @@
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.packs.core.tree.Leaf;
 
 /**

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/datamodel/SvdDMNode.java

@@ -18,7 +18,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.packs.core.tree.Leaf;
 
 public class SvdDMNode extends SvdObjectDMNode implements Comparable<SvdDMNode> {

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/datamodel/SvdEnumerationDMNode.java

@@ -17,7 +17,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.packs.core.tree.AbstractTreePreOrderIterator;
 import org.eclipse.embedcdt.packs.core.tree.ITreeIterator;
 import org.eclipse.embedcdt.packs.core.tree.Leaf;

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/datamodel/SvdFieldDMNode.java

@@ -16,7 +16,7 @@
 
 import java.math.BigInteger;
 
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.packs.core.tree.AbstractTreePreOrderIterator;
 import org.eclipse.embedcdt.packs.core.tree.ITreeIterator;
 import org.eclipse.embedcdt.packs.core.tree.Leaf;

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/datamodel/SvdPeripheralDMNode.java

@@ -18,7 +18,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.packs.core.tree.AbstractTreePreOrderIterator;
 import org.eclipse.embedcdt.packs.core.tree.ITreeIterator;
 import org.eclipse.embedcdt.packs.core.tree.Leaf;

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/datamodel/SvdRegisterDMNode.java

@@ -18,7 +18,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.packs.core.tree.AbstractTreePreOrderIterator;
 import org.eclipse.embedcdt.packs.core.tree.ITreeIterator;
 import org.eclipse.embedcdt.packs.core.tree.Leaf;

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/datamodel/SvdUtils.java

@@ -41,11 +41,11 @@
 import org.eclipse.embedcdt.core.EclipseUtils;
 import org.eclipse.embedcdt.core.JsonUtils;
 import org.eclipse.embedcdt.core.Xml;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.ConfigurationAttributes;
 import org.eclipse.embedcdt.debug.gdbjtag.core.DebugUtils;
 import org.eclipse.embedcdt.debug.gdbjtag.core.data.CProjectExtraDataManagerProxy;
 import org.eclipse.embedcdt.debug.gdbjtag.core.data.SVDPathManagerProxy;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.packs.core.PackType;
 import org.eclipse.embedcdt.packs.core.IConsoleStream;
 import org.eclipse.embedcdt.packs.core.data.IPacksDataManager;

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GdbMcuMemoryBlockRetrievalManager.java

@@ -23,8 +23,8 @@
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IMemoryBlockRetrieval;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.memory.PeripheralMemoryBlockRetrieval;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 @SuppressWarnings("restriction")
 public class GdbMcuMemoryBlockRetrievalManager extends GdbMemoryBlockRetrievalManager {

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuControl_7_2.java

@@ -28,9 +28,9 @@
 import org.eclipse.cdt.dsf.service.DsfServiceEventHandler;
 import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IGdbServerBackendService;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IGdbServerBackendService.ServerBackendStateChangedEvent;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 public class GnuMcuControl_7_2 extends GDBControl_7_2 {
 

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuDebuggerCommandsService.java

@@ -33,9 +33,9 @@
 import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.embedcdt.core.EclipseUtils;
 import org.eclipse.embedcdt.core.StringUtils;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.DebugUtils;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IGnuMcuDebuggerCommandsService;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 public abstract class GnuMcuDebuggerCommandsService extends AbstractDsfService
 		implements IGnuMcuDebuggerCommandsService {

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuFinalLaunchSequence.java

@@ -34,11 +34,11 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.DebugUtils;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IGnuMcuDebuggerCommandsService;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IPeripheralMemoryService;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IPeripheralsService;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 public class GnuMcuFinalLaunchSequence extends GDBJtagDSFFinalLaunchSequence {
 

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuFinalLaunchSequence_7_2.java

@@ -27,7 +27,7 @@
 import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 public class GnuMcuFinalLaunchSequence_7_2 extends GnuMcuFinalLaunchSequence {
 

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuGdbBackend.java

@@ -85,9 +85,9 @@
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.DebugUtils;
 import org.eclipse.embedcdt.debug.gdbjtag.core.dsf.GnuMcuProcesses_7_2_1.ProcessStateChangedEvent;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.osgi.framework.BundleContext;
 
 /**

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuGdbServerBackend.java

@@ -45,9 +45,9 @@
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.embedcdt.core.EclipseUtils;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.DebugUtils;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IGdbServerBackendService;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 import org.osgi.framework.BundleContext;
 
 /**

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuLaunch.java

@@ -44,7 +44,7 @@
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 /**
  * Common launcher, used to initialise the memory bloc retrieval used by the

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuProcesses_7_2_1.java

@@ -38,7 +38,7 @@
 import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 // Used to redefine the ProcessSequence, where the reset happens
 public class GnuMcuProcesses_7_2_1 extends GDBProcesses_7_2_1 {

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuRestartProcessSequence.java

@@ -32,9 +32,9 @@
 import org.eclipse.cdt.dsf.service.DsfServicesTracker;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.DebugUtils;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IGnuMcuDebuggerCommandsService;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 public class GnuMcuRestartProcessSequence extends ReflectionSequence {
 

plugins/org.eclipse.embedcdt.debug.gdbjtag.core/src/org/eclipse/embedcdt/debug/gdbjtag/core/dsf/GnuMcuServerServicesLaunchSequence.java

@@ -19,8 +19,8 @@
 import org.eclipse.cdt.dsf.gdb.launching.GdbLaunch;
 import org.eclipse.cdt.dsf.service.DsfSession;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.embedcdt.debug.gdbjtag.core.Activator;
 import org.eclipse.embedcdt.debug.gdbjtag.core.services.IGdbServerBackendService;
+import org.eclipse.embedcdt.internal.debug.gdbjtag.core.Activator;
 
 /**
  * Define the step of creating the GdbServerBackend.