From 42eb4e884ea8d701f28bdbf3025e411d2204955c Mon Sep 17 00:00:00 2001
From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Tue, 25 Mar 2008 17:46:32 +0000
Subject: [PATCH] Bug 223684 Removes the dependency by moving
 IGDBLaunchConfigurationContants from the org.eclipse.dd.gdb.launch plugin to
 org.eclipse.dd.gdb

---
 .../gdb/launch/launching/GdbLaunchDelegate.java |  1 +
 .../IGDBLaunchConfigurationConstants.java       |  7 -------
 .../launching/ServicesLaunchSequence.java       |  1 +
 plugins/org.eclipse.dd.gdb/META-INF/MANIFEST.MF |  3 ++-
 .../gdb/IGDBLaunchConfigurationConstants.java   | 17 +++++++++++++++++
 5 files changed, 21 insertions(+), 8 deletions(-)
 delete mode 100644 plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/IGDBLaunchConfigurationConstants.java
 create mode 100644 plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/IGDBLaunchConfigurationConstants.java

diff --git a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/GdbLaunchDelegate.java b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/GdbLaunchDelegate.java
index 0258f116093..7dce245a668 100644
--- a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/GdbLaunchDelegate.java
+++ b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/GdbLaunchDelegate.java
@@ -34,6 +34,7 @@ import org.eclipse.dd.dsf.concurrent.ThreadSafe;
 import org.eclipse.dd.dsf.debug.model.DsfMemoryBlockRetrieval;
 import org.eclipse.dd.dsf.debug.service.IMemory.IMemoryDMContext;
 import org.eclipse.dd.dsf.service.DsfServicesTracker;
+import org.eclipse.dd.gdb.IGDBLaunchConfigurationConstants;
 import org.eclipse.dd.gdb.launch.internal.GdbLaunchPlugin;
 import org.eclipse.dd.gdb.service.command.GDBControl;
 import org.eclipse.dd.gdb.service.command.GDBControl.SessionType;
diff --git a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/IGDBLaunchConfigurationConstants.java b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/IGDBLaunchConfigurationConstants.java
deleted file mode 100644
index fff7667d916..00000000000
--- a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/IGDBLaunchConfigurationConstants.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.eclipse.dd.gdb.launch.launching;
-
-public class IGDBLaunchConfigurationConstants {
-
-	public static final String DEBUGGER_MODE_REMOTE = "remote";
-
-}
diff --git a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/ServicesLaunchSequence.java b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/ServicesLaunchSequence.java
index 281448bf5aa..62ef5d4c0d7 100644
--- a/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/ServicesLaunchSequence.java
+++ b/plugins/org.eclipse.dd.gdb.launch/src/org/eclipse/dd/gdb/launch/launching/ServicesLaunchSequence.java
@@ -21,6 +21,7 @@ import org.eclipse.dd.dsf.concurrent.RequestMonitor;
 import org.eclipse.dd.dsf.concurrent.Sequence;
 import org.eclipse.dd.dsf.debug.service.StepQueueManager;
 import org.eclipse.dd.dsf.service.DsfSession;
+import org.eclipse.dd.gdb.IGDBLaunchConfigurationConstants;
 import org.eclipse.dd.gdb.service.GDBRunControl;
 import org.eclipse.dd.gdb.service.command.GDBControl;
 import org.eclipse.dd.gdb.service.command.GDBControl.SessionType;
diff --git a/plugins/org.eclipse.dd.gdb/META-INF/MANIFEST.MF b/plugins/org.eclipse.dd.gdb/META-INF/MANIFEST.MF
index 4ed8a929be6..ef35582da38 100644
--- a/plugins/org.eclipse.dd.gdb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dd.gdb/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.debug.core
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.dd.gdb.breakpoints,
+Export-Package: org.eclipse.dd.gdb,
+ org.eclipse.dd.gdb.breakpoints,
  org.eclipse.dd.gdb.service,
  org.eclipse.dd.gdb.service.command
diff --git a/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/IGDBLaunchConfigurationConstants.java b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/IGDBLaunchConfigurationConstants.java
new file mode 100644
index 00000000000..73f3801c151
--- /dev/null
+++ b/plugins/org.eclipse.dd.gdb/src/org/eclipse/dd/gdb/IGDBLaunchConfigurationConstants.java
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2008  Ericsson and others.
+ * 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:
+ *     Ericsson - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.dd.gdb;
+
+public class IGDBLaunchConfigurationConstants {
+
+	public static final String DEBUGGER_MODE_REMOTE = "remote"; //$NON-NLS-1$
+
+}