Merge pull request #257 from 2xsaiko/classnames

No more prefix naming

11 files changed, 120 insertions, 133 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
index 2ac15284..0b2de460 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -26,6 +26,7 @@ import javax.swing.tree.*;
 
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Lists;
+
 import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProfile;
 import cuchaz.enigma.analysis.*;
@@ -40,8 +41,6 @@ import cuchaz.enigma.gui.elements.EditorTabPopupMenu;
 import cuchaz.enigma.gui.elements.MenuBar;
 import cuchaz.enigma.gui.elements.ValidatableUi;
 import cuchaz.enigma.gui.events.EditorActionListener;
-import cuchaz.enigma.gui.filechooser.FileChooserAny;
-import cuchaz.enigma.gui.filechooser.FileChooserFolder;
 import cuchaz.enigma.gui.panels.*;
 import cuchaz.enigma.gui.util.History;
 import cuchaz.enigma.gui.util.ScaleUtil;
@@ -62,8 +61,8 @@ import cuchaz.enigma.utils.validation.ValidationContext;
 
 public class Gui {
 
-        private final PanelObf obfPanel;
-        private final PanelDeobf deobfPanel;
+        private final ObfPanel obfPanel;
+        private final DeobfPanel deobfPanel;
 
         private final MenuBar menuBar;
 
@@ -82,7 +81,7 @@ public class Gui {
         private JFrame frame;
         private JPanel classesPanel;
         private JSplitPane splitClasses;
-        private PanelIdentifier infoPanel;
+        private IdentifierPanel infoPanel;
         private JTree inheritanceTree;
         private JTree implementationsTree;
         private JTree callsTree;
@@ -105,7 +104,7 @@ public class Gui {
 
         private final EditorTabPopupMenu editorTabPopupMenu;
         private final JTabbedPane openFiles;
-        private final HashBiMap<ClassEntry, PanelEditor> editors = HashBiMap.create();
+        private final HashBiMap<ClassEntry, EditorPanel> editors = HashBiMap.create();
 
         public Gui(EnigmaProfile profile) {
                 Config.getInstance().lookAndFeel.setGlobalLAF();
@@ -138,12 +137,19 @@ public class Gui {
                 this.jarFileChooser = new FileDialog(getFrame(), I18n.translate("menu.file.jar.open"), FileDialog.LOAD);
 
                 this.tinyMappingsFileChooser = new FileDialog(getFrame(), "Open tiny Mappings", FileDialog.LOAD);
-                this.enigmaMappingsFileChooser = new FileChooserAny();
-                this.exportSourceFileChooser = new FileChooserFolder();
+
+                this.enigmaMappingsFileChooser = new JFileChooser();
+                this.enigmaMappingsFileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
+                this.enigmaMappingsFileChooser.setAcceptAllFileFilterUsed(false);
+
+                this.exportSourceFileChooser = new JFileChooser();
+                this.exportSourceFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                this.exportSourceFileChooser.setAcceptAllFileFilterUsed(false);
+
                 this.exportJarFileChooser = new FileDialog(getFrame(), I18n.translate("menu.file.export.jar"), FileDialog.SAVE);
 
-                this.obfPanel = new PanelObf(this);
-                this.deobfPanel = new PanelDeobf(this);
+                this.obfPanel = new ObfPanel(this);
+                this.deobfPanel = new DeobfPanel(this);
 
                 // set up classes panel (don't add the splitter yet)
                 splitClasses = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true, this.obfPanel, this.deobfPanel);
@@ -153,7 +159,7 @@ public class Gui {
                 this.classesPanel.setPreferredSize(ScaleUtil.getDimension(250, 0));
 
                 // init info panel
-                infoPanel = new PanelIdentifier(this);
+                infoPanel = new IdentifierPanel(this);
 
                 // init inheritance panel
                 inheritanceTree = new JTree();
@@ -276,7 +282,7 @@ public class Gui {
                                 if (SwingUtilities.isRightMouseButton(e)) {
                                         int i = openFiles.getUI().tabForCoordinate(openFiles, e.getX(), e.getY());
                                         if (i != -1) {
-                                                editorTabPopupMenu.show(openFiles, e.getX(), e.getY(), PanelEditor.byUi(openFiles.getComponentAt(i)));
+                                                editorTabPopupMenu.show(openFiles, e.getX(), e.getY(), EditorPanel.byUi(openFiles.getComponentAt(i)));
                                         }
                                 }
                         }
@@ -403,11 +409,11 @@ public class Gui {
                 redraw();
         }
 
-        public PanelEditor openClass(ClassEntry entry) {
-                PanelEditor panelEditor = editors.computeIfAbsent(entry, e -> {
+        public EditorPanel openClass(ClassEntry entry) {
+                EditorPanel editorPanel = editors.computeIfAbsent(entry, e -> {
                         ClassHandle ch = controller.getClassHandleProvider().openClass(entry);
                         if (ch == null) return null;
-                        PanelEditor ed = new PanelEditor(this);
+                        EditorPanel ed = new EditorPanel(this);
                         ed.setup();
                         ed.setClassHandle(ch);
                         openFiles.addTab(ed.getFileName(), ed.getUi());
@@ -418,18 +424,18 @@ public class Gui {
 
                         ed.addListener(new EditorActionListener() {
                                 @Override
-                                public void onCursorReferenceChanged(PanelEditor editor, EntryReference<Entry<?>, Entry<?>> ref) {
+                                public void onCursorReferenceChanged(EditorPanel editor, EntryReference<Entry<?>, Entry<?>> ref) {
                                         updateSelectedReference(editor, ref);
                                 }
 
                                 @Override
-                                public void onClassHandleChanged(PanelEditor editor, ClassEntry old, ClassHandle ch) {
+                                public void onClassHandleChanged(EditorPanel editor, ClassEntry old, ClassHandle ch) {
                                         editors.remove(old);
                                         editors.put(ch.getRef(), editor);
                                 }
 
                                 @Override
-                                public void onTitleChanged(PanelEditor editor, String title) {
+                                public void onTitleChanged(EditorPanel editor, String title) {
                                         titlePane.setText(editor.getFileName());
                                 }
                         });
@@ -445,10 +451,10 @@ public class Gui {
 
                         return ed;
                 });
-                if (panelEditor != null) {
+                if (editorPanel != null) {
                         openFiles.setSelectedComponent(editors.get(entry).getUi());
                 }
-                return panelEditor;
+                return editorPanel;
         }
 
         public void setObfClasses(Collection<ClassEntry> obfClasses) {
@@ -464,44 +470,44 @@ public class Gui {
                 updateUiState();
         }
 
-        public void closeEditor(PanelEditor ed) {
+        public void closeEditor(EditorPanel ed) {
                 openFiles.remove(ed.getUi());
                 editors.inverse().remove(ed);
                 ed.destroy();
         }
 
         public void closeAllEditorTabs() {
-                for (Iterator<PanelEditor> iter = editors.values().iterator(); iter.hasNext(); ) {
-                        PanelEditor e = iter.next();
+                for (Iterator<EditorPanel> iter = editors.values().iterator(); iter.hasNext(); ) {
+                        EditorPanel e = iter.next();
                         openFiles.remove(e.getUi());
                         e.destroy();
                         iter.remove();
                 }
         }
 
-        public void closeTabsLeftOf(PanelEditor ed) {
+        public void closeTabsLeftOf(EditorPanel ed) {
                 int index = openFiles.indexOfComponent(ed.getUi());
                 for (int i = index - 1; i >= 0; i--) {
-                        closeEditor(PanelEditor.byUi(openFiles.getComponentAt(i)));
+                        closeEditor(EditorPanel.byUi(openFiles.getComponentAt(i)));
                 }
         }
 
-        public void closeTabsRightOf(PanelEditor ed) {
+        public void closeTabsRightOf(EditorPanel ed) {
                 int index = openFiles.indexOfComponent(ed.getUi());
                 for (int i = openFiles.getTabCount() - 1; i > index; i--) {
-                        closeEditor(PanelEditor.byUi(openFiles.getComponentAt(i)));
+                        closeEditor(EditorPanel.byUi(openFiles.getComponentAt(i)));
                 }
         }
 
-        public void closeTabsExcept(PanelEditor ed) {
+        public void closeTabsExcept(EditorPanel ed) {
                 int index = openFiles.indexOfComponent(ed.getUi());
                 for (int i = openFiles.getTabCount() - 1; i >= 0; i--) {
                         if (i == index) continue;
-                        closeEditor(PanelEditor.byUi(openFiles.getComponentAt(i)));
+                        closeEditor(EditorPanel.byUi(openFiles.getComponentAt(i)));
                 }
         }
 
-        public void showTokens(PanelEditor editor, Collection<Token> tokens) {
+        public void showTokens(EditorPanel editor, Collection<Token> tokens) {
                 Vector<Token> sortedTokens = new Vector<>(tokens);
                 Collections.sort(sortedTokens);
                 if (sortedTokens.size() > 1) {
@@ -517,7 +523,7 @@ public class Gui {
                 editor.navigateToToken(sortedTokens.get(0));
         }
 
-        private void updateSelectedReference(PanelEditor editor, EntryReference<Entry<?>, Entry<?>> ref) {
+        private void updateSelectedReference(EditorPanel editor, EntryReference<Entry<?>, Entry<?>> ref) {
                 if (editor != getActiveEditor()) return;
 
                 showCursorReference(ref);
@@ -528,35 +534,35 @@ public class Gui {
         }
 
         @Nullable
-        public PanelEditor getActiveEditor() {
-                return PanelEditor.byUi(openFiles.getSelectedComponent());
+        public EditorPanel getActiveEditor() {
+                return EditorPanel.byUi(openFiles.getSelectedComponent());
         }
 
         @Nullable
         public EntryReference<Entry<?>, Entry<?>> getCursorReference() {
-                PanelEditor activeEditor = getActiveEditor();
+                EditorPanel activeEditor = getActiveEditor();
                 return activeEditor == null ? null : activeEditor.getCursorReference();
         }
 
-        public void startDocChange(PanelEditor editor) {
+        public void startDocChange(EditorPanel editor) {
                 EntryReference<Entry<?>, Entry<?>> cursorReference = editor.getCursorReference();
                 if (cursorReference == null) return;
                 JavadocDialog.show(frame, getController(), cursorReference);
         }
 
-        public void startRename(PanelEditor editor, String text) {
+        public void startRename(EditorPanel editor, String text) {
                 if (editor != getActiveEditor()) return;
 
                 infoPanel.startRenaming(text);
         }
 
-        public void startRename(PanelEditor editor) {
+        public void startRename(EditorPanel editor) {
                 if (editor != getActiveEditor()) return;
 
                 infoPanel.startRenaming();
         }
 
-        public void showInheritance(PanelEditor editor) {
+        public void showInheritance(EditorPanel editor) {
                 EntryReference<Entry<?>, Entry<?>> cursorReference = editor.getCursorReference();
                 if (cursorReference == null) return;
 
@@ -587,7 +593,7 @@ public class Gui {
                 redraw();
         }
 
-        public void showImplementations(PanelEditor editor) {
+        public void showImplementations(EditorPanel editor) {
                 EntryReference<Entry<?>, Entry<?>> cursorReference = editor.getCursorReference();
                 if (cursorReference == null) return;
 
@@ -615,7 +621,7 @@ public class Gui {
                 redraw();
         }
 
-        public void showCalls(PanelEditor editor, boolean recurse) {
+        public void showCalls(EditorPanel editor, boolean recurse) {
                 EntryReference<Entry<?>, Entry<?>> cursorReference = editor.getCursorReference();
                 if (cursorReference == null) return;
 
@@ -635,7 +641,7 @@ public class Gui {
                 redraw();
         }
 
-        public void toggleMapping(PanelEditor editor) {
+        public void toggleMapping(EditorPanel editor) {
                 EntryReference<Entry<?>, Entry<?>> cursorReference = editor.getCursorReference();
                 if (cursorReference == null) return;
 
@@ -781,11 +787,11 @@ public class Gui {
                 this.obfPanel.obfClasses.restoreExpansionState(this.obfPanel.obfClasses, stateObf);
         }
 
-        public PanelObf getObfPanel() {
+        public ObfPanel getObfPanel() {
                 return obfPanel;
         }
 
-        public PanelDeobf getDeobfPanel() {
+        public DeobfPanel getDeobfPanel() {
                 return deobfPanel;
         }
 
@@ -858,7 +864,7 @@ public class Gui {
                 return this.connectionState;
         }
 
-        public PanelIdentifier getInfoPanel() {
+        public IdentifierPanel getInfoPanel() {
                 return infoPanel;
         }
 
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/EditorTabPopupMenu.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/EditorTabPopupMenu.java
index e92e6773..39ed9789 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/EditorTabPopupMenu.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/EditorTabPopupMenu.java
@@ -8,7 +8,7 @@ import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
 
 import cuchaz.enigma.gui.Gui;
-import cuchaz.enigma.gui.panels.PanelEditor;
+import cuchaz.enigma.gui.panels.EditorPanel;
 import cuchaz.enigma.utils.I18n;
 
 public class EditorTabPopupMenu {
@@ -21,7 +21,7 @@ public class EditorTabPopupMenu {
         private final JMenuItem closeRight;
 
         private final Gui gui;
-        private PanelEditor editor;
+        private EditorPanel editor;
 
         public EditorTabPopupMenu(Gui gui) {
                 this.gui = gui;
@@ -50,8 +50,8 @@ public class EditorTabPopupMenu {
                 this.ui.add(this.closeRight);
         }
 
-        public void show(Component invoker, int x, int y, PanelEditor panelEditor) {
-                this.editor = panelEditor;
+        public void show(Component invoker, int x, int y, EditorPanel editorPanel) {
+                this.editor = editorPanel;
                 ui.show(invoker, x, y);
         }
 
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
index 2310cf32..ad6dac6b 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/PopupMenuBar.java
@@ -1,13 +1,17 @@
 package cuchaz.enigma.gui.elements;
 
-import cuchaz.enigma.gui.Gui;
-import cuchaz.enigma.gui.panels.PanelEditor;
-import cuchaz.enigma.utils.I18n;
-
-import javax.swing.*;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
+import javax.swing.KeyStroke;
+
+import cuchaz.enigma.gui.Gui;
+import cuchaz.enigma.gui.panels.EditorPanel;
+import cuchaz.enigma.utils.I18n;
+
 public class PopupMenuBar extends JPopupMenu {
 
         public final JMenuItem renameMenu;
@@ -21,7 +25,7 @@ public class PopupMenuBar extends JPopupMenu {
         public final JMenuItem openNextMenu;
         public final JMenuItem toggleMappingMenu;
 
-        public PopupMenuBar(PanelEditor editor, Gui gui) {
+        public PopupMenuBar(EditorPanel editor, Gui gui) {
                 {
                         JMenuItem menu = new JMenuItem(I18n.translate("popup_menu.rename"));
                         menu.addActionListener(event -> gui.startRename(editor));
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/events/EditorActionListener.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/events/EditorActionListener.java
index 88807314..48c9ec4b 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/events/EditorActionListener.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/events/EditorActionListener.java
@@ -1,20 +1,20 @@
 package cuchaz.enigma.gui.events;
 
 import cuchaz.enigma.analysis.EntryReference;
-import cuchaz.enigma.gui.panels.PanelEditor;
 import cuchaz.enigma.classhandle.ClassHandle;
+import cuchaz.enigma.gui.panels.EditorPanel;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.translation.representation.entry.Entry;
 
 public interface EditorActionListener {
 
-        default void onCursorReferenceChanged(PanelEditor editor, EntryReference<Entry<?>, Entry<?>> ref) {
+        default void onCursorReferenceChanged(EditorPanel editor, EntryReference<Entry<?>, Entry<?>> ref) {
         }
 
-        default void onClassHandleChanged(PanelEditor editor, ClassEntry old, ClassHandle ch) {
+        default void onClassHandleChanged(EditorPanel editor, ClassEntry old, ClassHandle ch) {
         }
 
-        default void onTitleChanged(PanelEditor editor, String title) {
+        default void onTitleChanged(EditorPanel editor, String title) {
         }
 
 }
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java
deleted file mode 100644
index f5f66287..00000000
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserAny.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package cuchaz.enigma.gui.filechooser;
-
-import javax.swing.*;
-
-public class FileChooserAny extends JFileChooser {
-        public FileChooserAny() {
-                this.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
-                this.setAcceptAllFileFilterUsed(false);
-        }
-}
\ No newline at end of file
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFile.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFile.java
deleted file mode 100644
index cea11a68..00000000
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFile.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package cuchaz.enigma.gui.filechooser;
-
-import javax.swing.*;
-
-public class FileChooserFile extends JFileChooser {
-        public FileChooserFile() {
-        }
-}
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFolder.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFolder.java
deleted file mode 100644
index c16e0afc..00000000
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/filechooser/FileChooserFolder.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cuchaz.enigma.gui.filechooser;
-
-import javax.swing.*;
-
-public class FileChooserFolder extends JFileChooser {
-
-        public FileChooserFolder() {
-                this.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-                this.setAcceptAllFileFilterUsed(false);
-        }
-}
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/DeobfPanel.java
index c24226b3..bb8acc8e 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/DeobfPanel.java
@@ -1,18 +1,21 @@
 package cuchaz.enigma.gui.panels;
 
+import java.awt.BorderLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
 import cuchaz.enigma.gui.ClassSelector;
 import cuchaz.enigma.gui.Gui;
 import cuchaz.enigma.utils.I18n;
 
-import javax.swing.*;
-import java.awt.*;
-
-public class PanelDeobf extends JPanel {
+public class DeobfPanel extends JPanel {
 
         public final ClassSelector deobfClasses;
         private final Gui gui;
 
-        public PanelDeobf(Gui gui) {
+        public DeobfPanel(Gui gui) {
                 this.gui = gui;
 
                 this.deobfClasses = new ClassSelector(gui, ClassSelector.DEOBF_CLASS_COMPARATOR, true);
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java
index bf1d5fb2..f689a211 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java
@@ -45,7 +45,7 @@ import cuchaz.enigma.translation.representation.entry.MethodEntry;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.utils.Result;
 
-public class PanelEditor {
+public class EditorPanel {
 
         private final JPanel ui = new JPanel();
         private final JEditorPane editor = new JEditorPane();
@@ -83,7 +83,7 @@ public class PanelEditor {
         private DecompiledClassSource source;
         private boolean settingSource;
 
-        public PanelEditor(Gui gui) {
+        public EditorPanel(Gui gui) {
                 this.gui = gui;
                 this.controller = gui.getController();
 
@@ -112,14 +112,14 @@ public class PanelEditor {
                 this.editor.addMouseListener(new MouseAdapter() {
                         @Override
                         public void mousePressed(MouseEvent mouseEvent) {
-                                PanelEditor.this.mouseIsPressed = true;
+                                EditorPanel.this.mouseIsPressed = true;
                         }
 
                         @Override
                         public void mouseReleased(MouseEvent e) {
                                 switch (e.getButton()) {
                                         case MouseEvent.BUTTON3: // Right click
-                                                PanelEditor.this.editor.setCaretPosition(PanelEditor.this.editor.viewToModel(e.getPoint()));
+                                                EditorPanel.this.editor.setCaretPosition(EditorPanel.this.editor.viewToModel(e.getPoint()));
                                                 break;
 
                                         case 4: // Back navigation
@@ -130,58 +130,58 @@ public class PanelEditor {
                                                 gui.getController().openNextReference();
                                                 break;
                                 }
-                                PanelEditor.this.mouseIsPressed = false;
+                                EditorPanel.this.mouseIsPressed = false;
                         }
                 });
                 this.editor.addKeyListener(new KeyAdapter() {
                         @Override
                         public void keyPressed(KeyEvent event) {
                                 if (event.isControlDown()) {
-                                        PanelEditor.this.shouldNavigateOnClick = false;
+                                        EditorPanel.this.shouldNavigateOnClick = false;
                                         switch (event.getKeyCode()) {
                                                 case KeyEvent.VK_I:
-                                                        PanelEditor.this.popupMenu.showInheritanceMenu.doClick();
+                                                        EditorPanel.this.popupMenu.showInheritanceMenu.doClick();
                                                         break;
 
                                                 case KeyEvent.VK_M:
-                                                        PanelEditor.this.popupMenu.showImplementationsMenu.doClick();
+                                                        EditorPanel.this.popupMenu.showImplementationsMenu.doClick();
                                                         break;
 
                                                 case KeyEvent.VK_N:
-                                                        PanelEditor.this.popupMenu.openEntryMenu.doClick();
+                                                        EditorPanel.this.popupMenu.openEntryMenu.doClick();
                                                         break;
 
                                                 case KeyEvent.VK_P:
-                                                        PanelEditor.this.popupMenu.openPreviousMenu.doClick();
+                                                        EditorPanel.this.popupMenu.openPreviousMenu.doClick();
                                                         break;
 
                                                 case KeyEvent.VK_E:
-                                                        PanelEditor.this.popupMenu.openNextMenu.doClick();
+                                                        EditorPanel.this.popupMenu.openNextMenu.doClick();
                                                         break;
 
                                                 case KeyEvent.VK_C:
                                                         if (event.isShiftDown()) {
-                                                                PanelEditor.this.popupMenu.showCallsSpecificMenu.doClick();
+                                                                EditorPanel.this.popupMenu.showCallsSpecificMenu.doClick();
                                                         } else {
-                                                                PanelEditor.this.popupMenu.showCallsMenu.doClick();
+                                                                EditorPanel.this.popupMenu.showCallsMenu.doClick();
                                                         }
                                                         break;
 
                                                 case KeyEvent.VK_O:
-                                                        PanelEditor.this.popupMenu.toggleMappingMenu.doClick();
+                                                        EditorPanel.this.popupMenu.toggleMappingMenu.doClick();
                                                         break;
 
                                                 case KeyEvent.VK_R:
-                                                        PanelEditor.this.popupMenu.renameMenu.doClick();
+                                                        EditorPanel.this.popupMenu.renameMenu.doClick();
                                                         break;
 
                                                 case KeyEvent.VK_D:
-                                                        PanelEditor.this.popupMenu.editJavadocMenu.doClick();
+                                                        EditorPanel.this.popupMenu.editJavadocMenu.doClick();
                                                         break;
 
                                                 case KeyEvent.VK_F5:
-                                                        if (PanelEditor.this.classHandle != null) {
-                                                                PanelEditor.this.classHandle.invalidateMapped();
+                                                        if (EditorPanel.this.classHandle != null) {
+                                                                EditorPanel.this.classHandle.invalidateMapped();
                                                         }
                                                         break;
 
@@ -200,7 +200,7 @@ public class PanelEditor {
                                                         break;
 
                                                 default:
-                                                        PanelEditor.this.shouldNavigateOnClick = true; // CTRL
+                                                        EditorPanel.this.shouldNavigateOnClick = true; // CTRL
                                                         break;
                                         }
                                 }
@@ -208,11 +208,11 @@ public class PanelEditor {
 
                         @Override
                         public void keyTyped(KeyEvent event) {
-                                if (!PanelEditor.this.popupMenu.renameMenu.isEnabled()) return;
+                                if (!EditorPanel.this.popupMenu.renameMenu.isEnabled()) return;
 
                                 if (!event.isControlDown() && !event.isAltDown() && Character.isJavaIdentifierPart(event.getKeyChar())) {
                                         EnigmaProject project = gui.getController().project;
-                                        EntryReference<Entry<?>, Entry<?>> reference = project.getMapper().deobfuscate(PanelEditor.this.cursorReference);
+                                        EntryReference<Entry<?>, Entry<?>> reference = project.getMapper().deobfuscate(EditorPanel.this.cursorReference);
                                         Entry<?> entry = reference.getNameableEntry();
 
                                         String name = String.valueOf(event.getKeyChar());
@@ -223,13 +223,13 @@ public class PanelEditor {
                                                 }
                                         }
 
-                                        gui.startRename(PanelEditor.this, name);
+                                        gui.startRename(EditorPanel.this, name);
                                 }
                         }
 
                         @Override
                         public void keyReleased(KeyEvent event) {
-                                PanelEditor.this.shouldNavigateOnClick = event.isControlDown();
+                                EditorPanel.this.shouldNavigateOnClick = event.isControlDown();
                         }
                 });
 
@@ -248,15 +248,15 @@ public class PanelEditor {
                         this.boxHighlightPainters = boxHighlightPainters;
                 };
 
-                this.ui.putClientProperty(PanelEditor.class, this);
+                this.ui.putClientProperty(EditorPanel.class, this);
         }
 
         @Nullable
-        public static PanelEditor byUi(Component ui) {
+        public static EditorPanel byUi(Component ui) {
                 if (ui instanceof JComponent) {
-                        Object prop = ((JComponent) ui).getClientProperty(PanelEditor.class);
-                        if (prop instanceof PanelEditor) {
-                                return (PanelEditor) prop;
+                        Object prop = ((JComponent) ui).getClientProperty(EditorPanel.class);
+                        if (prop instanceof EditorPanel) {
+                                return (EditorPanel) prop;
                         }
                 }
                 return null;
@@ -279,7 +279,7 @@ public class PanelEditor {
                         @Override
                         public void onDeobfRefChanged(ClassHandle h, ClassEntry deobfRef) {
                                 SwingUtilities.invokeLater(() -> {
-                                        PanelEditor.this.listeners.forEach(l -> l.onTitleChanged(PanelEditor.this, getFileName()));
+                                        EditorPanel.this.listeners.forEach(l -> l.onTitleChanged(EditorPanel.this, getFileName()));
                                 });
                         }
 
@@ -292,14 +292,14 @@ public class PanelEditor {
                         public void onInvalidate(ClassHandle h, InvalidationType t) {
                                 SwingUtilities.invokeLater(() -> {
                                         if (t == InvalidationType.FULL) {
-                                                PanelEditor.this.setDisplayMode(DisplayMode.IN_PROGRESS);
+                                                EditorPanel.this.setDisplayMode(DisplayMode.IN_PROGRESS);
                                         }
                                 });
                         }
 
                         @Override
                         public void onDeleted(ClassHandle h) {
-                                SwingUtilities.invokeLater(() -> PanelEditor.this.gui.closeEditor(PanelEditor.this));
+                                SwingUtilities.invokeLater(() -> EditorPanel.this.gui.closeEditor(EditorPanel.this));
                         }
                 });
 
@@ -610,12 +610,12 @@ public class PanelEditor {
                         public void actionPerformed(ActionEvent event) {
                                 if (this.counter % 2 == 0) {
                                         try {
-                                                this.highlight = PanelEditor.this.editor.getHighlighter().addHighlight(token.start, token.end, highlightPainter);
+                                                this.highlight = EditorPanel.this.editor.getHighlighter().addHighlight(token.start, token.end, highlightPainter);
                                         } catch (BadLocationException ex) {
                                                 // don't care
                                         }
                                 } else if (this.highlight != null) {
-                                        PanelEditor.this.editor.getHighlighter().removeHighlight(this.highlight);
+                                        EditorPanel.this.editor.getHighlighter().removeHighlight(this.highlight);
                                 }
 
                                 if (this.counter++ > 6) {
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java
index bfba8452..10f8eb5a 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/IdentifierPanel.java
@@ -23,7 +23,7 @@ import cuchaz.enigma.translation.representation.entry.*;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.utils.validation.ValidationContext;
 
-public class PanelIdentifier {
+public class IdentifierPanel {
 
         private final Gui gui;
 
@@ -36,7 +36,7 @@ public class PanelIdentifier {
 
         private final ValidationContext vc = new ValidationContext();
 
-        public PanelIdentifier(Gui gui) {
+        public IdentifierPanel(Gui gui) {
                 this.gui = gui;
 
                 this.ui = new JPanel();
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/ObfPanel.java
index dd7f9f97..0ca05837 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/ObfPanel.java
@@ -1,20 +1,23 @@
 package cuchaz.enigma.gui.panels;
 
+import java.awt.BorderLayout;
+import java.util.Comparator;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+
 import cuchaz.enigma.gui.ClassSelector;
 import cuchaz.enigma.gui.Gui;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.utils.I18n;
 
-import javax.swing.*;
-import java.awt.*;
-import java.util.Comparator;
-
-public class PanelObf extends JPanel {
+public class ObfPanel extends JPanel {
 
         public final ClassSelector obfClasses;
         private final Gui gui;
 
-        public PanelObf(Gui gui) {
+        public ObfPanel(Gui gui) {
                 this.gui = gui;
 
                 Comparator<ClassEntry> obfClassComparator = (a, b) -> {