Bug 263178: Create packages for remote launch plugin

12 files changed, 49 insertions, 24 deletions

diff --git a/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF b/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF
index 6c27e2fa7b8..dda9260a6e2 100644
--- a/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF
+++ b/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF
@@ -31,4 +31,6 @@ Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.cdt.internal.launch.remote;x-internal:=true,
- org.eclipse.cdt.launch.remote;x-internal:=true
+ org.eclipse.cdt.launch.remote;x-internal:=true,
+ org.eclipse.cdt.launch.remote.launching;x-internal:=true,
+ org.eclipse.cdt.launch.remote.tabs;x-internal:=true
diff --git a/cross/org.eclipse.cdt.launch.remote/plugin.xml b/cross/org.eclipse.cdt.launch.remote/plugin.xml
index 9b912e136e2..9cf37cdd1cf 100644
--- a/cross/org.eclipse.cdt.launch.remote/plugin.xml
+++ b/cross/org.eclipse.cdt.launch.remote/plugin.xml
@@ -10,6 +10,7 @@ Contributors:
 Ewa Matejska     (PalmSource)      - initial API and implementation 
 Martin Oberhuber (Wind River)      - fix 158529: Migrate docs to HTML / TOC format 
 Anna Dushistova  (Mentor Graphics) - [314659] added launch delegate for dsf
+Anna Dushistova  (Mentor Graphics) - code restructuring
 -->
 <?eclipse version="3.0"?>
 <plugin>
@@ -27,7 +28,7 @@ Anna Dushistova  (Mentor Graphics) - [314659] added launch delegate for dsf
             id="org.eclipse.rse.remotecdt.launch"
             type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
             modes="run,debug"
-            delegate="org.eclipse.cdt.launch.remote.RemoteRunLaunchDelegate"
+            delegate="org.eclipse.cdt.launch.remote.launching.RemoteRunLaunchDelegate"
             name="%cdiLaunchDelegate.name"
             delegateDescription="%cdiLaunchDelegate.description"
             sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -37,7 +38,7 @@ Anna Dushistova  (Mentor Graphics) - [314659] added launch delegate for dsf
             id="org.eclipse.rse.remotecdt.dsf.debug"
             type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch"
             modes="debug"
-            delegate="org.eclipse.cdt.launch.remote.RemoteGdbLaunchDelegate"
+            delegate="org.eclipse.cdt.launch.remote.launching.RemoteGdbLaunchDelegate"
             name="%dsfLaunchDelegate.name"
             delegateDescription="%dsfLaunchDelegate.description"
             sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
@@ -57,7 +58,7 @@ Anna Dushistova  (Mentor Graphics) - [314659] added launch delegate for dsf
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            class="org.eclipse.cdt.launch.remote.RemoteLaunchConfigurationTabGroup"
+            class="org.eclipse.cdt.launch.remote.tabs.RemoteLaunchConfigurationTabGroup"
             helpContextId="org.eclipse.rse.remotecdt.launchgroup"
             id="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
             type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
@@ -66,7 +67,7 @@ Anna Dushistova  (Mentor Graphics) - [314659] added launch delegate for dsf
          </launchMode>
       </launchConfigurationTabGroup>
       <launchConfigurationTabGroup
-            class="org.eclipse.cdt.launch.remote.RemoteLaunchConfigurationTabGroup"
+            class="org.eclipse.cdt.launch.remote.tabs.RemoteLaunchConfigurationTabGroup"
             helpContextId="org.eclipse.rse.remotecdt.launchgroup"
             id="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
             type="org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
@@ -82,21 +83,21 @@ Anna Dushistova  (Mentor Graphics) - [314659] added launch delegate for dsf
             id="org.eclipse.rse.remotecdt.launch.RemoteCMainTab"
             group="org.eclipse.rse.remotecdt.RemoteLaunchTabGroup"
             name="Main"
-            class="org.eclipse.cdt.launch.remote.RemoteCMainTab">
+            class="org.eclipse.cdt.launch.remote.tabs.RemoteCMainTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
      </tab>         
      <tab
             id="org.eclipse.rse.remotecdt.debug.RemoteCMainTab"
             group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
             name="Main"
-            class="org.eclipse.cdt.launch.remote.RemoteCMainTab">
+            class="org.eclipse.cdt.launch.remote.tabs.RemoteCMainTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
      </tab>         
      <tab
             id="org.eclipse.rse.remotecdt.dsf.gdb.mainTab"
             group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
             name="Main"
-            class="org.eclipse.cdt.launch.remote.RemoteCDSFMainTab">
+            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFMainTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
      </tab>         
      <tab
@@ -126,14 +127,14 @@ Anna Dushistova  (Mentor Graphics) - [314659] added launch delegate for dsf
             id="org.eclipse.rse.remotecdt.launch.RemoteCDebuggerTab"
             group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
             name="Debugger"
-            class="org.eclipse.cdt.launch.remote.RemoteCDebuggerTab">
+            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDebuggerTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.launch"/>
         <placement after="org.eclipse.cdt.cdi.launch.argumentsTab"/>        
       </tab>
       <tab id="org.eclipse.rse.remotecdt.dsf.debug.RemoteCDSFDebuggerTab"
             group="org.eclipse.rse.remotecdt.RemoteDebugTabGroup"
             name="Debugger"
-            class="org.eclipse.cdt.launch.remote.RemoteCDSFDebuggerTab">
+            class="org.eclipse.cdt.launch.remote.tabs.RemoteCDSFDebuggerTab">
         <associatedDelegate delegate="org.eclipse.rse.remotecdt.dsf.debug"/>
         <placement after="org.eclipse.cdt.dsf.gdb.launch.argumentsTab"/>
       </tab>
@@ -195,7 +196,7 @@ Anna Dushistova  (Mentor Graphics) - [314659] added launch delegate for dsf
    <extension
          point="org.eclipse.cdt.debug.ui.CDebuggerPage">
       <debuggerPage
-            class="org.eclipse.cdt.launch.remote.RemoteGDBDebuggerPage"
+            class="org.eclipse.cdt.launch.remote.tabs.RemoteGDBDebuggerPage"
             debuggerID="org.eclipse.rse.remotecdt.RemoteGDBDebugger"
             id="org.eclipse.rse.remotecdt.RemoteGDBDebuggerPage">
       </debuggerPage>
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RSEHelper.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RSEHelper.java
index e750eb38ba7..949bcc36e38 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RSEHelper.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RSEHelper.java
@@ -7,6 +7,7 @@
  * Contributors:
  * Anna Dushistova (MontaVista)      - initial API and implementation
  * Anna Dushistova (Mentor Graphics) - [314659] moved common methods for DSF and CDI launches to this class
+ * Anna Dushistova (Mentor Graphics) - changed spaceEscapify visibility
  ********************************************************************************/
 
 package org.eclipse.cdt.launch.remote;
@@ -211,7 +212,7 @@ public class RSEHelper {
 		}
 	}
 
-	static String spaceEscapify(String inputString) {
+	public static String spaceEscapify(String inputString) {
 		if (inputString == null)
 			return null;
 
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteGdbLaunchDelegate.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
index 37882f14641..85e8afb71ee 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteGdbLaunchDelegate.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
@@ -7,8 +7,9 @@
  * 
  * Contributors:
  * Anna Dushistova (Mentor Graphics) - initial API and implementation
+ * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.launching
  *******************************************************************************/
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.launching;
 
 import org.eclipse.cdt.debug.core.CDebugUtils;
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
@@ -16,6 +17,8 @@ import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
 import org.eclipse.cdt.dsf.gdb.launching.GdbLaunchDelegate;
 import org.eclipse.cdt.internal.launch.remote.Activator;
 import org.eclipse.cdt.internal.launch.remote.Messages;
+import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
+import org.eclipse.cdt.launch.remote.RSEHelper;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteRunLaunchDelegate.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java
index 1cce8b8230e..15566475990 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteRunLaunchDelegate.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteRunLaunchDelegate.java
@@ -17,9 +17,10 @@
  * Nikita Shulga    (EmbeddedAlley)   - [265236][remotecdt] Wait for RSE to initialize before querying it for host list
  * Anna Dushistova  (MontaVista)      - [267951][remotecdt] Support systemTypes without files subsystem
  * Anna Dushistova  (Mentor Graphics) - [314659]Fixed deprecated methods
+ * Anna Dushistova  (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.launching
  *******************************************************************************/
 
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.launching;
 
 import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
 import org.eclipse.cdt.core.model.ICProject;
@@ -35,6 +36,8 @@ import org.eclipse.cdt.debug.mi.core.IGDBServerMILaunchConfigurationConstants;
 import org.eclipse.cdt.internal.launch.remote.Activator;
 import org.eclipse.cdt.internal.launch.remote.Messages;
 import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
+import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
+import org.eclipse.cdt.launch.remote.RSEHelper;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteCDSFDebuggerTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java
index afd9ee265f1..3717d571019 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteCDSFDebuggerTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFDebuggerTab.java
@@ -7,9 +7,10 @@
  * 
  * Contributors:
  * Anna Dushistova (Mentor Graphics) - initial API and implementation
+ * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
  *******************************************************************************/
 
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.tabs;
 
 import org.eclipse.cdt.debug.ui.ICDebuggerPage;
 import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CDebuggerTab;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteCDSFMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
index f44bd866b91..8651a7608f4 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteCDSFMainTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
@@ -17,11 +17,15 @@
  * Anna Dushistova       (MontaVista) - [223728] [remotecdt] connection combo is not populated until RSE is activated
  * Anna Dushistova       (MontaVista) - [267951] [remotecdt] Support systemTypes without files subsystem
  * Anna Dushistova  (Mentor Graphics) - adapted from RemoteCMainTab 
+ * Anna Dushistova  (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
  *******************************************************************************/
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.tabs;
 
 import org.eclipse.cdt.dsf.gdb.internal.ui.launching.CMainTab;
 import org.eclipse.cdt.internal.launch.remote.Messages;
+import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
+import org.eclipse.cdt.launch.remote.IRemoteConnectionHostConstants;
+import org.eclipse.cdt.launch.remote.RSEHelper;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteCDebuggerTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java
index f4cf471a240..bd9a37e10f1 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteCDebuggerTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDebuggerTab.java
@@ -8,9 +8,10 @@
  * Contributors: 
  * Ewa Matejska (PalmSource)
  * Anna Dushistova (Mentor Graphics) - [314659] move remote launch/debug to DSF 
+ * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
  *******************************************************************************/
 
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.tabs;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteCMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
index e390c0e1fd4..a316aca059a 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteCMainTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCMainTab.java
@@ -17,11 +17,15 @@
  * Anna Dushistova       (MontaVista) - [223728] [remotecdt] connection combo is not populated until RSE is activated
  * Anna Dushistova       (MontaVista) - [267951] [remotecdt] Support systemTypes without files subsystem
  * Anna Dushistova  (Mentor Graphics) - [314659] move remote launch/debug to DSF 
+ * Anna Dushistova  (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
  *******************************************************************************/
 
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.tabs;
 
 import org.eclipse.cdt.internal.launch.remote.Messages;
+import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
+import org.eclipse.cdt.launch.remote.IRemoteConnectionHostConstants;
+import org.eclipse.cdt.launch.remote.RSEHelper;
 import org.eclipse.cdt.launch.ui.CMainTab;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteDSFGDBDebuggerPage.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
index ebf491c9823..486b69265d5 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteDSFGDBDebuggerPage.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
@@ -9,14 +9,16 @@
  * Ewa Matejska (PalmSource)
  * 
  * Referenced GDBDebuggerPage code to write this.
- * Anna Dushistova  (Mentor Graphics) - adapted from RemoteGDBDebuggerPage
+ * Anna Dushistova (Mentor Graphics) - adapted from RemoteGDBDebuggerPage
+ * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
  *******************************************************************************/
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.tabs;
 
 import org.eclipse.cdt.dsf.gdb.internal.ui.launching.GdbDebuggerPage;
 import org.eclipse.cdt.dsf.gdb.internal.ui.launching.SerialPortSettingsBlock;
 import org.eclipse.cdt.dsf.gdb.internal.ui.launching.TCPSettingsBlock;
 import org.eclipse.cdt.internal.launch.remote.Messages;
+import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteGDBDebuggerPage.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java
index 1a0d8a12a59..b5d8ee7c36f 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteGDBDebuggerPage.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteGDBDebuggerPage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 PalmSource, Inc. and others.
+ * Copyright (c) 2006, 2010 PalmSource, Inc. 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 
@@ -9,12 +9,14 @@
  * Ewa Matejska (PalmSource)
  * 
  * Referenced GDBDebuggerPage code to write this.
+ * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
  *******************************************************************************/
 
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.tabs;
 
 import org.eclipse.cdt.debug.mi.internal.ui.GDBDebuggerPage;
 import org.eclipse.cdt.internal.launch.remote.Messages;
+import org.eclipse.cdt.launch.remote.IRemoteConnectionConfigurationConstants;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteLaunchConfigurationTabGroup.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java
index e11612039fa..996f9b68a8e 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteLaunchConfigurationTabGroup.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteLaunchConfigurationTabGroup.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 PalmSource, Inc. and others.
+ * Copyright (c) 2006, 2010 PalmSource, Inc. 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 
@@ -8,9 +8,10 @@
  * Contributors: 
  * Ewa Matejska    (PalmSource)      - Adapted from LocalRunLaunchConfigurationTabGroup
  * Anna Dushistova (Mentor Graphics) - [314659] move remote launch/debug to DSF 
+ * Anna Dushistova (Mentor Graphics) - moved to org.eclipse.cdt.launch.remote.tabs
  *******************************************************************************/
 
-package org.eclipse.cdt.launch.remote;
+package org.eclipse.cdt.launch.remote.tabs;
 
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;