diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cuchaz/enigma/gui/Gui.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java index 1d2d3ab..3b67a32 100644 --- a/src/cuchaz/enigma/gui/Gui.java +++ b/src/cuchaz/enigma/gui/Gui.java | |||
| @@ -158,7 +158,7 @@ public class Gui | |||
| 158 | private JMenuItem m_showCallsMenu; | 158 | private JMenuItem m_showCallsMenu; |
| 159 | 159 | ||
| 160 | // state | 160 | // state |
| 161 | private EntryPair<Entry> m_selectedEntryPair; | 161 | private EntryPair<? extends Entry> m_selectedEntryPair; |
| 162 | private JFileChooser m_jarFileChooser; | 162 | private JFileChooser m_jarFileChooser; |
| 163 | private JFileChooser m_mappingsFileChooser; | 163 | private JFileChooser m_mappingsFileChooser; |
| 164 | 164 | ||
| @@ -749,7 +749,7 @@ public class Gui | |||
| 749 | } | 749 | } |
| 750 | 750 | ||
| 751 | @SuppressWarnings( "unchecked" ) | 751 | @SuppressWarnings( "unchecked" ) |
| 752 | private void showEntryPair( EntryPair<Entry> pair ) | 752 | private void showEntryPair( EntryPair<? extends Entry> pair ) |
| 753 | { | 753 | { |
| 754 | if( pair == null ) | 754 | if( pair == null ) |
| 755 | { | 755 | { |
| @@ -762,23 +762,23 @@ public class Gui | |||
| 762 | m_infoPanel.removeAll(); | 762 | m_infoPanel.removeAll(); |
| 763 | if( pair.deobf instanceof ClassEntry ) | 763 | if( pair.deobf instanceof ClassEntry ) |
| 764 | { | 764 | { |
| 765 | showClassEntryPair( (EntryPair<? extends ClassEntry>)pair ); | 765 | showClassEntryPair( (EntryPair<ClassEntry>)pair ); |
| 766 | } | 766 | } |
| 767 | else if( pair.deobf instanceof FieldEntry ) | 767 | else if( pair.deobf instanceof FieldEntry ) |
| 768 | { | 768 | { |
| 769 | showFieldEntryPair( (EntryPair<? extends FieldEntry>)pair ); | 769 | showFieldEntryPair( (EntryPair<FieldEntry>)pair ); |
| 770 | } | 770 | } |
| 771 | else if( pair.deobf instanceof MethodEntry ) | 771 | else if( pair.deobf instanceof MethodEntry ) |
| 772 | { | 772 | { |
| 773 | showMethodEntryPair( (EntryPair<? extends MethodEntry>)pair ); | 773 | showMethodEntryPair( (EntryPair<MethodEntry>)pair ); |
| 774 | } | 774 | } |
| 775 | else if( pair.deobf instanceof ConstructorEntry ) | 775 | else if( pair.deobf instanceof ConstructorEntry ) |
| 776 | { | 776 | { |
| 777 | showConstructorEntryPair( (EntryPair<? extends ConstructorEntry>)pair ); | 777 | showConstructorEntryPair( (EntryPair<ConstructorEntry>)pair ); |
| 778 | } | 778 | } |
| 779 | else if( pair.deobf instanceof ArgumentEntry ) | 779 | else if( pair.deobf instanceof ArgumentEntry ) |
| 780 | { | 780 | { |
| 781 | showArgumentEntryPair( (EntryPair<? extends ArgumentEntry>)pair ); | 781 | showArgumentEntryPair( (EntryPair<ArgumentEntry>)pair ); |
| 782 | } | 782 | } |
| 783 | else | 783 | else |
| 784 | { | 784 | { |
| @@ -788,31 +788,31 @@ public class Gui | |||
| 788 | redraw(); | 788 | redraw(); |
| 789 | } | 789 | } |
| 790 | 790 | ||
| 791 | private void showClassEntryPair( EntryPair<? extends ClassEntry> pair ) | 791 | private void showClassEntryPair( EntryPair<ClassEntry> pair ) |
| 792 | { | 792 | { |
| 793 | addNameValue( m_infoPanel, "Class", pair.deobf.getName() ); | 793 | addNameValue( m_infoPanel, "Class", pair.deobf.getName() ); |
| 794 | } | 794 | } |
| 795 | 795 | ||
| 796 | private void showFieldEntryPair( EntryPair<? extends FieldEntry> pair ) | 796 | private void showFieldEntryPair( EntryPair<FieldEntry> pair ) |
| 797 | { | 797 | { |
| 798 | addNameValue( m_infoPanel, "Field", pair.deobf.getName() ); | 798 | addNameValue( m_infoPanel, "Field", pair.deobf.getName() ); |
| 799 | addNameValue( m_infoPanel, "Class", pair.deobf.getClassEntry().getName() ); | 799 | addNameValue( m_infoPanel, "Class", pair.deobf.getClassEntry().getName() ); |
| 800 | } | 800 | } |
| 801 | 801 | ||
| 802 | private void showMethodEntryPair( EntryPair<? extends MethodEntry> pair ) | 802 | private void showMethodEntryPair( EntryPair<MethodEntry> pair ) |
| 803 | { | 803 | { |
| 804 | addNameValue( m_infoPanel, "Method", pair.deobf.getName() ); | 804 | addNameValue( m_infoPanel, "Method", pair.deobf.getName() ); |
| 805 | addNameValue( m_infoPanel, "Class", pair.deobf.getClassEntry().getName() ); | 805 | addNameValue( m_infoPanel, "Class", pair.deobf.getClassEntry().getName() ); |
| 806 | addNameValue( m_infoPanel, "Signature", pair.deobf.getSignature() ); | 806 | addNameValue( m_infoPanel, "Signature", pair.deobf.getSignature() ); |
| 807 | } | 807 | } |
| 808 | 808 | ||
| 809 | private void showConstructorEntryPair( EntryPair<? extends ConstructorEntry> pair ) | 809 | private void showConstructorEntryPair( EntryPair<ConstructorEntry> pair ) |
| 810 | { | 810 | { |
| 811 | addNameValue( m_infoPanel, "Constructor", pair.deobf.getClassEntry().getName() ); | 811 | addNameValue( m_infoPanel, "Constructor", pair.deobf.getClassEntry().getName() ); |
| 812 | addNameValue( m_infoPanel, "Signature", pair.deobf.getSignature() ); | 812 | addNameValue( m_infoPanel, "Signature", pair.deobf.getSignature() ); |
| 813 | } | 813 | } |
| 814 | 814 | ||
| 815 | private void showArgumentEntryPair( EntryPair<? extends ArgumentEntry> pair ) | 815 | private void showArgumentEntryPair( EntryPair<ArgumentEntry> pair ) |
| 816 | { | 816 | { |
| 817 | addNameValue( m_infoPanel, "Argument", pair.deobf.getName() ); | 817 | addNameValue( m_infoPanel, "Argument", pair.deobf.getName() ); |
| 818 | addNameValue( m_infoPanel, "Class", pair.deobf.getClassEntry().getName() ); | 818 | addNameValue( m_infoPanel, "Class", pair.deobf.getClassEntry().getName() ); |