[#314] fixed some merge problems

emustudio · Mar 26, 2023 · c11d070 · c11d070
1 parent 646f950
commit c11d070
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/...ns/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java b/...ns/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java
@@ -44,11 +44,6 @@ public String getName() {
         return toString();
     }
 
-    @Override
-    public String toString() {
-        return "MITS 88-SIO control channel";
-    }
-
     @Override
     public String toString() {
         return "88-SIO Control Channel";

diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java
@@ -53,11 +53,6 @@ public String getName() {
         return toString();
     }
 
-    @Override
-    public String toString() {
-        return "MITS 88-SIO data channel";
-    }
-
     private byte mapCharacter(byte data) {
         if (data == DELETE_CHAR) {
             data = settings.getMapDeleteChar() == SioUnitSettings.MAP_CHAR.BACKSPACE ? BACKSPACE_CHAR : DELETE_CHAR;
@@ -70,6 +65,6 @@ private byte mapCharacter(byte data) {
 
     @Override
     public String toString() {
-        return "88 SIO Data Channel";
+        return "88-SIO Data Channel";
     }
 }
diff --git a/...ins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java b/...ins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java
@@ -61,12 +61,6 @@ public class MemoryGui extends JDialog {
     private final EraseMemoryAction eraseMemoryAction;
     private final SettingsAction settingsAction;
 
-    private final LoadImageAction loadImageAction;
-    private final DumpMemoryAction dumpMemoryAction;
-    private final GotoAddressAction gotoAddressAction;
-    private final FindSequenceAction findSequenceAction;
-
-
     public MemoryGui(JFrame parent, MemoryImpl memory, MemoryContextImpl context, PluginSettings settings, Dialogs dialogs) {
         super(parent);