From ea570eaf8687e8e97949f9d779bab54787c57964 Mon Sep 17 00:00:00 2001 From: Stephanie Gawroriski Date: Tue, 23 Jan 2024 21:47:41 +0000 Subject: [PATCH] Rename JDWPValue to JDWPHostValue. --- .../cc/squirreljme/vm/springcoat/DebugViewFrame.java | 4 ++-- .../cc/squirreljme/vm/springcoat/DebugViewObject.java | 6 +++--- .../java/cc/squirreljme/vm/springcoat/DebugViewType.java | 6 +++--- .../cc/squirreljme/vm/springcoat/SpringThreadWorker.java | 6 +++--- .../src/main/java/cc/squirreljme/jdwp/JDWPEventKind.java | 2 +- .../java/cc/squirreljme/jdwp/JDWPHostController.java | 16 ++++++++-------- .../jdwp/{JDWPValue.java => JDWPHostValue.java} | 10 +++++----- .../src/main/java/cc/squirreljme/jdwp/JDWPValueTag.java | 2 +- .../src/main/java/cc/squirreljme/jdwp/__TripField__.java | 2 +- .../jdwp/host/JDWPHostCommandSetArrayReference.java | 4 ++-- .../jdwp/host/JDWPHostCommandSetObjectReference.java | 4 ++-- .../jdwp/host/JDWPHostCommandSetReferenceType.java | 4 ++-- .../jdwp/host/JDWPHostCommandSetStackFrame.java | 6 +++--- .../jdwp/host/JDWPHostCommandSetStringReference.java | 6 +++--- .../squirreljme/jdwp/host/event/JDWPHostEventFilter.java | 4 ++-- .../cc/squirreljme/jdwp/host/trips/JDWPTripField.java | 4 ++-- .../cc/squirreljme/jdwp/host/views/JDWPViewFrame.java | 4 ++-- .../cc/squirreljme/jdwp/host/views/JDWPViewObject.java | 6 +++--- .../cc/squirreljme/jdwp/host/views/JDWPViewType.java | 4 ++-- 19 files changed, 50 insertions(+), 50 deletions(-) rename modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/{JDWPValue.java => JDWPHostValue.java} (93%) diff --git a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewFrame.java b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewFrame.java index 895462cd3b..7494e40822 100644 --- a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewFrame.java +++ b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewFrame.java @@ -10,7 +10,7 @@ package cc.squirreljme.vm.springcoat; import cc.squirreljme.jdwp.JDWPHostState; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.host.views.JDWPViewFrame; import java.lang.ref.Reference; @@ -97,7 +97,7 @@ public class DebugViewFrame * @since 2021/04/14 */ @Override - public boolean readValue(Object __which, int __index, JDWPValue __out) + public boolean readValue(Object __which, int __index, JDWPHostValue __out) { __out.set(((SpringThread.Frame)__which).loadLocal( Object.class, __index)); diff --git a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewObject.java b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewObject.java index 3c617ea1dd..b6d924a8b3 100644 --- a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewObject.java +++ b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewObject.java @@ -10,7 +10,7 @@ package cc.squirreljme.vm.springcoat; import cc.squirreljme.jdwp.JDWPHostState; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.host.views.JDWPViewObject; import java.lang.ref.Reference; @@ -78,7 +78,7 @@ public class DebugViewObject * @since 2021/04/11 */ @Override - public boolean readArray(Object __which, int __index, JDWPValue __out) + public boolean readArray(Object __which, int __index, JDWPHostValue __out) { __out.set(DebugViewObject.__normalizeNull( ((SpringArrayObject)__which).get(Object.class, __index))); @@ -90,7 +90,7 @@ public class DebugViewObject * @since 2021/04/10 */ @Override - public boolean readValue(Object __which, int __index, JDWPValue __out) + public boolean readValue(Object __which, int __index, JDWPHostValue __out) { // Nulls never have a value if (__which == SpringNullObject.NULL) diff --git a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewType.java b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewType.java index 6f2c3ac350..f99c16693e 100644 --- a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewType.java +++ b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/DebugViewType.java @@ -12,7 +12,7 @@ package cc.squirreljme.vm.springcoat; import cc.squirreljme.jdwp.JDWPCommandException; import cc.squirreljme.jdwp.JDWPLocalVariable; import cc.squirreljme.jdwp.JDWPHostState; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.host.trips.JDWPTripBreakpoint; import cc.squirreljme.jdwp.host.views.JDWPViewType; import cc.squirreljme.vm.springcoat.exceptions.SpringNoSuchFieldException; @@ -515,7 +515,7 @@ public class DebugViewType * @since 2021/04/14 */ @Override - public boolean readValue(Object __which, int __index, JDWPValue __out) + public boolean readValue(Object __which, int __index, JDWPHostValue __out) { SpringClass classy = DebugViewType.__class(__which); @@ -662,7 +662,7 @@ public class DebugViewType * @return {@code true} on success. * @since 2022/09/01 */ - static boolean __readValue(JDWPValue __out, SpringFieldStorage __store, + static boolean __readValue(JDWPHostValue __out, SpringFieldStorage __store, SpringMachine __machine) { Object value = __store.get(); diff --git a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/SpringThreadWorker.java b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/SpringThreadWorker.java index a9eba03e00..bb6cdbcef9 100644 --- a/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/SpringThreadWorker.java +++ b/emulators/springcoat-vm/src/main/java/cc/squirreljme/vm/springcoat/SpringThreadWorker.java @@ -16,7 +16,7 @@ import cc.squirreljme.jdwp.JDWPClassStatus; import cc.squirreljme.jdwp.JDWPHostController; import cc.squirreljme.jdwp.JDWPHostStepTracker; import cc.squirreljme.jdwp.JDWPHostThreadSuspension; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.host.trips.JDWPGlobalTrip; import cc.squirreljme.jdwp.host.trips.JDWPTripBreakpoint; import cc.squirreljme.jdwp.host.trips.JDWPTripClassStatus; @@ -3470,7 +3470,7 @@ public final class SpringThreadWorker // Debug signal if (jdwp != null && ssf.isDebugWatching(true)) - try (JDWPValue jVal = jdwp.value()) + try (JDWPHostValue jVal = jdwp.value()) { jVal.set( DebugViewObject.__normalizeNull(value)); @@ -3504,7 +3504,7 @@ public final class SpringThreadWorker // Debug signal if (jdwp != null && field[0].isDebugWatching(true)) - try (JDWPValue jVal = jdwp.value()) + try (JDWPHostValue jVal = jdwp.value()) { jVal.set( DebugViewObject.__normalizeNull(value)); diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPEventKind.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPEventKind.java index c45d7dea80..fa00e916cb 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPEventKind.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPEventKind.java @@ -662,7 +662,7 @@ public enum JDWPEventKind int fieldDx = (int)__args[1]; boolean write = (boolean)__args[2]; Object instance = __args[3]; - JDWPValue newValue = (JDWPValue)__args[4]; + JDWPHostValue newValue = (JDWPHostValue)__args[4]; // Write current thread and location __controller.writeObject(__packet, __thread); diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPHostController.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPHostController.java index 0662557047..fefa97a0af 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPHostController.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPHostController.java @@ -92,7 +92,7 @@ public final class JDWPHostController new Object(); /** Value cache. */ - private final Deque _freeValues = + private final Deque _freeValues = new LinkedList<>(); /** The global trips that are available. */ @@ -841,7 +841,7 @@ public final class JDWPHostController // Read from this field if (fieldId >= 0) - try (JDWPValue value = this.value()) + try (JDWPHostValue value = this.value()) { // If this is a valid object, then use it if (viewObject.readValue(thread, fieldId, value)) @@ -1225,19 +1225,19 @@ public final class JDWPHostController * @return A value to store data in. * @since 2021/03/19 */ - public final JDWPValue value() + public final JDWPHostValue value() { - Deque freeValues = this._freeValues; + Deque freeValues = this._freeValues; synchronized (this._freeValues) { // Use an existing free value for recycling? - JDWPValue rv = freeValues.poll(); + JDWPHostValue rv = freeValues.poll(); if (rv != null) return rv.__resetToOpen(); // Otherwise make a new one //noinspection resource - return new JDWPValue(freeValues).__resetToOpen(); + return new JDWPHostValue(freeValues).__resetToOpen(); } } @@ -1481,10 +1481,10 @@ public final class JDWPHostController throws JDWPException { // We really meant to write a value here - if (__val instanceof JDWPValue) + if (__val instanceof JDWPHostValue) { this.writeValue(__packet, - ((JDWPValue)__val).get(), __context, __untag); + ((JDWPHostValue)__val).get(), __context, __untag); return; } diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPValue.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPHostValue.java similarity index 93% rename from modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPValue.java rename to modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPHostValue.java index 88ad1e2a78..13aa19b91b 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPValue.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPHostValue.java @@ -18,11 +18,11 @@ import java.util.Deque; * * @since 2021/03/17 */ -public final class JDWPValue +public final class JDWPHostValue implements AutoCloseable { /** Free value queue. */ - private final Reference> _freeValues; + private final Reference> _freeValues; /** Is this open? */ private volatile boolean _isOpen; @@ -40,7 +40,7 @@ public final class JDWPValue * @throws NullPointerException On null arguments. * @since 2021/03/19 */ - JDWPValue(Deque __freeValues) + JDWPHostValue(Deque __freeValues) throws NullPointerException { if (__freeValues == null) @@ -65,7 +65,7 @@ public final class JDWPValue this._value = null; // Recycle this back in the queue - Deque queue = this._freeValues.get(); + Deque queue = this._freeValues.get(); if (queue != null) synchronized (queue) { @@ -176,7 +176,7 @@ public final class JDWPValue * @return {@code this}. * @since 2021/03/19 */ - final JDWPValue __resetToOpen() + final JDWPHostValue __resetToOpen() { synchronized (this) { diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPValueTag.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPValueTag.java index b2ff6af372..250dcbbeb9 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPValueTag.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/JDWPValueTag.java @@ -155,7 +155,7 @@ public enum JDWPValueTag * @since 2021/04/14 */ public static JDWPValueTag guessType(JDWPHostController __controller, - JDWPValue __value) + JDWPHostValue __value) throws NullPointerException { if (__controller == null || __value == null) diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/__TripField__.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/__TripField__.java index 5ba95481e8..9763784c27 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/__TripField__.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/__TripField__.java @@ -40,7 +40,7 @@ final class __TripField__ */ @Override public void field(Object __thread, Object __type, int __fieldDx, - boolean __write, Object __instance, JDWPValue __jVal) + boolean __write, Object __instance, JDWPHostValue __jVal) { JDWPHostController controller = this.__controller(); JDWPHostState state = controller.getState(); diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetArrayReference.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetArrayReference.java index ebb1b6a62e..a162f9cdb1 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetArrayReference.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetArrayReference.java @@ -15,7 +15,7 @@ import cc.squirreljme.jdwp.JDWPErrorType; import cc.squirreljme.jdwp.JDWPException; import cc.squirreljme.jdwp.JDWPHostController; import cc.squirreljme.jdwp.JDWPPacket; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.JDWPValueTag; import cc.squirreljme.jdwp.host.views.JDWPViewObject; import cc.squirreljme.jdwp.host.views.JDWPViewType; @@ -95,7 +95,7 @@ public enum JDWPHostCommandSetArrayReference // Go through and read all the array values for (int i = 0; i < len; i++) - try (JDWPValue value = __controller.value()) + try (JDWPHostValue value = __controller.value()) { if (!viewObject.readArray(array, off + i, value)) value.set(tag.defaultValue); diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetObjectReference.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetObjectReference.java index 05247bfee4..b45831fd98 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetObjectReference.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetObjectReference.java @@ -15,7 +15,7 @@ import cc.squirreljme.jdwp.JDWPErrorType; import cc.squirreljme.jdwp.JDWPException; import cc.squirreljme.jdwp.JDWPHostController; import cc.squirreljme.jdwp.JDWPPacket; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.JDWPValueTag; import cc.squirreljme.jdwp.host.views.JDWPViewObject; import cc.squirreljme.jdwp.host.views.JDWPViewType; @@ -97,7 +97,7 @@ public enum JDWPHostCommandSetObjectReference // Write field mappings rv.writeInt(numFields); for (int i = 0; i < numFields; i++) - try (JDWPValue value = __controller.value()) + try (JDWPHostValue value = __controller.value()) { // Determine the field type and its tag String fieldSig = viewType.fieldSignature(type, fields[i]); diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetReferenceType.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetReferenceType.java index 331ab3e4ed..f697b68710 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetReferenceType.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetReferenceType.java @@ -14,8 +14,8 @@ import cc.squirreljme.jdwp.JDWPCommandSetReferenceType; import cc.squirreljme.jdwp.JDWPErrorType; import cc.squirreljme.jdwp.JDWPException; import cc.squirreljme.jdwp.JDWPHostController; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.JDWPPacket; -import cc.squirreljme.jdwp.JDWPValue; import cc.squirreljme.jdwp.JDWPValueTag; import cc.squirreljme.jdwp.host.views.JDWPViewType; @@ -161,7 +161,7 @@ public enum JDWPHostCommandSetReferenceType // Write field mappings rv.writeInt(numFields); for (int i = 0; i < numFields; i++) - try (JDWPValue value = __controller.value()) + try (JDWPHostValue value = __controller.value()) { // Determine the field type and its tag String fieldSig = viewType.fieldSignature(type, fields[i]); diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetStackFrame.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetStackFrame.java index a272ad0922..bbf018c692 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetStackFrame.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetStackFrame.java @@ -15,7 +15,7 @@ import cc.squirreljme.jdwp.JDWPErrorType; import cc.squirreljme.jdwp.JDWPException; import cc.squirreljme.jdwp.JDWPHostController; import cc.squirreljme.jdwp.JDWPPacket; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.JDWPValueTag; import cc.squirreljme.jdwp.host.views.JDWPViewFrame; @@ -60,7 +60,7 @@ public enum JDWPHostCommandSetStackFrame JDWPViewFrame viewFrame = __controller.viewFrame(); for (int i = 0; i < numSlots; i++) - try (JDWPValue value = __controller.value()) + try (JDWPHostValue value = __controller.value()) { // If this value is an object we need to register it for // future grabbing @@ -115,7 +115,7 @@ public enum JDWPHostCommandSetStackFrame // Write self value else - try (JDWPValue value = __controller.value()) + try (JDWPHostValue value = __controller.value()) { // If this value is an object we need to register it for // future grabbing diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetStringReference.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetStringReference.java index 8b3fd84ff8..a0384f07f5 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetStringReference.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/JDWPHostCommandSetStringReference.java @@ -16,7 +16,7 @@ import cc.squirreljme.jdwp.JDWPException; import cc.squirreljme.jdwp.JDWPHostController; import cc.squirreljme.jdwp.JDWPHostUtils; import cc.squirreljme.jdwp.JDWPPacket; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.host.views.JDWPViewObject; import cc.squirreljme.jdwp.host.views.JDWPViewType; @@ -63,7 +63,7 @@ public enum JDWPHostCommandSetStringReference // Load the character array Object charArray; - try (JDWPValue value = __controller.value()) + try (JDWPHostValue value = __controller.value()) { // Is this a valid field? if (!viewObject.readValue(object, charFieldDx, value)) @@ -83,7 +83,7 @@ public enum JDWPHostCommandSetStringReference // Load in characters char[] chars = new char[strLen]; for (int i = 0; i < strLen; i++) - try (JDWPValue value = __controller.value()) + try (JDWPHostValue value = __controller.value()) { // Is this value valid? if (!viewObject.readArray(charArray, i, value)) diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/event/JDWPHostEventFilter.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/event/JDWPHostEventFilter.java index 53851875a7..bf0402e5e8 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/event/JDWPHostEventFilter.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/event/JDWPHostEventFilter.java @@ -16,7 +16,7 @@ import cc.squirreljme.jdwp.JDWPHostController; import cc.squirreljme.jdwp.JDWPHostLocation; import cc.squirreljme.jdwp.JDWPHostStepTracker; import cc.squirreljme.jdwp.JDWPHostUtils; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.host.views.JDWPViewObject; import cc.squirreljme.jdwp.host.views.JDWPViewType; import cc.squirreljme.runtime.cldc.debug.Debugging; @@ -322,7 +322,7 @@ public final class JDWPHostEventFilter // Get the this from the current frame Object frame = frames[0]; - try (JDWPValue val = __controller.value()) + try (JDWPHostValue val = __controller.value()) { // Read in the value if (!__controller.viewFrame() diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/trips/JDWPTripField.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/trips/JDWPTripField.java index 912012c8dc..d5a16c7446 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/trips/JDWPTripField.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/trips/JDWPTripField.java @@ -9,7 +9,7 @@ package cc.squirreljme.jdwp.host.trips; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; /** * Trip on fields. @@ -33,5 +33,5 @@ public interface JDWPTripField * @since 2021/04/30 */ void field(Object __thread, Object __type, int __fieldDx, boolean __write, - Object __instance, JDWPValue __jVal); + Object __instance, JDWPHostValue __jVal); } diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewFrame.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewFrame.java index 8a7bebe388..97f52abae7 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewFrame.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewFrame.java @@ -9,7 +9,7 @@ package cc.squirreljme.jdwp.host.views; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; /** * This is a view around thread frames. @@ -65,7 +65,7 @@ public interface JDWPViewFrame * @return {@code true} if this is a valid value. * @since 2021/04/14 */ - boolean readValue(Object __which, int __index, JDWPValue __out); + boolean readValue(Object __which, int __index, JDWPHostValue __out); /** * Returns the number of values stored in the frame. diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewObject.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewObject.java index 5dd58d3f88..186b5a8483 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewObject.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewObject.java @@ -9,7 +9,7 @@ package cc.squirreljme.jdwp.host.views; -import cc.squirreljme.jdwp.JDWPValue; +import cc.squirreljme.jdwp.JDWPHostValue; /** * An object viewer. @@ -46,7 +46,7 @@ public interface JDWPViewObject * @return {@code true} if this is a valid value. * @since 2021/04/10 */ - boolean readArray(Object __which, int __index, JDWPValue __out); + boolean readArray(Object __which, int __index, JDWPHostValue __out); /** * Reads the value of an instance field within the object. @@ -57,7 +57,7 @@ public interface JDWPViewObject * @return {@code true} if this is a valid value. * @since 2021/04/10 */ - boolean readValue(Object __which, int __index, JDWPValue __out); + boolean readValue(Object __which, int __index, JDWPHostValue __out); /** * Returns the object type. diff --git a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewType.java b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewType.java index 6613dda683..dd04751502 100644 --- a/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewType.java +++ b/modules/debug-jdwp/src/main/java/cc/squirreljme/jdwp/host/views/JDWPViewType.java @@ -9,8 +9,8 @@ package cc.squirreljme.jdwp.host.views; +import cc.squirreljme.jdwp.JDWPHostValue; import cc.squirreljme.jdwp.JDWPLocalVariable; -import cc.squirreljme.jdwp.JDWPValue; import cc.squirreljme.jdwp.host.trips.JDWPTripBreakpoint; /** @@ -274,7 +274,7 @@ public interface JDWPViewType * @return {@code true} if this is a valid value. * @since 2021/04/10 */ - boolean readValue(Object __which, int __index, JDWPValue __out); + boolean readValue(Object __which, int __index, JDWPHostValue __out); /** * Returns the signature of the given type, this signature is in the -- 2.11.4.GIT