Konloch
diff --git a/‎src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
Copy file name to clipboard
+19-3Lines changed: 19 additions & 3 deletions b/‎src/main/java/the/bytecode/club/bytecodeviewer/gui/components/SearchableRSyntaxTextArea.java
Copy file name to clipboard
+19-3Lines changed: 19 additions & 3 deletions
diff --git a/‎src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
Copy file name to clipboard
+86-11Lines changed: 86 additions & 11 deletions b/‎src/main/java/the/bytecode/club/bytecodeviewer/gui/components/actions/GoToAction.java
Copy file name to clipboard
+86-11Lines changed: 86 additions & 11 deletions
diff --git a/‎src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions b/‎src/main/java/the/bytecode/club/bytecodeviewer/gui/resourceviewer/Workspace.java
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions
@@ -30,9 +30,7 @@
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
 import java.awt.*;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseWheelEvent;
+import java.awt.event.*;
 
 /**
  * Searching on an RSyntaxTextArea using swing highlighting
@@ -87,6 +85,24 @@ public SearchableRSyntaxTextArea()
             GlobalHotKeys.keyPressed(keyEvent);
         }));
 
+        setCursor(new Cursor(Cursor.TEXT_CURSOR));
+        getCaret().setBlinkRate(0);
+        getCaret().setVisible(true);
+        addFocusListener(new FocusAdapter()
+        {
+            @Override
+            public void focusGained(FocusEvent e)
+            {
+                getCaret().setVisible(true);
+            }
+
+            @Override
+            public void focusLost(FocusEvent e)
+            {
+                getCaret().setVisible(true);
+            }
+        });
+
         final Font newFont = getFont().deriveFont((float) BytecodeViewer.viewer.getFontSize());
 
         //set number-bar font
 
@@ -1,17 +1,20 @@
 package the.bytecode.club.bytecodeviewer.gui.components.actions;
 
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.Token;
-import org.objectweb.asm.tree.ClassNode;
 import the.bytecode.club.bytecodeviewer.BytecodeViewer;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.BytecodeViewPanel;
+import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ClassViewer;
+import the.bytecode.club.bytecodeviewer.gui.util.BytecodeViewPanelUpdater;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
 import the.bytecode.club.bytecodeviewer.resources.classcontainer.locations.ClassFieldLocation;
-import the.bytecode.club.bytecodeviewer.resources.classcontainer.parser.TokenUtil;
 
 import javax.swing.*;
+import javax.swing.event.CaretEvent;
+import javax.swing.event.CaretListener;
 import javax.swing.text.Element;
 import java.awt.event.ActionEvent;
+import java.util.HashMap;
 
 /**
  * Created by Bl3nd.
@@ -36,20 +39,14 @@ public void actionPerformed(ActionEvent e)
         container.fieldMembers.values().forEach(fields -> fields.forEach(field -> {
             if (field.line == line && field.columnStart - 1 <= column && field.columnEnd >= column)
             {
+                Element root = textArea.getDocument().getDefaultRootElement();
                 // Open the class that is associated with the field's owner.
                 if (!field.owner.equals(container.getName()))
                 {
-                    ResourceContainer resourceContainer = BytecodeViewer.getFileContainer(container.getParentContainer());
-                    if (resourceContainer != null)
-                    {
-                        String s = container.getImport(field.owner);
-                        BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, s + ".class");
-                    }
-
+                    openFieldClass(field, textArea);
                     return;
                 }
 
-                Element root = textArea.getDocument().getDefaultRootElement();
                 ClassFieldLocation first = fields.get(0);
                 int startOffset = root.getElement(first.line - 1).getStartOffset() + (first.columnStart - 1);
                 textArea.setCaretPosition(startOffset);
@@ -100,4 +97,82 @@ public void actionPerformed(ActionEvent e)
             }
         }));
     }
+
+    private void openFieldClass(ClassFieldLocation field, RSyntaxTextArea textArea)
+    {
+        String token = textArea.modelToToken(textArea.getCaretPosition()).getLexeme();
+        ResourceContainer resourceContainer = BytecodeViewer.getFileContainer(container.getParentContainer());
+        if (resourceContainer != null)
+        {
+            String s = container.getImport(field.owner);
+            BytecodeViewer.viewer.workPane.addClassResource(resourceContainer, s + ".class");
+            ClassViewer activeResource = (ClassViewer) BytecodeViewer.viewer.workPane.getActiveResource();
+            HashMap<String, ClassFileContainer> classFiles = BytecodeViewer.viewer.workPane.classFiles;
+            Thread thread = new Thread(() -> {
+                try
+                {
+                    BytecodeViewer.updateBusyStatus(true);
+                    Thread.sleep(1000);
+                } catch (InterruptedException e)
+                {
+                    throw new RuntimeException(e);
+                } finally
+                {
+                    BytecodeViewer.updateBusyStatus(false);
+                }
+
+                String s2 = activeResource.resource.workingName + "-" + this.container.getDecompiler();
+                ClassFileContainer classFileContainer = classFiles.get(s2);
+                classFileContainer.fieldMembers.forEach((field1, field2) -> {
+                    if (field1.equals(token))
+                    {
+                        field2.forEach(classFieldLocation -> {
+                            if (classFieldLocation.type.equals("declaration"))
+                            {
+                                for (int i = 0; i < 3; i++)
+                                {
+                                    BytecodeViewPanel panel = activeResource.getPanel(i);
+                                    if (panel.textArea != null)
+                                    {
+                                        if (panel.decompiler.getDecompilerName().equals(this.container.getDecompiler()))
+                                        {
+                                            Element root = panel.textArea.getDocument().getDefaultRootElement();
+                                            int startOffset = root.getElement(classFieldLocation.line - 1).getStartOffset() + (classFieldLocation.columnStart - 1);
+                                            panel.textArea.setCaretPosition(startOffset);
+                                            for (CaretListener caretListener : panel.textArea.getCaretListeners())
+                                            {
+                                                if (caretListener instanceof BytecodeViewPanelUpdater.MarkerCaretListener)
+                                                {
+                                                    BytecodeViewPanelUpdater.MarkerCaretListener markerCaretListener = (BytecodeViewPanelUpdater.MarkerCaretListener) caretListener;
+                                                    markerCaretListener.caretUpdate(new CaretEvent(panel.textArea)
+                                                    {
+                                                        @Override
+                                                        public int getDot()
+                                                        {
+                                                            return panel.textArea.getCaret().getDot();
+                                                        }
+
+                                                        @Override
+                                                        public int getMark()
+                                                        {
+                                                            return 0;
+                                                        }
+                                                    });
+                                                }
+                                            }
+
+                                            panel.textArea.requestFocusInWindow();
+
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        });
+                    }
+                });
+            });
+            thread.start();
+        }
+    }
 }
@@ -24,6 +24,7 @@
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.FileViewer;
 import the.bytecode.club.bytecodeviewer.gui.resourceviewer.viewer.ResourceViewer;
 import the.bytecode.club.bytecodeviewer.resources.ResourceContainer;
+import the.bytecode.club.bytecodeviewer.resources.classcontainer.ClassFileContainer;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedComponents;
 import the.bytecode.club.bytecodeviewer.translation.TranslatedStrings;
 import the.bytecode.club.bytecodeviewer.translation.components.TranslatedJButton;
@@ -33,13 +34,10 @@
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
-import static the.bytecode.club.bytecodeviewer.Constants.BLOCK_TAB_MENU;
-
 /**
  * This pane contains all the resources, as tabs.
  *
@@ -54,6 +52,7 @@ public class Workspace extends TranslatedVisibleComponent {
 	public final JPanel buttonPanel;
 	public final JButton refreshClass;
 	public final Set<String> openedTabs = new HashSet<>();
+	public HashMap<String, ClassFileContainer> classFiles = new HashMap<>();
 
 	public Workspace() {
 		super("Workspace", TranslatedComponents.WORK_SPACE);