Permalink
Browse files

Bug 304129 - Post move packaging and bundling

  • Loading branch information...
1 parent 6aed74f commit d76e8fc55b5d7499e5f0def0b139ac9d705d8dbd skaegi committed Feb 28, 2010
Showing with 204 additions and 192 deletions.
  1. +7 −0 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/.classpath
  2. +28 −0 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/.project
  3. +7 −0 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/.settings/org.eclipse.jdt.core.prefs
  4. +4 −0 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/.settings/org.eclipse.pde.core.prefs
  5. +10 −0 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/META-INF/MANIFEST.MF
  6. +4 −0 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/build.properties
  7. +4 −4 ....wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger}/BreakpointImpl.java
  8. +3 −3 ...pse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger}/ContextData.java
  9. +3 −3 ....wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger}/DebugFrameImpl.java
  10. +4 −4 ....wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger}/RequestHandler.java
  11. +12 −12 ...e.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger}/RhinoDebugger.java
  12. +3 −3 ...ipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger}/ScriptImpl.java
  13. +3 −3 ...ipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/debugger}/ThreadData.java
  14. +1 −1 ...pse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/Connection.java
  15. +1 −1 ...ipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/Constants.java
  16. +7 −8 ...e.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/DebugSession.java
  17. +6 −1 ...t.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/transport}/DisconnectedException.java
  18. +1 −2 ...se.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/EventPacket.java
  19. +1 −1 ....wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/transport}/JSONConstants.java
  20. +2 −1 ...lipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/transport}/JSONUtil.java
  21. +7 −6 ...eclipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/Packet.java
  22. +5 −6 ....wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/PacketManager.java
  23. +3 −8 ...dt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/PacketReceiveManager.java
  24. +4 −6 ....jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/PacketSendManager.java
  25. +3 −7 ...st.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/PipedConnection.java
  26. +1 −1 ...t.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/PipedTransportService.java
  27. +9 −8 ...clipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/Request.java
  28. +3 −5 ...lipse.wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/Response.java
  29. +3 −6 ...t.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/SocketConnection.java
  30. +5 −6 ....debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/SocketTransportService.java
  31. +1 −1 ...t.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug/rhino/transport}/TimeoutException.java
  32. +1 −1 ...t.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/TransportService.java
  33. 0 ...wst.jsdt.debug.rhino.debugger/src/org/eclipse/wst/jsdt/debug}/rhino/transport/messages.properties
  34. +11 −9 bundles/org.eclipse.wst.jsdt.debug.rhino/META-INF/MANIFEST.MF
  35. +1 −1 ...e.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ArrayReferenceImpl.java
  36. +1 −1 ...pse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/BooleanValueImpl.java
  37. +1 −1 ...st.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/FunctionReferenceImpl.java
  38. +1 −1 ...clipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/NullValueImpl.java
  39. +1 −1 ...ipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/NumberValueImpl.java
  40. +1 −1 ....wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ObjectReferenceImpl.java
  41. +1 −1 ....wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ScriptReferenceImpl.java
  42. +5 −5 ....jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/StackFrameReferenceImpl.java
  43. +1 −1 ...ipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/StringValueImpl.java
  44. +5 −5 ....wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ThreadReferenceImpl.java
  45. +1 −1 ...e.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/UndefinedValueImpl.java
  46. +7 −7 ...e.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/VirtualMachineImpl.java
  47. +1 −1 ...bug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/connect/RhinoAttachingConnector.java
  48. +4 −4 ...wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/event/EventQueueImpl.java
  49. +5 −5 ...debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/request/BreakpointRequestImpl.java
  50. +1 −1 ....jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/request/StepRequestImpl.java
  51. +0 −38 ...clipse.wst.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/Messages.java
View
7 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
View
28 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.wst.jsdt.debug.rhino.debugger</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
View
7 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+#Sun Feb 28 13:50:08 EST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.3
View
4 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Sun Feb 28 13:50:08 EST 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
View
10 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Rhino Debugger
+Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.rhino.debugger
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Export-Package: org.eclipse.wst.jsdt.debug.rhino.debugger,
+ org.eclipse.wst.jsdt.debug.rhino.transport
+Import-Package: org.mozilla.javascript;resolution:=optional,
+ org.mozilla.javascript.debug;resolution:=optional
View
4 bundles/org.eclipse.wst.jsdt.debug.rhino.debugger/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
View
8 .../debug/internal/rhino/BreakpointImpl.java → .../debug/rhino/debugger/BreakpointImpl.java
@@ -6,12 +6,11 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino;
+package org.eclipse.wst.jsdt.debug.rhino.debugger;
import java.util.HashMap;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
@@ -39,7 +38,8 @@
* @param threadId the id of the thread the breakpoint is for
*/
public BreakpointImpl(Long breakpointId, ScriptImpl script, Integer lineNumber, String functionName, String condition, Long threadId) {
- Assert.isNotNull(script);
+ if (script == null)
+ throw new NullPointerException();
this.breakpointId = breakpointId;
this.script = script;
this.lineNumber = lineNumber;
View
6 ...sdt/debug/internal/rhino/ContextData.java → ...sdt/debug/rhino/debugger/ContextData.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino;
+package org.eclipse.wst.jsdt.debug.rhino.debugger;
import java.util.ArrayList;
import java.util.Collection;
@@ -16,8 +16,8 @@
import java.util.List;
import java.util.Map;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket;
import org.mozilla.javascript.debug.DebugFrame;
/**
View
6 .../debug/internal/rhino/DebugFrameImpl.java → .../debug/rhino/debugger/DebugFrameImpl.java
@@ -6,16 +6,16 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino;
+package org.eclipse.wst.jsdt.debug.rhino.debugger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
-import org.eclipse.wst.jsdt.debug.internal.rhino.ScriptImpl.ScriptRecord;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.debugger.ScriptImpl.ScriptRecord;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
import org.mozilla.javascript.BaseFunction;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.NativeArray;
View
8 .../debug/internal/rhino/RequestHandler.java → .../debug/rhino/debugger/RequestHandler.java
@@ -6,15 +6,15 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino;
+package org.eclipse.wst.jsdt.debug.rhino.debugger;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Request;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Response;
/**
* Rhino request handler used to craft response bodies for given JSON requests
View
24 ...t/debug/internal/rhino/RhinoDebugger.java → ...t/debug/rhino/debugger/RhinoDebugger.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino;
+package org.eclipse.wst.jsdt.debug.rhino.debugger;
import java.io.IOException;
import java.text.DateFormat;
@@ -20,17 +20,17 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.TimeoutException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Connection;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DebugSession;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.SocketTransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.TransportService.ListenerKey;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Connection;
+import org.eclipse.wst.jsdt.debug.rhino.transport.DebugSession;
+import org.eclipse.wst.jsdt.debug.rhino.transport.DisconnectedException;
+import org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Request;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.SocketTransportService;
+import org.eclipse.wst.jsdt.debug.rhino.transport.TimeoutException;
+import org.eclipse.wst.jsdt.debug.rhino.transport.TransportService;
+import org.eclipse.wst.jsdt.debug.rhino.transport.TransportService.ListenerKey;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextFactory;
import org.mozilla.javascript.debug.DebugFrame;
View
6 ...jsdt/debug/internal/rhino/ScriptImpl.java → ...jsdt/debug/rhino/debugger/ScriptImpl.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino;
+package org.eclipse.wst.jsdt.debug.rhino.debugger;
import java.util.ArrayList;
import java.util.Collection;
@@ -16,8 +16,8 @@
import java.util.Map;
import java.util.TreeSet;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONUtil;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONUtil;
import org.mozilla.javascript.debug.DebuggableScript;
/**
View
6 ...jsdt/debug/internal/rhino/ThreadData.java → ...jsdt/debug/rhino/debugger/ThreadData.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino;
+package org.eclipse.wst.jsdt.debug.rhino.debugger;
import java.util.ArrayList;
import java.util.HashMap;
@@ -17,8 +17,8 @@
import java.util.List;
import java.util.Map;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
+import org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.debug.DebugFrame;
import org.mozilla.javascript.debug.DebuggableScript;
View
2 .../internal/rhino/transport/Connection.java → ...sdt/debug/rhino/transport/Connection.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.IOException;
View
2 ...g/internal/rhino/transport/Constants.java → ...jsdt/debug/rhino/transport/Constants.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
/**
* Common constants
View
15 ...nternal/rhino/transport/DebugSession.java → ...t/debug/rhino/transport/DebugSession.java
@@ -6,12 +6,8 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.TimeoutException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
/**
* A {@link DebugSession} controls a {@link PacketSendManager} and {@link PacketReceiveManager}
@@ -68,7 +64,8 @@ public void dispose() {
* @throws DisconnectedException if the {@link PacketSendManager} has been disconnected
*/
public void sendRequest(Request request) throws DisconnectedException {
- Assert.isNotNull(request);
+ if(request==null)
+ throw new NullPointerException();
packetSendManager.sendPacket(request);
}
@@ -79,7 +76,8 @@ public void sendRequest(Request request) throws DisconnectedException {
* @throws DisconnectedException if the {@link PacketSendManager} has been disconnected
*/
public void sendEvent(EventPacket event) throws DisconnectedException {
- Assert.isNotNull(event);
+ if(event==null)
+ throw new NullPointerException();
packetSendManager.sendPacket(event);
}
@@ -90,7 +88,8 @@ public void sendEvent(EventPacket event) throws DisconnectedException {
* @throws DisconnectedException if the {@link PacketSendManager} has been disconnected
*/
public void sendResponse(Response response) throws DisconnectedException {
- Assert.isNotNull(response);
+ if(response==null)
+ throw new NullPointerException();
packetSendManager.sendPacket(response);
}
View
7 ...e/jsdi/connect/DisconnectedException.java → ...hino/transport/DisconnectedException.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.core.jsdi.connect;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
/**
@@ -18,6 +18,11 @@
public final class DisconnectedException extends Exception {
/**
+ *
+ */
+ private static final long serialVersionUID = 3233213787459625769L;
+
+ /**
* Constructor
*
* @param message
View
3 ...internal/rhino/transport/EventPacket.java → ...dt/debug/rhino/transport/EventPacket.java
@@ -6,13 +6,12 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
/**
* An {@link EventPacket} is a specialized {@link Packet}
View
2 ...ug/internal/rhino/json/JSONConstants.java → .../debug/rhino/transport/JSONConstants.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.json;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
/**
* Collection of constants used for JSON
View
3 ...t/debug/internal/rhino/json/JSONUtil.java → .../jsdt/debug/rhino/transport/JSONUtil.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.json;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.math.BigDecimal;
import java.text.CharacterIterator;
@@ -19,6 +19,7 @@
import java.util.List;
import java.util.Map;
+
/**
* This class provides utilities for working with JSON.
* <br><br>JSON identifiers map to Java as follows:
View
13 ...ebug/internal/rhino/transport/Packet.java → ...st/jsdt/debug/rhino/transport/Packet.java
@@ -6,13 +6,11 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
/**
* Abstract description of a packet for sending / receiving information to the debug client
@@ -32,7 +30,8 @@
* @param type the type for the {@link Packet} <code>null</code> is not accepted
*/
protected Packet(String type) {
- Assert.isNotNull(type);
+ if(type==null)
+ throw new NullPointerException();
this.sequence = nextSequence();
this.type = type.intern();
}
@@ -43,7 +42,8 @@ protected Packet(String type) {
* @param json the pre-composed map of attributes for the packet, <code>null</code> is not accepted
*/
protected Packet(Map json) {
- Assert.isNotNull(json);
+ if(json==null)
+ throw new NullPointerException();
Number packetSeq = (Number) json.get(JSONConstants.SEQ);
this.sequence = packetSeq.intValue();
String packetType = (String) json.get(JSONConstants.TYPE);
@@ -98,7 +98,8 @@ public Map toJSON() {
* @return the type from the JSON map or <code>null</code>
*/
public static String getType(Map json) {
- Assert.isNotNull(json);
+ if(json==null)
+ throw new NullPointerException();
return (String) json.get(JSONConstants.TYPE);
}
View
11 ...ternal/rhino/transport/PacketManager.java → .../debug/rhino/transport/PacketManager.java
@@ -6,13 +6,10 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.IOException;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-
/**
* Default manager for sending / receiving packets to / from the connected {@link VirtualMachine}
*
@@ -39,7 +36,8 @@
* @param connection the connection to communicate on, <code>null</code> is not accepted
*/
protected PacketManager(Connection connection) {
- Assert.isNotNull(connection);
+ if(connection==null)
+ throw new NullPointerException();
this.connection = connection;
}
@@ -105,7 +103,8 @@ public IOException getDisconnectedException() {
* @param thread the new partner thread, <code>null</code> is not accepted
*/
public void setPartnerThread(Thread thread) {
- Assert.isNotNull(thread);
+ if(thread==null)
+ throw new NullPointerException();
this.partnerThread = thread;
}
}
View
11 ...rhino/transport/PacketReceiveManager.java → ...rhino/transport/PacketReceiveManager.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -15,11 +15,6 @@
import java.util.List;
import java.util.ListIterator;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.TimeoutException;
-
/**
* Default implementation of {@link PacketManager} for receiving packets from the
* {@link VirtualMachine}
@@ -130,10 +125,10 @@ public Packet getCommand(String type, long timeToWait) throws TimeoutException,
}
// Check for an IO Exception.
if (isDisconnected()) {
- throw new DisconnectedException(Messages.runtime_disconnected, getDisconnectedException());
+ throw new DisconnectedException("runtime disconnected", getDisconnectedException());
}
// Check for a timeout.
- throw new TimeoutException(NLS.bind(Messages.time_out_waiting_for_command_packet, new String[] {type}));
+ throw new TimeoutException("time_out_waiting_for_command_packet:" + type);
}
/**
View
10 ...al/rhino/transport/PacketSendManager.java → ...ug/rhino/transport/PacketSendManager.java
@@ -6,16 +6,13 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
/**
* Default implementation of {@link PacketManager} for sending packets to the
@@ -76,9 +73,10 @@ public void run() {
* @throws DisconnectedException
*/
public void sendPacket(Packet packet) throws DisconnectedException {
- Assert.isNotNull(packet);
+ if(packet==null)
+ throw new NullPointerException();
if (isDisconnected()) {
- throw new DisconnectedException(Messages.runtime_disconnected, getDisconnectedException());
+ throw new DisconnectedException("runtime disconnected", getDisconnectedException());
}
synchronized (outgoingPackets) {
// Add packet to list of packets to send.
View
10 ...rnal/rhino/transport/PipedConnection.java → ...ebug/rhino/transport/PipedConnection.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -20,10 +20,6 @@
import java.io.Writer;
import java.util.Map;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONUtil;
-
/**
* A {@link Connection} implementation that uses streams for communication
*
@@ -43,8 +39,8 @@
* @throws IOException
*/
public PipedConnection(InputStream is, OutputStream os) throws IOException {
- Assert.isNotNull(is);
- Assert.isNotNull(os);
+ if(is==null || os==null)
+ throw new NullPointerException();
writer = new BufferedWriter(new OutputStreamWriter(os, Constants.UTF_8));
reader = new BufferedReader(new InputStreamReader(is, Constants.UTF_8));
}
View
2 ...hino/transport/PipedTransportService.java → ...hino/transport/PipedTransportService.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.IOException;
import java.io.PipedInputStream;
View
17 ...bug/internal/rhino/transport/Request.java → ...t/jsdt/debug/rhino/transport/Request.java
@@ -6,15 +6,12 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-
/**
* Default request implementation using JSON
*
@@ -32,7 +29,8 @@
*/
public Request(String command) {
super(JSONConstants.REQUEST);
- Assert.isNotNull(command);
+ if(command==null)
+ throw new NullPointerException();
this.command = command.intern();
}
@@ -43,7 +41,8 @@ public Request(String command) {
*/
public Request(Map json) {
super(json);
- Assert.isNotNull(json);
+ if(json==null)
+ throw new NullPointerException();
String packetCommand = (String) json.get(JSONConstants.COMMAND);
this.command = packetCommand.intern();
Map packetArguments = (Map) json.get(JSONConstants.ARGUMENTS);
@@ -80,8 +79,10 @@ public Map getArguments() {
* @param argument the value for the argument, <code>null</code> is not accepted
*/
public void setArgument(String key, Object argument) {
- Assert.isNotNull(key);
- Assert.isNotNull(argument);
+ if(key==null)
+ throw new NullPointerException();
+ if(argument==null)
+ throw new NullPointerException();
arguments.put(key, argument);
}
View
8 ...ug/internal/rhino/transport/Response.java → .../jsdt/debug/rhino/transport/Response.java
@@ -6,15 +6,12 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-
/**
* Default {@link Response} implementation using JSON
*
@@ -37,7 +34,8 @@
*/
public Response(int requestSequence, String command) {
super(JSONConstants.RESPONSE);
- Assert.isNotNull(command);
+ if(command==null)
+ throw new NullPointerException();
this.requestSequence = requestSequence;
this.command = command.intern();
}
View
9 ...nal/rhino/transport/SocketConnection.java → ...bug/rhino/transport/SocketConnection.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -19,10 +19,6 @@
import java.net.Socket;
import java.util.Map;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONUtil;
-
/**
* A specialized {@link Connection} that communicates using {@link Socket}s
*
@@ -42,7 +38,8 @@
* @throws IOException
*/
public SocketConnection(Socket socket) throws IOException {
- Assert.isNotNull(socket);
+ if(socket==null)
+ throw new NullPointerException();
this.socket = socket;
writer = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), Constants.UTF_8));
reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), Constants.UTF_8));
View
11 ...ino/transport/SocketTransportService.java → ...ino/transport/SocketTransportService.java
@@ -6,15 +6,14 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
/**
* Implementation of a transport service that using a {@link Socket} for communication
@@ -101,11 +100,11 @@ public Connection accept(ListenerKey key, long attachTimeout, long handshakeTime
Connection connection = new SocketConnection(serverSocket.accept());
Packet packet = connection.readPacket();
if (!(packet instanceof Request)) {
- throw new IOException(Messages.failure_establishing_connection);
+ throw new IOException("failure establishing_connection");
}
Request request = (Request) packet;
if (!request.getCommand().equals(JSONConstants.CONNECT)) {
- throw new IOException(Messages.failure_establishing_connection);
+ throw new IOException("failure establishing connection");
}
Response response = new Response(request.getSequence(), request.getCommand());
connection.writePacket(response);
@@ -137,12 +136,12 @@ public Connection attach(String address, long attachTimeout, long handshakeTimeo
Packet packet = connection.readPacket();
if (!(packet instanceof Response)) {
- throw new IOException(Messages.failure_establishing_connection);
+ throw new IOException("failure establishing connection"); //$NON-NLS-1$
}
Response response = (Response) packet;
if (!response.getCommand().equals(JSONConstants.CONNECT) || response.getRequestSequence() != request.getSequence() || !response.isSuccess() || !response.isRunning()) {
- throw new IOException(Messages.failure_establishing_connection);
+ throw new IOException("failure establishing connection"); //$NON-NLS-1$
}
return connection;
}
View
2 ...g/core/jsdi/connect/TimeoutException.java → ...bug/rhino/transport/TimeoutException.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.core.jsdi.connect;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
/**
* This exception is thrown if the {@link PacketSendManager} or {@link PacketReceiveManager}
View
2 ...nal/rhino/transport/TransportService.java → ...bug/rhino/transport/TransportService.java
@@ -6,7 +6,7 @@
*
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
+package org.eclipse.wst.jsdt.debug.rhino.transport;
import java.io.IOException;
View
0 ...ernal/rhino/transport/messages.properties → ...debug/rhino/transport/messages.properties
File renamed without changes.
View
20 bundles/org.eclipse.wst.jsdt.debug.rhino/META-INF/MANIFEST.MF
@@ -5,16 +5,18 @@ Bundle-SymbolicName: org.eclipse.wst.jsdt.debug.rhino;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.wst.jsdt.debug.internal.rhino.RhinoDebugPlugin
Bundle-Vendor: IBM
-Require-Bundle: org.eclipse.core.runtime,
- org.mozilla.javascript;bundle-version="1.7.2";visibility:=reexport,
- org.eclipse.wst.jsdt.debug.core
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.wst.jsdt.debug.internal.rhino;x-internal:=true,
- org.eclipse.wst.jsdt.debug.internal.rhino.jsdi;x-internal:=true,
+Export-Package: org.eclipse.wst.jsdt.debug.internal.rhino.jsdi;x-internal:=true,
org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.connect;x-internal:=true,
org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.event;x-internal:=true,
- org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.request;x-internal:=true,
- org.eclipse.wst.jsdt.debug.internal.rhino.json;x-internal:=true,
- org.eclipse.wst.jsdt.debug.internal.rhino.transport;x-internal:=true
-Import-Package: org.eclipse.debug.core.model
+ org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.request;x-internal:=true
+Import-Package: org.eclipse.debug.core.model,
+ org.eclipse.wst.jsdt.debug.core.breakpoints,
+ org.eclipse.wst.jsdt.debug.core.jsdi,
+ org.eclipse.wst.jsdt.debug.core.jsdi.connect,
+ org.eclipse.wst.jsdt.debug.core.jsdi.event,
+ org.eclipse.wst.jsdt.debug.core.jsdi.request,
+ org.eclipse.wst.jsdt.debug.core.model,
+ org.eclipse.wst.jsdt.debug.rhino.transport
View
2 ...dt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ArrayReferenceImpl.java
@@ -19,7 +19,7 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.ArrayReference;
import org.eclipse.wst.jsdt.debug.core.jsdi.Property;
import org.eclipse.wst.jsdt.debug.core.jsdi.Value;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
* Rhino implementation of {@link ArrayReference}
View
2 ...jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/BooleanValueImpl.java
@@ -13,7 +13,7 @@
import java.util.Map;
import org.eclipse.wst.jsdt.debug.core.jsdi.BooleanValue;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
* Rhino implementation of {@link BooleanValue}
View
2 ...debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/FunctionReferenceImpl.java
@@ -13,7 +13,7 @@
import java.util.Map;
import org.eclipse.wst.jsdt.debug.core.jsdi.FunctionReference;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
* Rhino implementation of {@link FunctionReference}
View
2 ...st.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/NullValueImpl.java
@@ -11,7 +11,7 @@
package org.eclipse.wst.jsdt.debug.internal.rhino.jsdi;
import org.eclipse.wst.jsdt.debug.core.jsdi.NullValue;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
* Rhino implementation of {@link NullValue}
View
2 ....jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/NumberValueImpl.java
@@ -13,7 +13,7 @@
import java.util.Map;
import org.eclipse.wst.jsdt.debug.core.jsdi.NumberValue;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
* Rhino implementation of {@link NumberValue}
View
2 ...t.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ObjectReferenceImpl.java
@@ -18,7 +18,7 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.ObjectReference;
import org.eclipse.wst.jsdt.debug.core.jsdi.Property;
import org.eclipse.wst.jsdt.debug.core.jsdi.Value;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
* Rhino implementation of {@link ObjectReference}
View
2 ...t.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ScriptReferenceImpl.java
@@ -23,7 +23,7 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.Location;
import org.eclipse.wst.jsdt.debug.core.jsdi.ScriptReference;
import org.eclipse.wst.jsdt.debug.internal.rhino.RhinoDebugPlugin;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
import org.osgi.framework.Constants;
/**
View
10 ...bug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/StackFrameReferenceImpl.java
@@ -20,11 +20,11 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.StackFrame;
import org.eclipse.wst.jsdt.debug.core.jsdi.Value;
import org.eclipse.wst.jsdt.debug.core.jsdi.Variable;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.TimeoutException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.DisconnectedException;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Request;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.TimeoutException;
/**
* Rhino implementation of {@link StackFrame}
View
2 ....jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/StringValueImpl.java
@@ -13,7 +13,7 @@
import java.util.Map;
import org.eclipse.wst.jsdt.debug.core.jsdi.StringValue;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
* Rhino implementation of {@link StringValue}
View
10 ...t.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/ThreadReferenceImpl.java
@@ -18,11 +18,11 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.StackFrame;
import org.eclipse.wst.jsdt.debug.core.jsdi.ThreadReference;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.TimeoutException;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.DisconnectedException;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Request;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.TimeoutException;
/**
* Rhino implementation of {@link ThreadReference}
View
2 ...dt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/UndefinedValueImpl.java
@@ -11,7 +11,7 @@
package org.eclipse.wst.jsdt.debug.internal.rhino.jsdi;
import org.eclipse.wst.jsdt.debug.core.jsdi.UndefinedValue;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
/**
* Rhino implementation of {@link UndefinedValue}
View
14 ...dt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/VirtualMachineImpl.java
@@ -22,17 +22,17 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.StringValue;
import org.eclipse.wst.jsdt.debug.core.jsdi.UndefinedValue;
import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.TimeoutException;
import org.eclipse.wst.jsdt.debug.core.jsdi.event.EventQueue;
import org.eclipse.wst.jsdt.debug.core.jsdi.request.EventRequestManager;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.event.EventQueueImpl;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.request.EventRequestManagerImpl;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.DebugSession;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.DebugSession;
+import org.eclipse.wst.jsdt.debug.rhino.transport.DisconnectedException;
+import org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Request;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.TimeoutException;
/**
* Rhino implementation of {@link VirtualMachine}
View
2 ...o/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/connect/RhinoAttachingConnector.java
@@ -18,7 +18,7 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.connect.AttachingConnector;
import org.eclipse.wst.jsdt.debug.core.jsdi.connect.Connector;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.VirtualMachineImpl;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.*;
+import org.eclipse.wst.jsdt.debug.rhino.transport.*;
/**
* Rhino {@link Connector} implementation that attaches to a running debug process
View
8 ....debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/event/EventQueueImpl.java
@@ -16,8 +16,6 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.Location;
import org.eclipse.wst.jsdt.debug.core.jsdi.ThreadReference;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.TimeoutException;
import org.eclipse.wst.jsdt.debug.core.jsdi.event.EventQueue;
import org.eclipse.wst.jsdt.debug.core.jsdi.event.EventSet;
import org.eclipse.wst.jsdt.debug.core.jsdi.request.ExceptionRequest;
@@ -32,8 +30,10 @@
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.request.EventRequestManagerImpl;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.request.StepRequestImpl;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.request.SuspendRequestImpl;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.EventPacket;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.DisconnectedException;
+import org.eclipse.wst.jsdt.debug.rhino.transport.EventPacket;
+import org.eclipse.wst.jsdt.debug.rhino.transport.TimeoutException;
/**
* Default implementation of {@link EventQueue}
View
10 ...ino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/request/BreakpointRequestImpl.java
@@ -15,14 +15,14 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.Location;
import org.eclipse.wst.jsdt.debug.core.jsdi.ThreadReference;
import org.eclipse.wst.jsdt.debug.core.jsdi.VirtualMachine;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.DisconnectedException;
-import org.eclipse.wst.jsdt.debug.core.jsdi.connect.TimeoutException;
import org.eclipse.wst.jsdt.debug.core.jsdi.request.BreakpointRequest;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.ScriptReferenceImpl;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.VirtualMachineImpl;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Request;
-import org.eclipse.wst.jsdt.debug.internal.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.DisconnectedException;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Request;
+import org.eclipse.wst.jsdt.debug.rhino.transport.Response;
+import org.eclipse.wst.jsdt.debug.rhino.transport.TimeoutException;
/**
* Rhino implementation of {@link BreakpointRequest}
View
2 ...bug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/jsdi/request/StepRequestImpl.java
@@ -14,7 +14,7 @@
import org.eclipse.wst.jsdt.debug.core.jsdi.request.StepRequest;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.ThreadReferenceImpl;
import org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.VirtualMachineImpl;
-import org.eclipse.wst.jsdt.debug.internal.rhino.json.JSONConstants;
+import org.eclipse.wst.jsdt.debug.rhino.transport.JSONConstants;
public class StepRequestImpl extends EventRequestImpl implements StepRequest {
View
38 ...st.jsdt.debug.rhino/src/org/eclipse/wst/jsdt/debug/internal/rhino/transport/Messages.java
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.debug.internal.rhino.transport;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Rhino messages
- *
- * @since 1.0
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.debug.internal.rhino.jsdi.connect.messages"; //$NON-NLS-1$
- public static String HostArgument_description;
- public static String HostArgument_label;
- public static String PortArgument_description;
- public static String PortArgument_label;
- public static String RhinoAttachingConnector_description;
- public static String RhinoAttachingConnector_name;
- public static String failure_establishing_connection;
- public static String runtime_disconnected;
- public static String time_out_waiting_for_command_packet;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}

0 comments on commit d76e8fc

Please sign in to comment.