refactoring - create new packages: lua.debug.event, lua.debug.request and lua.debug.response

src/main/java/lua/debug/DebugStackState.java

@@ -28,6 +28,18 @@ import lua.CallInfo;
 import lua.Lua;
 import lua.StackState;
 import lua.addon.compile.LexState;
+import lua.debug.event.DebugEvent;
+import lua.debug.event.DebugEventBreakpoint;
+import lua.debug.event.DebugEventListener;
+import lua.debug.request.DebugRequest;
+import lua.debug.request.DebugRequestLineBreakpointToggle;
+import lua.debug.request.DebugRequestListener;
+import lua.debug.request.DebugRequestStack;
+import lua.debug.request.DebugRequestType;
+import lua.debug.response.DebugResponse;
+import lua.debug.response.DebugResponseCallgraph;
+import lua.debug.response.DebugResponseSimple;
+import lua.debug.response.DebugResponseStack;
 import lua.io.LocVars;
 import lua.io.Proto;
 import lua.value.LTable;

src/main/java/lua/debug/DebugSupport.java

@@ -28,6 +28,12 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
+import lua.debug.event.DebugEvent;
+import lua.debug.event.DebugEventListener;
+import lua.debug.request.DebugRequest;
+import lua.debug.request.DebugRequestListener;
+import lua.debug.response.DebugResponse;
+
 public class DebugSupport implements DebugEventListener {
     public static class State extends EnumType {
 		public static final State UNKNOWN = new State("UNKNOWN", 0);

src/main/java/lua/debug/SerializationHelper.java

@@ -6,6 +6,17 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import lua.debug.event.DebugEvent;
+import lua.debug.event.DebugEventBreakpoint;
+import lua.debug.event.DebugEventType;
+import lua.debug.request.DebugRequest;
+import lua.debug.request.DebugRequestLineBreakpointToggle;
+import lua.debug.request.DebugRequestStack;
+import lua.debug.request.DebugRequestType;
+import lua.debug.response.DebugResponseCallgraph;
+import lua.debug.response.DebugResponseSimple;
+import lua.debug.response.DebugResponseStack;
+
 public class SerializationHelper {
 
 	public static byte[] serialize(Serializable object) throws IOException {

src/main/java/lua/debug/StandardLuaJVM.java

@@ -34,6 +34,13 @@ import lua.GlobalState;
 import lua.StackState;
 import lua.addon.luacompat.LuaCompat;
 import lua.addon.luajava.LuaJava;
+import lua.debug.event.DebugEvent;
+import lua.debug.event.DebugEventType;
+import lua.debug.request.DebugRequest;
+import lua.debug.request.DebugRequestListener;
+import lua.debug.request.DebugRequestType;
+import lua.debug.response.DebugResponse;
+import lua.debug.response.DebugResponseSimple;
 import lua.io.Closure;
 import lua.io.LoadState;
 import lua.io.Proto;

src/main/java/lua/debug/event/DebugEvent.java

@@ -19,12 +19,15 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.event;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import lua.debug.Serializable;
+import lua.debug.SerializationHelper;
+
 public class DebugEvent implements Serializable {    
     
     protected DebugEventType type;

src/main/java/lua/debug/event/DebugEventBreakpoint.java

@@ -19,7 +19,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.event;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/lua/debug/event/DebugEventError.java

@@ -19,7 +19,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.event;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/lua/debug/event/DebugEventListener.java

@@ -19,7 +19,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.event;
 
 public interface DebugEventListener {
     public void notifyDebugEvent(DebugEvent event);

src/main/java/lua/debug/event/DebugEventType.java

@@ -19,11 +19,13 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.event;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
+import lua.debug.EnumType;
+
 
 public class DebugEventType extends EnumType {
 	public static DebugEventType started = new DebugEventType("started", 0);

src/main/java/lua/debug/request/DebugRequest.java

@@ -19,12 +19,15 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.request;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import lua.debug.Serializable;
+import lua.debug.SerializationHelper;
+
 public class DebugRequest implements Serializable {
     protected DebugRequestType type;
     

src/main/java/lua/debug/request/DebugRequestLineBreakpointToggle.java

@@ -19,12 +19,14 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.request;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import lua.debug.SerializationHelper;
+
 public class DebugRequestLineBreakpointToggle extends DebugRequest {
     protected String source;
     protected int lineNumber;

src/main/java/lua/debug/request/DebugRequestListener.java

@@ -19,7 +19,9 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.request;
+
+import lua.debug.response.DebugResponse;
 
 public interface DebugRequestListener {
     

src/main/java/lua/debug/request/DebugRequestStack.java

@@ -19,12 +19,14 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.request;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import lua.debug.Serializable;
+
 public class DebugRequestStack extends DebugRequest implements Serializable {
     protected int index;
     

src/main/java/lua/debug/request/DebugRequestType.java

@@ -19,11 +19,13 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.request;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
+import lua.debug.EnumType;
+
 
 public class DebugRequestType extends EnumType {
 	public static final DebugRequestType suspend = new DebugRequestType("suspend", 0);

src/main/java/lua/debug/request/DebugRequestWatchpointToggle.java

@@ -19,7 +19,9 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.request;
+
+import lua.debug.EnumType;
 
 public class DebugRequestWatchpointToggle extends DebugRequest {    
     public static class AccessType extends EnumType {

src/main/java/lua/debug/response/DebugResponse.java

@@ -19,6 +19,8 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.response;
+
+import lua.debug.Serializable;
 
 public interface DebugResponse extends Serializable {}

src/main/java/lua/debug/response/DebugResponseCallgraph.java

@@ -19,12 +19,14 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.response;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import lua.debug.StackFrame;
+
 public class DebugResponseCallgraph implements DebugResponse {
     protected StackFrame[] stackFrames;
     

src/main/java/lua/debug/response/DebugResponseSimple.java

@@ -19,7 +19,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.response;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/lua/debug/response/DebugResponseStack.java

@@ -19,12 +19,15 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 ******************************************************************************/
-package lua.debug;
+package lua.debug.response;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import lua.debug.SerializationHelper;
+import lua.debug.Variable;
+
 public class DebugResponseStack implements DebugResponse {
     protected Variable[] variables;
     

src/test/java/lua/debug/DebugEventTest.java

@@ -3,6 +3,9 @@ package lua.debug;
 import java.io.IOException;
 
 import junit.framework.TestCase;
+import lua.debug.event.DebugEvent;
+import lua.debug.event.DebugEventBreakpoint;
+import lua.debug.event.DebugEventType;
 
 public class DebugEventTest extends TestCase {
 	public void testDebugEventSerialization() {

src/test/java/lua/debug/DebugRequestTest.java

@@ -3,6 +3,10 @@ package lua.debug;
 import java.io.IOException;
 
 import junit.framework.TestCase;
+import lua.debug.request.DebugRequest;
+import lua.debug.request.DebugRequestLineBreakpointToggle;
+import lua.debug.request.DebugRequestStack;
+import lua.debug.request.DebugRequestType;
 
 public class DebugRequestTest extends TestCase {
 	public void testDebugRequestSerialization() {

src/test/java/lua/debug/DebugResponseTest.java

@@ -4,6 +4,9 @@ import java.io.IOException;
 
 import junit.framework.TestCase;
 import lua.Lua;
+import lua.debug.response.DebugResponseCallgraph;
+import lua.debug.response.DebugResponseSimple;
+import lua.debug.response.DebugResponseStack;
 
 public class DebugResponseTest extends TestCase {
 	public void testDebugResponseSimpleSerialization() {

src/test/java/lua/debug/EnumTypeTest.java

@@ -1,6 +1,8 @@
 package lua.debug;
 
 import junit.framework.TestCase;
+import lua.debug.event.DebugEventType;
+import lua.debug.request.DebugRequestType;
 
 public class EnumTypeTest extends TestCase {
 	public void testDebugSupportStateSerialization() {