diff --git a/src/main/java/lua/debug/DebugStackState.java b/src/main/java/lua/debug/DebugStackState.java index 4deae1e9..e174456a 100644 --- a/src/main/java/lua/debug/DebugStackState.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugSupport.java b/src/main/java/lua/debug/DebugSupport.java index 47485544..df274789 100644 --- a/src/main/java/lua/debug/DebugSupport.java +++ b/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); diff --git a/src/main/java/lua/debug/SerializationHelper.java b/src/main/java/lua/debug/SerializationHelper.java index d687fffa..8c535ad6 100644 --- a/src/main/java/lua/debug/SerializationHelper.java +++ b/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 { diff --git a/src/main/java/lua/debug/StandardLuaJVM.java b/src/main/java/lua/debug/StandardLuaJVM.java index 81a0758c..a62d682c 100644 --- a/src/main/java/lua/debug/StandardLuaJVM.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugEvent.java b/src/main/java/lua/debug/event/DebugEvent.java similarity index 95% rename from src/main/java/lua/debug/DebugEvent.java rename to src/main/java/lua/debug/event/DebugEvent.java index f22b2af3..90c41d58 100644 --- a/src/main/java/lua/debug/DebugEvent.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugEventBreakpoint.java b/src/main/java/lua/debug/event/DebugEventBreakpoint.java similarity index 99% rename from src/main/java/lua/debug/DebugEventBreakpoint.java rename to src/main/java/lua/debug/event/DebugEventBreakpoint.java index 93d96fa5..89e1e979 100644 --- a/src/main/java/lua/debug/DebugEventBreakpoint.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugEventError.java b/src/main/java/lua/debug/event/DebugEventError.java similarity index 98% rename from src/main/java/lua/debug/DebugEventError.java rename to src/main/java/lua/debug/event/DebugEventError.java index b8fc6668..c650970e 100644 --- a/src/main/java/lua/debug/DebugEventError.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugEventListener.java b/src/main/java/lua/debug/event/DebugEventListener.java similarity index 98% rename from src/main/java/lua/debug/DebugEventListener.java rename to src/main/java/lua/debug/event/DebugEventListener.java index bacf6564..7344cadb 100644 --- a/src/main/java/lua/debug/DebugEventListener.java +++ b/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); diff --git a/src/main/java/lua/debug/DebugEventType.java b/src/main/java/lua/debug/event/DebugEventType.java similarity index 98% rename from src/main/java/lua/debug/DebugEventType.java rename to src/main/java/lua/debug/event/DebugEventType.java index 828612ac..c16237b4 100644 --- a/src/main/java/lua/debug/DebugEventType.java +++ b/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); diff --git a/src/main/java/lua/debug/DebugRequest.java b/src/main/java/lua/debug/request/DebugRequest.java similarity index 95% rename from src/main/java/lua/debug/DebugRequest.java rename to src/main/java/lua/debug/request/DebugRequest.java index 1e273ea8..03d63719 100644 --- a/src/main/java/lua/debug/DebugRequest.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugRequestLineBreakpointToggle.java b/src/main/java/lua/debug/request/DebugRequestLineBreakpointToggle.java similarity index 97% rename from src/main/java/lua/debug/DebugRequestLineBreakpointToggle.java rename to src/main/java/lua/debug/request/DebugRequestLineBreakpointToggle.java index 1fc6b689..09da6599 100644 --- a/src/main/java/lua/debug/DebugRequestLineBreakpointToggle.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugRequestListener.java b/src/main/java/lua/debug/request/DebugRequestListener.java similarity index 96% rename from src/main/java/lua/debug/DebugRequestListener.java rename to src/main/java/lua/debug/request/DebugRequestListener.java index 36d1dedf..655f2af1 100644 --- a/src/main/java/lua/debug/DebugRequestListener.java +++ b/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 { diff --git a/src/main/java/lua/debug/DebugRequestStack.java b/src/main/java/lua/debug/request/DebugRequestStack.java similarity index 97% rename from src/main/java/lua/debug/DebugRequestStack.java rename to src/main/java/lua/debug/request/DebugRequestStack.java index 4d43944b..d7019bda 100644 --- a/src/main/java/lua/debug/DebugRequestStack.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugRequestType.java b/src/main/java/lua/debug/request/DebugRequestType.java similarity index 98% rename from src/main/java/lua/debug/DebugRequestType.java rename to src/main/java/lua/debug/request/DebugRequestType.java index 88db55e7..f6ad5e62 100644 --- a/src/main/java/lua/debug/DebugRequestType.java +++ b/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); diff --git a/src/main/java/lua/debug/DebugRequestWatchpointToggle.java b/src/main/java/lua/debug/request/DebugRequestWatchpointToggle.java similarity index 98% rename from src/main/java/lua/debug/DebugRequestWatchpointToggle.java rename to src/main/java/lua/debug/request/DebugRequestWatchpointToggle.java index e9554f4c..4a1972be 100644 --- a/src/main/java/lua/debug/DebugRequestWatchpointToggle.java +++ b/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 { diff --git a/src/main/java/lua/debug/DebugResponse.java b/src/main/java/lua/debug/response/DebugResponse.java similarity index 95% rename from src/main/java/lua/debug/DebugResponse.java rename to src/main/java/lua/debug/response/DebugResponse.java index cca17934..8bca33ec 100644 --- a/src/main/java/lua/debug/DebugResponse.java +++ b/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 {} diff --git a/src/main/java/lua/debug/DebugResponseCallgraph.java b/src/main/java/lua/debug/response/DebugResponseCallgraph.java similarity index 97% rename from src/main/java/lua/debug/DebugResponseCallgraph.java rename to src/main/java/lua/debug/response/DebugResponseCallgraph.java index 03ff8b82..a72d3a71 100644 --- a/src/main/java/lua/debug/DebugResponseCallgraph.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugResponseSimple.java b/src/main/java/lua/debug/response/DebugResponseSimple.java similarity index 98% rename from src/main/java/lua/debug/DebugResponseSimple.java rename to src/main/java/lua/debug/response/DebugResponseSimple.java index 9ff63575..bbc2422f 100644 --- a/src/main/java/lua/debug/DebugResponseSimple.java +++ b/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; diff --git a/src/main/java/lua/debug/DebugResponseStack.java b/src/main/java/lua/debug/response/DebugResponseStack.java similarity index 96% rename from src/main/java/lua/debug/DebugResponseStack.java rename to src/main/java/lua/debug/response/DebugResponseStack.java index babf17b8..0349282c 100644 --- a/src/main/java/lua/debug/DebugResponseStack.java +++ b/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; diff --git a/src/test/java/lua/debug/DebugEventTest.java b/src/test/java/lua/debug/DebugEventTest.java index 0a3fab0c..229a867f 100644 --- a/src/test/java/lua/debug/DebugEventTest.java +++ b/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() { diff --git a/src/test/java/lua/debug/DebugRequestTest.java b/src/test/java/lua/debug/DebugRequestTest.java index f913fb7d..c79ce118 100644 --- a/src/test/java/lua/debug/DebugRequestTest.java +++ b/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() { diff --git a/src/test/java/lua/debug/DebugResponseTest.java b/src/test/java/lua/debug/DebugResponseTest.java index efe44b13..6962a934 100644 --- a/src/test/java/lua/debug/DebugResponseTest.java +++ b/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() { diff --git a/src/test/java/lua/debug/EnumTypeTest.java b/src/test/java/lua/debug/EnumTypeTest.java index a5eef1b1..061ae2fd 100644 --- a/src/test/java/lua/debug/EnumTypeTest.java +++ b/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() {