628b22e7d5
- for some reason, jdk8 vm can not look into jdk11 vm, even if agent is correctly jdk8 version - the config is still share, which is stupid, but I doubt there is another target audeince then me
87 lines
3.8 KiB
Diff
87 lines
3.8 KiB
Diff
diff --git a/runtime-decompiler/pom.xml b/runtime-decompiler/pom.xml
|
|
index 26a416e..e6e2425 100644
|
|
--- a/runtime-decompiler/pom.xml
|
|
+++ b/runtime-decompiler/pom.xml
|
|
@@ -135,11 +135,6 @@
|
|
<artifactId>directories</artifactId>
|
|
<version>10</version>
|
|
</dependency>-->
|
|
- <dependency>
|
|
- <groupId>com.fifesoft</groupId>
|
|
- <artifactId>rsyntaxtextarea</artifactId>
|
|
- <version>2.6.1</version>
|
|
- </dependency>
|
|
<dependency>
|
|
<groupId>org.jboss.byteman</groupId>
|
|
<artifactId>byteman-install</artifactId>
|
|
diff --git a/runtime-decompiler/src/main/java/org/jrd/frontend/BytecodeDecompilerView.java b/runtime-decompiler/src/main/java/org/jrd/frontend/BytecodeDecompilerView.java
|
|
index 9c19e2c..8d17775 100644
|
|
--- a/runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/BytecodeDecompilerView.java
|
|
+++ b/runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/BytecodeDecompilerView.java
|
|
@@ -1,11 +1,11 @@
|
|
package org.jrd.frontend.MainFrame;
|
|
|
|
-import org.fife.ui.rsyntaxtextarea.*;
|
|
-import org.fife.ui.rtextarea.SearchContext;
|
|
-import org.fife.ui.rtextarea.SearchEngine;
|
|
+//import org.fife.ui.rsyntaxtextarea.*;
|
|
+//import org.fife.ui.rtextarea.SearchContext;
|
|
+//import org.fife.ui.rtextarea.SearchEngine;
|
|
import org.jrd.backend.core.OutputController;
|
|
import org.jrd.backend.decompiling.DecompilerWrapperInformation;
|
|
-import org.fife.ui.rtextarea.RTextScrollPane;
|
|
+//import org.fife.ui.rtextarea.RTextScrollPane;
|
|
|
|
import javax.swing.*;
|
|
import javax.swing.border.EtchedBorder;
|
|
@@ -30,8 +30,8 @@ public class BytecodeDecompilerView {
|
|
private JPanel rightMainPanel;
|
|
private JScrollPane leftScrollPanel;
|
|
private JList<String> filteredClassesJlist;
|
|
- private RTextScrollPane bytecodeScrollPane;
|
|
- private RSyntaxTextArea bytecodeSyntaxTextArea;
|
|
+ private JScrollPane bytecodeScrollPane;
|
|
+ private JTextArea bytecodeSyntaxTextArea;
|
|
private ActionListener bytesActionListener;
|
|
private ActionListener classesActionListener;
|
|
private ActionListener rewriteActionListener;
|
|
@@ -147,10 +147,10 @@ public class BytecodeDecompilerView {
|
|
}
|
|
});
|
|
|
|
- bytecodeSyntaxTextArea = new RSyntaxTextArea();
|
|
- bytecodeSyntaxTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
|
|
- bytecodeSyntaxTextArea.setCodeFoldingEnabled(true);
|
|
- bytecodeScrollPane = new RTextScrollPane(bytecodeSyntaxTextArea);
|
|
+ bytecodeSyntaxTextArea = new JTextArea();
|
|
+ //bytecodeSyntaxTextArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
|
|
+ //bytecodeSyntaxTextArea.setCodeFoldingEnabled(true);
|
|
+ bytecodeScrollPane = new JScrollPane(bytecodeSyntaxTextArea);
|
|
|
|
leftMainPanel = new JPanel();
|
|
leftMainPanel.setLayout(new BorderLayout());
|
|
@@ -297,14 +297,14 @@
|
|
Search string in decompiled code
|
|
*/
|
|
private void searchCode() {
|
|
- SearchContext context = new SearchContext();
|
|
- String match = searchCodeField.getText();
|
|
- context.setSearchFor(match);
|
|
- context.setWholeWord(false);
|
|
- SearchEngine.markAll(bytecodeSyntaxTextArea, context);
|
|
- int line = SearchEngine.getNextMatchPos(match, bytecodeSyntaxTextArea.getText(), true, true, false);
|
|
- if(line >= 0) {
|
|
- bytecodeSyntaxTextArea.setCaretPosition(line);
|
|
- }
|
|
+ //SearchContext context = new SearchContext();
|
|
+ //String match = searchCodeField.getText();
|
|
+ //context.setSearchFor(match);
|
|
+ //context.setWholeWord(false);
|
|
+ //SearchEngine.markAll(bytecodeSyntaxTextArea, context);
|
|
+ //int line = SearchEngine.getNextMatchPos(match, bytecodeSyntaxTextArea.getText(), true, true, false);
|
|
+ //if(line >= 0) {
|
|
+ //bytecodeSyntaxTextArea.setCaretPosition(line);
|
|
+ //}
|
|
}
|
|
}
|
|
|