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 @@ directories 10 --> - - com.fifesoft - rsyntaxtextarea - 2.6.1 - org.jboss.byteman byteman-install 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 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); + //} } }