From 6e464ea251cab63c776ece0b2a356f1498ffa294 Mon Sep 17 00:00:00 2001 From: Thog Date: Wed, 8 Mar 2017 08:17:04 +0100 Subject: Follow Fabric guidelines --- .../java/cuchaz/enigma/gui/panels/PanelDeobf.java | 31 +++--- .../java/cuchaz/enigma/gui/panels/PanelEditor.java | 108 ++++++++++----------- .../cuchaz/enigma/gui/panels/PanelIdentifier.java | 40 ++++---- .../java/cuchaz/enigma/gui/panels/PanelObf.java | 57 ++++++----- 4 files changed, 112 insertions(+), 124 deletions(-) (limited to 'src/main/java/cuchaz/enigma/gui/panels') diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java b/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java index 4f55175..68cc8e1 100644 --- a/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java +++ b/src/main/java/cuchaz/enigma/gui/panels/PanelDeobf.java @@ -1,28 +1,25 @@ 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 javax.swing.*; +import java.awt.*; + public class PanelDeobf extends JPanel { - public final ClassSelector deobfClasses; - private final Gui gui; + public final ClassSelector deobfClasses; + private final Gui gui; - public PanelDeobf(Gui gui) { - this.gui = gui; + public PanelDeobf(Gui gui) { + this.gui = gui; - this.deobfClasses = new ClassSelector(gui, ClassSelector.DEOBF_CLASS_COMPARATOR, true); - this.deobfClasses.setSelectionListener(gui::navigateTo); - this.deobfClasses.setRenameSelectionListener(gui::onPanelRename); + this.deobfClasses = new ClassSelector(gui, ClassSelector.DEOBF_CLASS_COMPARATOR, true); + this.deobfClasses.setSelectionListener(gui::navigateTo); + this.deobfClasses.setRenameSelectionListener(gui::onPanelRename); - this.setLayout(new BorderLayout()); - this.add(new JLabel("De-obfuscated Classes"), BorderLayout.NORTH); - this.add(new JScrollPane(this.deobfClasses), BorderLayout.CENTER); - } + this.setLayout(new BorderLayout()); + this.add(new JLabel("De-obfuscated Classes"), BorderLayout.NORTH); + this.add(new JScrollPane(this.deobfClasses), BorderLayout.CENTER); + } } diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java index 914952b..fd30e38 100644 --- a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java +++ b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java @@ -1,73 +1,71 @@ package cuchaz.enigma.gui.panels; +import cuchaz.enigma.gui.BrowserCaret; +import cuchaz.enigma.gui.Gui; + +import javax.swing.*; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import javax.swing.JEditorPane; - -import cuchaz.enigma.gui.BrowserCaret; -import cuchaz.enigma.gui.Gui; - public class PanelEditor extends JEditorPane { - private final Gui gui; + private final Gui gui; - public PanelEditor(Gui gui) { - this.gui = gui; + public PanelEditor(Gui gui) { + this.gui = gui; - this.setEditable(false); - this.setSelectionColor(new Color(31, 46, 90)); - this.setCaret(new BrowserCaret()); - this.addCaretListener(event -> gui.onCaretMove(event.getDot())); - final PanelEditor self = this; - this.addMouseListener(new MouseAdapter() - { - @Override public void mouseReleased(MouseEvent e) - { - if (e.getButton() == MouseEvent.BUTTON3) - self.setCaretPosition(self.viewToModel(e.getPoint())); - } - }); - this.addKeyListener(new KeyAdapter() { - @Override - public void keyPressed(KeyEvent event) { - switch (event.getKeyCode()) { - case KeyEvent.VK_R: - gui.popupMenu.renameMenu.doClick(); - break; + this.setEditable(false); + this.setSelectionColor(new Color(31, 46, 90)); + this.setCaret(new BrowserCaret()); + this.addCaretListener(event -> gui.onCaretMove(event.getDot())); + final PanelEditor self = this; + this.addMouseListener(new MouseAdapter() { + @Override + public void mouseReleased(MouseEvent e) { + if (e.getButton() == MouseEvent.BUTTON3) + self.setCaretPosition(self.viewToModel(e.getPoint())); + } + }); + this.addKeyListener(new KeyAdapter() { + @Override + public void keyPressed(KeyEvent event) { + switch (event.getKeyCode()) { + case KeyEvent.VK_R: + gui.popupMenu.renameMenu.doClick(); + break; - case KeyEvent.VK_I: - gui.popupMenu.showInheritanceMenu.doClick(); - break; + case KeyEvent.VK_I: + gui.popupMenu.showInheritanceMenu.doClick(); + break; - case KeyEvent.VK_M: - gui.popupMenu.showImplementationsMenu.doClick(); - break; + case KeyEvent.VK_M: + gui.popupMenu.showImplementationsMenu.doClick(); + break; - case KeyEvent.VK_N: - gui.popupMenu.openEntryMenu.doClick(); - break; + case KeyEvent.VK_N: + gui.popupMenu.openEntryMenu.doClick(); + break; - case KeyEvent.VK_P: - gui.popupMenu.openPreviousMenu.doClick(); - break; + case KeyEvent.VK_P: + gui.popupMenu.openPreviousMenu.doClick(); + break; - case KeyEvent.VK_C: - gui.popupMenu.showCallsMenu.doClick(); - break; + case KeyEvent.VK_C: + gui.popupMenu.showCallsMenu.doClick(); + break; - case KeyEvent.VK_T: - gui.popupMenu.toggleMappingMenu.doClick(); - break; - case KeyEvent.VK_F5: - gui.getController().refreshCurrentClass(); - break; - default: - break; - } - } - }); - } + case KeyEvent.VK_T: + gui.popupMenu.toggleMappingMenu.doClick(); + break; + case KeyEvent.VK_F5: + gui.getController().refreshCurrentClass(); + break; + default: + break; + } + } + }); + } } diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java b/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java index faa023b..1bf6887 100644 --- a/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java +++ b/src/main/java/cuchaz/enigma/gui/panels/PanelIdentifier.java @@ -1,34 +1,30 @@ package cuchaz.enigma.gui.panels; -import java.awt.Dimension; -import java.awt.GridLayout; - -import javax.swing.BorderFactory; -import javax.swing.JLabel; -import javax.swing.JPanel; - import cuchaz.enigma.gui.Gui; import cuchaz.enigma.utils.Utils; +import javax.swing.*; +import java.awt.*; + public class PanelIdentifier extends JPanel { - private final Gui gui; + private final Gui gui; - public PanelIdentifier(Gui gui) { - this.gui = gui; + public PanelIdentifier(Gui gui) { + this.gui = gui; - this.setLayout(new GridLayout(4, 1, 0, 0)); - this.setPreferredSize(new Dimension(0, 100)); - this.setBorder(BorderFactory.createTitledBorder("Identifier Info")); - } + this.setLayout(new GridLayout(4, 1, 0, 0)); + this.setPreferredSize(new Dimension(0, 100)); + this.setBorder(BorderFactory.createTitledBorder("Identifier Info")); + } - public void clearReference() { - this.removeAll(); - JLabel label = new JLabel("No identifier selected"); - Utils.unboldLabel(label); - label.setHorizontalAlignment(JLabel.CENTER); - this.add(label); + public void clearReference() { + this.removeAll(); + JLabel label = new JLabel("No identifier selected"); + Utils.unboldLabel(label); + label.setHorizontalAlignment(JLabel.CENTER); + this.add(label); - gui.redraw(); - } + gui.redraw(); + } } diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java b/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java index 27bb70b..4bbd32b 100644 --- a/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java +++ b/src/main/java/cuchaz/enigma/gui/panels/PanelObf.java @@ -1,39 +1,36 @@ 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.mapping.ClassEntry; +import javax.swing.*; +import java.awt.*; +import java.util.Comparator; + public class PanelObf extends JPanel { - private final Gui gui; - public final ClassSelector obfClasses; - - public PanelObf(Gui gui) { - this.gui = gui; - - Comparator obfClassComparator = (a, b) -> { - String aname = a.getName(); - String bname = b.getName(); - if (aname.length() != bname.length()) { - return aname.length() - bname.length(); - } - return aname.compareTo(bname); - }; - - this.obfClasses = new ClassSelector(gui, obfClassComparator, false); - this.obfClasses.setSelectionListener(gui::navigateTo); - this.obfClasses.setRenameSelectionListener(gui::onPanelRename); - - this.setLayout(new BorderLayout()); - this.add(new JLabel("Obfuscated Classes"), BorderLayout.NORTH); - this.add(new JScrollPane(this.obfClasses), BorderLayout.CENTER); - } + public final ClassSelector obfClasses; + private final Gui gui; + + public PanelObf(Gui gui) { + this.gui = gui; + + Comparator obfClassComparator = (a, b) -> { + String aname = a.getName(); + String bname = b.getName(); + if (aname.length() != bname.length()) { + return aname.length() - bname.length(); + } + return aname.compareTo(bname); + }; + + this.obfClasses = new ClassSelector(gui, obfClassComparator, false); + this.obfClasses.setSelectionListener(gui::navigateTo); + this.obfClasses.setRenameSelectionListener(gui::onPanelRename); + + this.setLayout(new BorderLayout()); + this.add(new JLabel("Obfuscated Classes"), BorderLayout.NORTH); + this.add(new JScrollPane(this.obfClasses), BorderLayout.CENTER); + } } -- cgit v1.2.3