Editor tabs (#238)

* Split into modules

* Add validation utils from patch-1 branch

* Tabs, iteration 1

* Delete RefreshMode

* Load initial code asynchronously

* Formatting

* Don't do anything when close() gets called multiple times

* Add scroll pane to editor

* Fix getActiveEditor()

* Rename components to more descriptive editorScrollPanes

* Move ClassHandle and related types out of gui package

* Fix tab title bar and other files not updating when changing mappings

* Fix compilation errors

* Start adding renaming functionality to new panel

* Scale validation error marker

* Make most user input validation use ValidationContext

* Fix line numbers not displaying

* Move CodeReader.navigateToToken into PanelEditor

* Add close button on tabs

* Remove TODO, it's fast enough

* Remove JS script action for 2 seconds faster startup

* Add comment on why the action is removed

* ClassHandle/ClassHandleProvider documentation

* Fix language file formatting

* Bulk tab closing operations

* Fix crash when renaming class and not connected to server

* Fix caret jumping to the end of the file when opening

* Increase identifier panel size

* Make popup menu text translatable

* Fix formatting

* Fix compilation issues

* CovertTextField -> ConvertingTextField

* Retain formatting using spaces

* Add de_de.json

* Better decompilation error handling

* Fix some caret related NPEs

* Localization

* Close editor on classhandle delete & fix onInvalidate not running on the Swing thread

* Fix crash when trying to close a tab from onDeleted class handle listener

Co-authored-by: Runemoro <runemoro1@gmail.com>

9 files changed, 102 insertions, 57 deletions

diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java b/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java
index 720744bf..1b0191be 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/ClientPacketHandler.java
@@ -5,19 +5,20 @@ import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.network.packet.Packet;
 import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.validation.ValidationContext;
 
 import java.util.List;
 
 public interface ClientPacketHandler {
     void openMappings(EntryTree<EntryMapping> mappings);
 
-    void rename(EntryReference<Entry<?>, Entry<?>> reference, String newName, boolean refreshClassTree, boolean jumpToReference);
+    void rename(ValidationContext vc, EntryReference<Entry<?>, Entry<?>> reference, String newName, boolean refreshClassTree);
 
-    void removeMapping(EntryReference<Entry<?>, Entry<?>> reference, boolean jumpToReference);
+    void removeMapping(ValidationContext vc, EntryReference<Entry<?>, Entry<?>> reference);
 
-    void changeDocs(EntryReference<Entry<?>, Entry<?>> reference, String updatedDocs, boolean jumpToReference);
+    void changeDocs(ValidationContext vc, EntryReference<Entry<?>, Entry<?>> reference, String updatedDocs);
 
-    void markAsDeobfuscated(EntryReference<Entry<?>, Entry<?>> reference, boolean jumpToReference);
+    void markAsDeobfuscated(ValidationContext vc, EntryReference<Entry<?>, Entry<?>> reference);
 
     void disconnectIfConnected(String reason);
 
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
index 1b52cf14..23ffe993 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsC2SPacket.java
@@ -1,15 +1,17 @@
 package cuchaz.enigma.network.packet;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.network.EnigmaServer;
 import cuchaz.enigma.network.Message;
 import cuchaz.enigma.network.ServerPacketHandler;
 import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.utils.Utils;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
+import cuchaz.enigma.utils.validation.PrintValidatable;
+import cuchaz.enigma.utils.validation.ValidationContext;
 
 public class ChangeDocsC2SPacket implements Packet<ServerPacketHandler> {
         private Entry<?> entry;
@@ -37,6 +39,9 @@ public class ChangeDocsC2SPacket implements Packet<ServerPacketHandler> {
 
         @Override
         public void handle(ServerPacketHandler handler) {
+                ValidationContext vc = new ValidationContext();
+                vc.setActiveElement(PrintValidatable.INSTANCE);
+
                 EntryMapping mapping = handler.getServer().getMappings().getDeobfMapping(entry);
 
                 boolean valid = handler.getServer().canModifyEntry(handler.getClient(), entry);
@@ -49,11 +54,12 @@ public class ChangeDocsC2SPacket implements Packet<ServerPacketHandler> {
                 if (mapping == null) {
                         mapping = new EntryMapping(handler.getServer().getMappings().deobfuscate(entry).getName());
                 }
-                handler.getServer().getMappings().mapFromObf(entry, mapping.withDocs(Utils.isBlank(newDocs) ? null : newDocs));
+                handler.getServer().getMappings().mapFromObf(vc, entry, mapping.withDocs(Utils.isBlank(newDocs) ? null : newDocs));
+
+                if (!vc.canProceed()) return;
 
                 int syncId = handler.getServer().lockEntry(handler.getClient(), entry);
                 handler.getServer().sendToAllExcept(handler.getClient(), new ChangeDocsS2CPacket(syncId, entry, newDocs));
                 handler.getServer().sendMessage(Message.editDocs(handler.getServer().getUsername(handler.getClient()), entry));
         }
-
 }
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
index 12a30253..78fa4fa9 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/ChangeDocsS2CPacket.java
@@ -1,13 +1,15 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.network.ClientPacketHandler;
-import cuchaz.enigma.translation.representation.entry.Entry;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import cuchaz.enigma.analysis.EntryReference;
+import cuchaz.enigma.network.ClientPacketHandler;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.validation.PrintValidatable;
+import cuchaz.enigma.utils.validation.ValidationContext;
+
 public class ChangeDocsS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
@@ -38,7 +40,12 @@ public class ChangeDocsS2CPacket implements Packet<ClientPacketHandler> {
 
         @Override
         public void handle(ClientPacketHandler controller) {
-                controller.changeDocs(new EntryReference<>(entry, entry.getName()), newDocs, false);
+                ValidationContext vc = new ValidationContext();
+                vc.setActiveElement(PrintValidatable.INSTANCE);
+
+                controller.changeDocs(vc, new EntryReference<>(entry, entry.getName()), newDocs);
+
+                if (!vc.canProceed()) return;
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
 }
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
index a41c620f..732c7448 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedC2SPacket.java
@@ -1,14 +1,16 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.network.Message;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import cuchaz.enigma.network.Message;
+import cuchaz.enigma.network.ServerPacketHandler;
+import cuchaz.enigma.translation.mapping.EntryMapping;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.validation.PrintValidatable;
+import cuchaz.enigma.utils.validation.ValidationContext;
+
 public class MarkDeobfuscatedC2SPacket implements Packet<ServerPacketHandler> {
         private Entry<?> entry;
 
@@ -31,18 +33,24 @@ public class MarkDeobfuscatedC2SPacket implements Packet<ServerPacketHandler> {
 
         @Override
         public void handle(ServerPacketHandler handler) {
+                ValidationContext vc = new ValidationContext();
+                vc.setActiveElement(PrintValidatable.INSTANCE);
+
                 boolean valid = handler.getServer().canModifyEntry(handler.getClient(), entry);
+
                 if (!valid) {
                         handler.getServer().sendCorrectMapping(handler.getClient(), entry, true);
                         return;
                 }
 
-                handler.getServer().getMappings().mapFromObf(entry, new EntryMapping(handler.getServer().getMappings().deobfuscate(entry).getName()));
+                handler.getServer().getMappings().mapFromObf(vc, entry, new EntryMapping(handler.getServer().getMappings().deobfuscate(entry).getName()));
+
+                if (!vc.canProceed()) return;
+
                 handler.getServer().log(handler.getServer().getUsername(handler.getClient()) + " marked " + entry + " as deobfuscated");
 
                 int syncId = handler.getServer().lockEntry(handler.getClient(), entry);
                 handler.getServer().sendToAllExcept(handler.getClient(), new MarkDeobfuscatedS2CPacket(syncId, entry));
                 handler.getServer().sendMessage(Message.markDeobf(handler.getServer().getUsername(handler.getClient()), entry));
-
         }
 }
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
index 7504430d..969d13c5 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/MarkDeobfuscatedS2CPacket.java
@@ -1,13 +1,15 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.network.ClientPacketHandler;
-import cuchaz.enigma.translation.representation.entry.Entry;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import cuchaz.enigma.analysis.EntryReference;
+import cuchaz.enigma.network.ClientPacketHandler;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.validation.PrintValidatable;
+import cuchaz.enigma.utils.validation.ValidationContext;
+
 public class MarkDeobfuscatedS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
@@ -34,7 +36,12 @@ public class MarkDeobfuscatedS2CPacket implements Packet<ClientPacketHandler> {
 
         @Override
         public void handle(ClientPacketHandler controller) {
-                controller.markAsDeobfuscated(new EntryReference<>(entry, entry.getName()), false);
+                ValidationContext vc = new ValidationContext();
+                vc.setActiveElement(PrintValidatable.INSTANCE);
+
+                controller.markAsDeobfuscated(vc, new EntryReference<>(entry, entry.getName()));
+
+                if (!vc.canProceed()) return;
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
 }
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
index 3f852285..298e674f 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingC2SPacket.java
@@ -1,14 +1,15 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.translation.mapping.IllegalNameException;
-import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.network.Message;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import cuchaz.enigma.network.Message;
+import cuchaz.enigma.network.ServerPacketHandler;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.validation.PrintValidatable;
+import cuchaz.enigma.utils.validation.ValidationContext;
+
 public class RemoveMappingC2SPacket implements Packet<ServerPacketHandler> {
         private Entry<?> entry;
 
@@ -31,14 +32,14 @@ public class RemoveMappingC2SPacket implements Packet<ServerPacketHandler> {
 
         @Override
         public void handle(ServerPacketHandler handler) {
+                ValidationContext vc = new ValidationContext();
+                vc.setActiveElement(PrintValidatable.INSTANCE);
+
                 boolean valid = handler.getServer().canModifyEntry(handler.getClient(), entry);
 
                 if (valid) {
-                        try {
-                                handler.getServer().getMappings().removeByObf(entry);
-                        } catch (IllegalNameException e) {
-                                valid = false;
-                        }
+                        handler.getServer().getMappings().removeByObf(vc, entry);
+                        valid = vc.canProceed();
                 }
 
                 if (!valid) {
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
index 70d803c1..e336c7b2 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RemoveMappingS2CPacket.java
@@ -1,13 +1,15 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.network.ClientPacketHandler;
-import cuchaz.enigma.translation.representation.entry.Entry;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import cuchaz.enigma.analysis.EntryReference;
+import cuchaz.enigma.network.ClientPacketHandler;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.validation.PrintValidatable;
+import cuchaz.enigma.utils.validation.ValidationContext;
+
 public class RemoveMappingS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
@@ -34,7 +36,12 @@ public class RemoveMappingS2CPacket implements Packet<ClientPacketHandler> {
 
         @Override
         public void handle(ClientPacketHandler controller) {
-                controller.removeMapping(new EntryReference<>(entry, entry.getName()), false);
+                ValidationContext vc = new ValidationContext();
+                vc.setActiveElement(PrintValidatable.INSTANCE);
+
+                controller.removeMapping(vc, new EntryReference<>(entry, entry.getName()));
+
+                if (!vc.canProceed()) return;
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
 }
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
index e3e7e379..6a7d2fd1 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
@@ -1,14 +1,15 @@
 package cuchaz.enigma.network.packet;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
 import cuchaz.enigma.network.ServerPacketHandler;
-import cuchaz.enigma.translation.mapping.IllegalNameException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.network.Message;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
+import cuchaz.enigma.utils.validation.PrintValidatable;
+import cuchaz.enigma.utils.validation.ValidationContext;
 
 public class RenameC2SPacket implements Packet<ServerPacketHandler> {
         private Entry<?> entry;
@@ -40,14 +41,14 @@ public class RenameC2SPacket implements Packet<ServerPacketHandler> {
 
         @Override
         public void handle(ServerPacketHandler handler) {
+                ValidationContext vc = new ValidationContext();
+                vc.setActiveElement(PrintValidatable.INSTANCE);
+
                 boolean valid = handler.getServer().canModifyEntry(handler.getClient(), entry);
 
                 if (valid) {
-                        try {
-                                handler.getServer().getMappings().mapFromObf(entry, new EntryMapping(newName));
-                        } catch (IllegalNameException e) {
-                                valid = false;
-                        }
+                        handler.getServer().getMappings().mapFromObf(vc, entry, new EntryMapping(newName));
+                        valid = vc.canProceed();
                 }
 
                 if (!valid) {
diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
index 787e89e6..fdf06540 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameS2CPacket.java
@@ -1,13 +1,15 @@
 package cuchaz.enigma.network.packet;
 
-import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.network.ClientPacketHandler;
-import cuchaz.enigma.translation.representation.entry.Entry;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import cuchaz.enigma.analysis.EntryReference;
+import cuchaz.enigma.network.ClientPacketHandler;
+import cuchaz.enigma.translation.representation.entry.Entry;
+import cuchaz.enigma.utils.validation.PrintValidatable;
+import cuchaz.enigma.utils.validation.ValidationContext;
+
 public class RenameS2CPacket implements Packet<ClientPacketHandler> {
         private int syncId;
         private Entry<?> entry;
@@ -42,7 +44,12 @@ public class RenameS2CPacket implements Packet<ClientPacketHandler> {
 
         @Override
         public void handle(ClientPacketHandler controller) {
-                controller.rename(new EntryReference<>(entry, entry.getName()), newName, refreshClassTree, false);
+                ValidationContext vc = new ValidationContext();
+                vc.setActiveElement(PrintValidatable.INSTANCE);
+
+                controller.rename(vc, new EntryReference<>(entry, entry.getName()), newName, refreshClassTree);
+
+                if (!vc.canProceed()) return;
                 controller.sendPacket(new ConfirmChangeC2SPacket(syncId));
         }
 }