[nobug] remove dep on scope-sdk as it is no longer developed
diff --git a/development/org.eclipse.wst.jsdt.debug.opera/src/org/eclipse/wst/jsdt/debug/opera/internal/jsdi/VirtualMachineImpl.java b/development/org.eclipse.wst.jsdt.debug.opera/src/org/eclipse/wst/jsdt/debug/opera/internal/jsdi/VirtualMachineImpl.java
index 4681137..4dd47d6 100644
--- a/development/org.eclipse.wst.jsdt.debug.opera/src/org/eclipse/wst/jsdt/debug/opera/internal/jsdi/VirtualMachineImpl.java
+++ b/development/org.eclipse.wst.jsdt.debug.opera/src/org/eclipse/wst/jsdt/debug/opera/internal/jsdi/VirtualMachineImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+ * Copyright (c) 2011, 2013 IBM Corporation 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
@@ -13,6 +13,7 @@
import java.util.Collections;
import java.util.List;
+import org.eclipse.wst.jsdt.debug.core.breakpoints.IJavaScriptBreakpoint;
import org.eclipse.wst.jsdt.debug.core.jsdi.BooleanValue;
import org.eclipse.wst.jsdt.debug.core.jsdi.NullValue;
import org.eclipse.wst.jsdt.debug.core.jsdi.NumberValue;
@@ -22,15 +23,6 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.event.EventQueue;
import org.eclipse.wst.jsdt.debug.core.jsdi.request.EventRequestManager;
-import com.google.protobuf.ByteString;
-import com.opera.core.scope.ESDebuggerCommand;
-import com.opera.core.scope.MessageCallback;
-import com.opera.core.scope.ProtocolFormat;
-import com.opera.core.scope.ScopeClient;
-import com.opera.core.scope.ScopeErrorException;
-import com.opera.core.systems.scope.protos.ScopeProtos;
-import com.opera.core.systems.scope.protos.UmsProtos.Command;
-
/**
* {@link VirtualMachine} for Opera support
*
@@ -43,7 +35,7 @@
private static Object rmilock = new Object();
private static Object eqlock = new Object();
- private ScopeClient client = null;
+// private ScopeClient client = null;
private String name = null;
private RequestManagerImpl rmi = null;
private EventQueueImpl eqi = null;
@@ -52,10 +44,10 @@
* Constructor
* @param client
*/
- public VirtualMachineImpl(ScopeClient client) {
- super();
- this.client = client;
- }
+// public VirtualMachineImpl(ScopeClient client) {
+// super();
+// this.client = client;
+// }
/* (non-Javadoc)
* @see org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine#resume()
@@ -73,8 +65,8 @@
* @see org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine#terminate()
*/
public void terminate() {
- client.getClientLock().release();
- client.close();
+// client.getClientLock().release();
+// client.close();
}
/* (non-Javadoc)
@@ -99,12 +91,12 @@
*/
public String version() {
StringBuffer buff = new StringBuffer("stp: "); //$NON-NLS-1$
- ScopeProtos.HostInfo.Builder b = ScopeProtos.HostInfo.newBuilder();
- buff.append(Integer.toString(b.getStpVersion())).append(" "); //$NON-NLS-1$
- buff.append("core: ").append(b.getCoreVersion()); //$NON-NLS-1$
- buff.append("agent: ").append(b.getUserAgent()); //$NON-NLS-1$
- buff.append("plat: ").append(b.getPlatform()); //$NON-NLS-1$
- buff.append("os: ").append(b.getOperatingSystem()); //$NON-NLS-1$
+// ScopeProtos.HostInfo.Builder b = ScopeProtos.HostInfo.newBuilder();
+// buff.append(Integer.toString(b.getStpVersion())).append(" "); //$NON-NLS-1$
+// buff.append("core: ").append(b.getCoreVersion()); //$NON-NLS-1$
+// buff.append("agent: ").append(b.getUserAgent()); //$NON-NLS-1$
+// buff.append("plat: ").append(b.getPlatform()); //$NON-NLS-1$
+// buff.append("os: ").append(b.getOperatingSystem()); //$NON-NLS-1$
return buff.toString();
}
@@ -120,23 +112,23 @@
* @see org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine#allScripts()
*/
public List allScripts() {
- MessageCallback callback = new MessageCallback() {
- public void onMessageReceived(Object t) {
- System.out.println("got runtimes"); //$NON-NLS-1$
- }
-
- public void onError(ScopeErrorException ex) {
- System.err.println("got exception"); //$NON-NLS-1$
- }
- };
- Command.Builder command = Command.newBuilder();
- command.setCommandID(ESDebuggerCommand.LIST_RUNTIMES.getId());
- command.setFormat(ProtocolFormat.JSON.getValue().intValue());
-
- command.setPayload(ByteString.EMPTY);
- command.setService(ESDebuggerCommand.LIST_RUNTIMES.getName());
- command.setTag(client.getNextTag());
- client.sendCommand(command.build(), callback);
+// MessageCallback callback = new MessageCallback() {
+// public void onMessageReceived(Object t) {
+// System.out.println("got runtimes"); //$NON-NLS-1$
+// }
+//
+// public void onError(ScopeErrorException ex) {
+// System.err.println("got exception"); //$NON-NLS-1$
+// }
+// };
+// Command.Builder command = Command.newBuilder();
+// command.setCommandID(ESDebuggerCommand.LIST_RUNTIMES.getId());
+// command.setFormat(ProtocolFormat.JSON.getValue().intValue());
+//
+// command.setPayload(ByteString.EMPTY);
+// command.setService(ESDebuggerCommand.LIST_RUNTIMES.getName());
+// command.setTag(client.getNextTag());
+// client.sendCommand(command.build(), callback);
return Collections.EMPTY_LIST;
}
@@ -144,7 +136,7 @@
* @see org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine#dispose()
*/
public void dispose() {
- client.close();
+// client.close();
}
/* (non-Javadoc)
@@ -211,4 +203,16 @@
}
return eqi;
}
+
+ @Override
+ public boolean canUpdateBreakpoints() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void updateBreakpoint(IJavaScriptBreakpoint breakpoint) {
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
diff --git a/development/org.eclipse.wst.jsdt.debug.opera/src/org/eclipse/wst/jsdt/debug/opera/internal/launching/OperaListeningConnector.java b/development/org.eclipse.wst.jsdt.debug.opera/src/org/eclipse/wst/jsdt/debug/opera/internal/launching/OperaListeningConnector.java
index ecfcf7b..04498bf 100644
--- a/development/org.eclipse.wst.jsdt.debug.opera/src/org/eclipse/wst/jsdt/debug/opera/internal/launching/OperaListeningConnector.java
+++ b/development/org.eclipse.wst.jsdt.debug.opera/src/org/eclipse/wst/jsdt/debug/opera/internal/launching/OperaListeningConnector.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+ * Copyright (c) 2011, 2013 IBM Corporation 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
@@ -10,19 +10,12 @@
*******************************************************************************/
package org.eclipse.wst.jsdt.debug.opera.internal.launching;
-import java.beans.ExceptionListener;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.TimeUnit;
import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
import org.eclipse.wst.jsdt.debug.core.jsdi.connect.ListeningConnector;
-import org.eclipse.wst.jsdt.debug.opera.internal.jsdi.VirtualMachineImpl;
-
-import com.opera.core.DefaultListener;
-import com.opera.core.ScopeSDK;
-import com.opera.core.scope.ScopeClient;
/**
* Default listening connector
@@ -70,37 +63,38 @@
* @see org.eclipse.wst.jsdt.debug.core.jsdi.connect.ListeningConnector#accept(java.util.Map)
*/
public VirtualMachine accept(Map arguments) throws IOException {
- DefaultListener listener = new DefaultListener();
- ExceptionListener el = new ExceptionListener() {
- public void exceptionThrown(Exception e) {
- e.printStackTrace();
- }
- };
- String host = (String) arguments.get(HostArgument.HOST);
- String port = (String) arguments.get(PortArgument.PORT);
- if(host == null || port == null) {
- throw new IOException("The host or port arguments cannot be null"); //$NON-NLS-1$
- }
- int portnum = -1;
- try {
- portnum = Integer.parseInt(port);
- }
- catch(NumberFormatException nfe) {
- throw new IOException("The given port was not an integer"); //$NON-NLS-1$
- }
- ScopeSDK scope = new ScopeSDK(listener, el, host, portnum, -1, null);
- try {
- scope.start();
- ScopeClient client = listener.waitForClient(50000, TimeUnit.MILLISECONDS);
- if(client != null) {
- VirtualMachineImpl vm = new VirtualMachineImpl(client);
- return vm;
- }
- throw new IOException("Could not start the ScopeSDK builder"); //$NON-NLS-1$
- }
- catch(IOException ioe) {
- scope.stop();
- throw ioe;
- }
+// DefaultListener listener = new DefaultListener();
+// ExceptionListener el = new ExceptionListener() {
+// public void exceptionThrown(Exception e) {
+// e.printStackTrace();
+// }
+// };
+// String host = (String) arguments.get(HostArgument.HOST);
+// String port = (String) arguments.get(PortArgument.PORT);
+// if(host == null || port == null) {
+// throw new IOException("The host or port arguments cannot be null"); //$NON-NLS-1$
+// }
+// int portnum = -1;
+// try {
+// portnum = Integer.parseInt(port);
+// }
+// catch(NumberFormatException nfe) {
+// throw new IOException("The given port was not an integer"); //$NON-NLS-1$
+// }
+// ScopeSDK scope = new ScopeSDK(listener, el, host, portnum, -1, null);
+// try {
+// scope.start();
+// ScopeClient client = listener.waitForClient(50000, TimeUnit.MILLISECONDS);
+// if(client != null) {
+// VirtualMachineImpl vm = new VirtualMachineImpl(client);
+// return vm;
+// }
+// throw new IOException("Could not start the ScopeSDK builder"); //$NON-NLS-1$
+// }
+// catch(IOException ioe) {
+// scope.stop();
+// throw ioe;
+// }
+ return null;
}
}
