diff --git a/runtime-decompiler/pom.xml b/runtime-decompiler/pom.xml index 26a416e..e6e2425 100644 --- runtime-decompiler/pom.xml +++ runtime-decompiler/pom.xml @@ -157,11 +157,6 @@ directories 10 --> - - com.fifesoft - rsyntaxtextarea - 3.1.2 - 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 --- 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; @@ -52,8 +52,8 @@ public class BytecodeDecompilerView { private JPanel rightBin; private JScrollPane leftScrollPanel; private JList filteredClassesJlist; - private RTextScrollPane bytecodeScrollPane; - private RSyntaxTextArea bytecodeSyntaxTextArea; + private JScrollPane bytecodeScrollPane; + private JTextArea bytecodeSyntaxTextArea; private HexEditor hex; private JPanel hexControls; private String lastDecompiledClass = ""; @@ -198,10 +198,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); 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) {