rpms/java-runtime-decompiler
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bumped to 5.0.beta2

Browse source
This commit is contained in:
Jiri Vanek 2021-08-06 16:20:02 +02:00
commit 23354267ba
11 changed files with 173 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

101
remove_rsyntaxtextarea.patch
View file

@ -1,73 +1,52 @@
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
@@ -131,11 +131,6 @@
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
--- runtime-decompiler/pom.xml
+++ runtime-decompiler/pom.xml
@@ -157,11 +157,6 @@
<artifactId>directories</artifactId>
<version>10</version>
</dependency>-->
- <dependency>
- <groupId>com.fifesoft</groupId>
- <artifactId>rsyntaxtextarea</artifactId>
- <version>2.6.1</version>
- <version>3.1.2</version>
- </dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-install</artifactId>
@@ -144,24 +139,6 @@
</dependency>
<!-- For tests -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>5.5.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>5.5.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>5.5.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
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
@@ -2,9 +2,9 @@ package org.jrd.frontend.MainFrame;
import org.jrd.backend.core.OutputController;
import org.jrd.backend.decompiling.DecompilerWrapperInformation;
--- runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/BytecodeDecompilerView.java
+++ runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/BytecodeDecompilerView.java
@@ -4,11 +4,11 @@ import org.fife.ui.hex.event.HexSearchActionListener;
import org.fife.ui.hex.event.HexSearchDocumentListener;
import org.fife.ui.hex.swing.HexEditor;
import org.fife.ui.hex.swing.HexSearch;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
-import org.fife.ui.rtextarea.RTextScrollPane;
-import org.fife.ui.rtextarea.SearchContext;
-import org.fife.ui.rtextarea.SearchEngine;
+//import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+//import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
+//import org.fife.ui.rtextarea.RTextScrollPane;
+//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 javax.swing.*;
import javax.swing.border.EtchedBorder;
@@ -30,8 +30,8 @@ public class BytecodeDecompilerView {
private JPanel rightMainPanel;
@@ -52,8 +52,8 @@ public class BytecodeDecompilerView {
private JPanel rightBin;
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 {
private HexEditor hex;
private JPanel hexControls;
private String lastDecompiledClass = "";
@@ -198,10 +198,10 @@ public class BytecodeDecompilerView {
}
});
@ -80,6 +59,30 @@ index 9c19e2c..8d17775 100644
+ //bytecodeSyntaxTextArea.setCodeFoldingEnabled(true);
+ bytecodeScrollPane = new JScrollPane(bytecodeSyntaxTextArea);
leftMainPanel = new JPanel();
leftMainPanel.setLayout(new BorderLayout());
hex = new HexEditor();
hexControls = new JPanel();
@@ -410,15 +410,15 @@ public class BytecodeDecompilerView {
* 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);
+// }
}
private void classWorker(String name) {