remove jdt.launching dependency
diff --git a/bundles/org.eclipse.e4.languages.javascript.debug.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.languages.javascript.debug.model/META-INF/MANIFEST.MF
index 0774c39..c56d444 100644
--- a/bundles/org.eclipse.e4.languages.javascript.debug.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.languages.javascript.debug.model/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@
org.eclipse.e4.languages.javascript.jsdi.event,
org.eclipse.e4.languages.javascript.jsdi.request,
org.eclipse.e4.languages.javascript.jsdi.rhino,
- org.eclipse.jdt.launching,
org.eclipse.osgi.util;version="1.1.0"
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.5.0",
org.eclipse.core.runtime;bundle-version="3.5.0"
diff --git a/bundles/org.eclipse.e4.languages.javascript.debug.model/src/org/eclipse/e4/languages/internal/javascript/debug/launching/RemoteJavaScriptLaunchDelegate.java b/bundles/org.eclipse.e4.languages.javascript.debug.model/src/org/eclipse/e4/languages/internal/javascript/debug/launching/RemoteJavaScriptLaunchDelegate.java
index 323c970..d1138bc 100644
--- a/bundles/org.eclipse.e4.languages.javascript.debug.model/src/org/eclipse/e4/languages/internal/javascript/debug/launching/RemoteJavaScriptLaunchDelegate.java
+++ b/bundles/org.eclipse.e4.languages.javascript.debug.model/src/org/eclipse/e4/languages/internal/javascript/debug/launching/RemoteJavaScriptLaunchDelegate.java
@@ -17,7 +17,6 @@
import org.eclipse.e4.languages.javascript.debug.model.JSDIDebugTarget;
import org.eclipse.e4.languages.javascript.jsdi.VirtualMachine;
import org.eclipse.e4.languages.javascript.jsdi.rhino.VirtualMachineImpl;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
public class RemoteJavaScriptLaunchDelegate extends LaunchConfigurationDelegate {
@@ -26,28 +25,19 @@
/*
* (non-Javadoc)
*
- * @see
- * org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.
- * eclipse.debug.core.ILaunchConfiguration, java.lang.String,
- * org.eclipse.debug.core.ILaunch,
- * org.eclipse.core.runtime.IProgressMonitor)
+ * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org. eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
*/
- public void launch(ILaunchConfiguration configuration, String mode,
- final ILaunch launch, IProgressMonitor monitor)
- throws CoreException {
+ public void launch(ILaunchConfiguration configuration, String mode, final ILaunch launch, IProgressMonitor monitor) throws CoreException {
- Map args = configuration.getAttribute(
- // TODO: JSDT has the equivaluent
- IJavaLaunchConfigurationConstants.ATTR_CONNECT_MAP, (Map) null);
+ Map args = configuration.getAttribute(// TODO: JSDT has the equivaluent
+ "org.eclipse.jdt.launching.CONNECT_MAP", (Map) null); //$NON-NLS-1$
if (args != null) {
TransportService service = new SocketTransportService();
Connection c;
try {
- c = service.attach((String) args.get(Constants.PORT), 10000,
- 10000);
+ c = service.attach((String) args.get(Constants.PORT), 10000, 10000);
} catch (IOException e) {
- Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID,
- "Error occured while launching", e); //$NON-NLS-1$
+ Status status = new Status(IStatus.ERROR, Constants.PLUGIN_ID, "Error occured while launching", e); //$NON-NLS-1$
throw new CoreException(status);
}
DebugSession session = new DebugSession(c);
@@ -57,8 +47,7 @@
VirtualMachine vm = new VirtualMachineImpl(session);
// TODO the process should be the OSGi launched process
- JSDIDebugTarget target = new JSDIDebugTarget(vm, null, launch, vm
- .name(), true, true);
+ JSDIDebugTarget target = new JSDIDebugTarget(vm, null, launch, vm.name(), true, true);
launch.addDebugTarget(target);
}
}
