summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/gui/Gui.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/cuchaz/enigma/gui/Gui.java')
-rw-r--r--src/cuchaz/enigma/gui/Gui.java46
1 files changed, 28 insertions, 18 deletions
diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java
index 9ed6dd8..43a0cda 100644
--- a/src/cuchaz/enigma/gui/Gui.java
+++ b/src/cuchaz/enigma/gui/Gui.java
@@ -66,10 +66,11 @@ import jsyntaxpane.DefaultSyntaxKit;
66import com.google.common.collect.Lists; 66import com.google.common.collect.Lists;
67 67
68import cuchaz.enigma.Constants; 68import cuchaz.enigma.Constants;
69import cuchaz.enigma.analysis.BehaviorReferenceTreeNode;
69import cuchaz.enigma.analysis.ClassInheritanceTreeNode; 70import cuchaz.enigma.analysis.ClassInheritanceTreeNode;
70import cuchaz.enigma.analysis.FieldCallsTreeNode; 71import cuchaz.enigma.analysis.FieldReferenceTreeNode;
71import cuchaz.enigma.analysis.MethodCallsTreeNode;
72import cuchaz.enigma.analysis.MethodInheritanceTreeNode; 72import cuchaz.enigma.analysis.MethodInheritanceTreeNode;
73import cuchaz.enigma.analysis.ReferenceTreeNode;
73import cuchaz.enigma.analysis.Token; 74import cuchaz.enigma.analysis.Token;
74import cuchaz.enigma.mapping.ArgumentEntry; 75import cuchaz.enigma.mapping.ArgumentEntry;
75import cuchaz.enigma.mapping.ClassEntry; 76import cuchaz.enigma.mapping.ClassEntry;
@@ -191,7 +192,7 @@ public class Gui
191 String selected = m_obfClasses.getSelectedValue(); 192 String selected = m_obfClasses.getSelectedValue();
192 if( selected != null ) 193 if( selected != null )
193 { 194 {
194 m_controller.openEntry( new ClassEntry( selected ) ); 195 m_controller.openDeclaration( new ClassEntry( selected ) );
195 } 196 }
196 } 197 }
197 } 198 }
@@ -217,7 +218,7 @@ public class Gui
217 String selected = m_deobfClasses.getSelectedValue(); 218 String selected = m_deobfClasses.getSelectedValue();
218 if( selected != null ) 219 if( selected != null )
219 { 220 {
220 m_controller.openEntry( new ClassEntry( selected ) ); 221 m_controller.openDeclaration( new ClassEntry( selected ) );
221 } 222 }
222 } 223 }
223 } 224 }
@@ -268,11 +269,11 @@ public class Gui
268 break; 269 break;
269 270
270 case KeyEvent.VK_N: 271 case KeyEvent.VK_N:
271 openEntry(); 272 openDeclaration();
272 break; 273 break;
273 274
274 case KeyEvent.VK_P: 275 case KeyEvent.VK_P:
275 m_controller.openPreviousEntry(); 276 m_controller.openPreviousLocation();
276 break; 277 break;
277 278
278 case KeyEvent.VK_C: 279 case KeyEvent.VK_C:
@@ -341,7 +342,7 @@ public class Gui
341 @Override 342 @Override
342 public void actionPerformed( ActionEvent event ) 343 public void actionPerformed( ActionEvent event )
343 { 344 {
344 openEntry(); 345 openDeclaration();
345 } 346 }
346 } ); 347 } );
347 menu.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_N, 0 ) ); 348 menu.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_N, 0 ) );
@@ -356,7 +357,7 @@ public class Gui
356 @Override 357 @Override
357 public void actionPerformed( ActionEvent event ) 358 public void actionPerformed( ActionEvent event )
358 { 359 {
359 m_controller.openPreviousEntry(); 360 m_controller.openPreviousLocation();
360 } 361 }
361 } ); 362 } );
362 menu.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_P, 0 ) ); 363 menu.setAccelerator( KeyStroke.getKeyStroke( KeyEvent.VK_P, 0 ) );
@@ -385,14 +386,14 @@ public class Gui
385 Object node = path.getLastPathComponent(); 386 Object node = path.getLastPathComponent();
386 if( node instanceof ClassInheritanceTreeNode ) 387 if( node instanceof ClassInheritanceTreeNode )
387 { 388 {
388 m_controller.openEntry( new ClassEntry( ((ClassInheritanceTreeNode)node).getObfClassName() ) ); 389 m_controller.openDeclaration( new ClassEntry( ((ClassInheritanceTreeNode)node).getObfClassName() ) );
389 } 390 }
390 else if( node instanceof MethodInheritanceTreeNode ) 391 else if( node instanceof MethodInheritanceTreeNode )
391 { 392 {
392 MethodInheritanceTreeNode methodNode = (MethodInheritanceTreeNode)node; 393 MethodInheritanceTreeNode methodNode = (MethodInheritanceTreeNode)node;
393 if( methodNode.isImplemented() ) 394 if( methodNode.isImplemented() )
394 { 395 {
395 m_controller.openEntry( methodNode.getMethodEntry() ); 396 m_controller.openDeclaration( methodNode.getMethodEntry() );
396 } 397 }
397 } 398 }
398 } 399 }
@@ -407,6 +408,7 @@ public class Gui
407 m_callsTree.setModel( null ); 408 m_callsTree.setModel( null );
408 m_callsTree.addMouseListener( new MouseAdapter( ) 409 m_callsTree.addMouseListener( new MouseAdapter( )
409 { 410 {
411 @SuppressWarnings( "unchecked" )
410 @Override 412 @Override
411 public void mouseClicked( MouseEvent event ) 413 public void mouseClicked( MouseEvent event )
412 { 414 {
@@ -420,9 +422,17 @@ public class Gui
420 } 422 }
421 423
422 Object node = path.getLastPathComponent(); 424 Object node = path.getLastPathComponent();
423 if( node instanceof MethodCallsTreeNode ) 425 if( node instanceof ReferenceTreeNode )
424 { 426 {
425 m_controller.openEntry( ((MethodCallsTreeNode)node).getEntry() ); 427 ReferenceTreeNode<Entry> referenceNode = ((ReferenceTreeNode<Entry>)node);
428 if( referenceNode.getReference() != null )
429 {
430 m_controller.openReference( referenceNode.getReference() );
431 }
432 else
433 {
434 m_controller.openDeclaration( referenceNode.getEntry() );
435 }
426 } 436 }
427 } 437 }
428 } 438 }
@@ -862,7 +872,7 @@ public class Gui
862 m_showInheritanceMenu.setEnabled( isClassEntry || isMethodEntry || isConstructorEntry ); 872 m_showInheritanceMenu.setEnabled( isClassEntry || isMethodEntry || isConstructorEntry );
863 m_showCallsMenu.setEnabled( isFieldEntry || isMethodEntry || isConstructorEntry ); 873 m_showCallsMenu.setEnabled( isFieldEntry || isMethodEntry || isConstructorEntry );
864 m_openEntryMenu.setEnabled( isClassEntry || isFieldEntry || isMethodEntry || isConstructorEntry ); 874 m_openEntryMenu.setEnabled( isClassEntry || isFieldEntry || isMethodEntry || isConstructorEntry );
865 m_openPreviousMenu.setEnabled( m_controller.hasPreviousEntry() ); 875 m_openPreviousMenu.setEnabled( m_controller.hasPreviousLocation() );
866 } 876 }
867 877
868 private void startRename( ) 878 private void startRename( )
@@ -977,17 +987,17 @@ public class Gui
977 987
978 if( m_selectedEntryPair.obf instanceof FieldEntry ) 988 if( m_selectedEntryPair.obf instanceof FieldEntry )
979 { 989 {
980 FieldCallsTreeNode node = m_controller.getFieldCalls( (FieldEntry)m_selectedEntryPair.obf ); 990 FieldReferenceTreeNode node = m_controller.getFieldReferences( (FieldEntry)m_selectedEntryPair.obf );
981 m_callsTree.setModel( new DefaultTreeModel( node ) ); 991 m_callsTree.setModel( new DefaultTreeModel( node ) );
982 } 992 }
983 else if( m_selectedEntryPair.obf instanceof MethodEntry ) 993 else if( m_selectedEntryPair.obf instanceof MethodEntry )
984 { 994 {
985 MethodCallsTreeNode node = m_controller.getMethodCalls( (MethodEntry)m_selectedEntryPair.obf ); 995 BehaviorReferenceTreeNode node = m_controller.getMethodReferences( (MethodEntry)m_selectedEntryPair.obf );
986 m_callsTree.setModel( new DefaultTreeModel( node ) ); 996 m_callsTree.setModel( new DefaultTreeModel( node ) );
987 } 997 }
988 else if( m_selectedEntryPair.obf instanceof ConstructorEntry ) 998 else if( m_selectedEntryPair.obf instanceof ConstructorEntry )
989 { 999 {
990 MethodCallsTreeNode node = m_controller.getMethodCalls( (ConstructorEntry)m_selectedEntryPair.obf ); 1000 BehaviorReferenceTreeNode node = m_controller.getMethodReferences( (ConstructorEntry)m_selectedEntryPair.obf );
991 m_callsTree.setModel( new DefaultTreeModel( node ) ); 1001 m_callsTree.setModel( new DefaultTreeModel( node ) );
992 } 1002 }
993 1003
@@ -1009,13 +1019,13 @@ public class Gui
1009 return new TreePath( nodes.toArray() ); 1019 return new TreePath( nodes.toArray() );
1010 } 1020 }
1011 1021
1012 private void openEntry( ) 1022 private void openDeclaration( )
1013 { 1023 {
1014 if( m_selectedEntryPair == null ) 1024 if( m_selectedEntryPair == null )
1015 { 1025 {
1016 return; 1026 return;
1017 } 1027 }
1018 m_controller.openEntry( m_selectedEntryPair.obf ); 1028 m_controller.openDeclaration( m_selectedEntryPair.obf );
1019 } 1029 }
1020 1030
1021 private void close( ) 1031 private void close( )
HIC SVNT DRACONES