summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jeff2015-02-28 19:45:52 -0500
committerGravatar jeff2015-02-28 19:45:52 -0500
commit6a4bc21a63513bf5dd1ddcf72e19e6d503697342 (patch)
tree9f1bb4980fa6a950c226cb801ab85f9f228e2ece
parentfix up conversion tool to handle Minecraft 1.8.3 (diff)
downloadenigma-fork-6a4bc21a63513bf5dd1ddcf72e19e6d503697342.tar.gz
enigma-fork-6a4bc21a63513bf5dd1ddcf72e19e6d503697342.tar.xz
enigma-fork-6a4bc21a63513bf5dd1ddcf72e19e6d503697342.zip
switch to better-maintained version of JSyntaxPane
-rw-r--r--build.py2
-rw-r--r--src/cuchaz/enigma/gui/Gui.java5
2 files changed, 3 insertions, 4 deletions
diff --git a/build.py b/build.py
index 1f80d50..c2caa29 100644
--- a/build.py
+++ b/build.py
@@ -31,7 +31,7 @@ LibDeps = [
31 ssjb.ivy.Dep("org.bitbucket.mstrobel:procyon-decompiler:0.5.28-enigma") 31 ssjb.ivy.Dep("org.bitbucket.mstrobel:procyon-decompiler:0.5.28-enigma")
32] 32]
33StandaloneDeps = LibDeps + [ 33StandaloneDeps = LibDeps + [
34 ssjb.ivy.Dep("de.sciss:jsyntaxpane:1.0.0") 34 ssjb.ivy.Dep("de.sciss:syntaxpane:1.1.4")
35] 35]
36ProguardDep = ssjb.ivy.Dep("net.sf.proguard:proguard-base:5.1") 36ProguardDep = ssjb.ivy.Dep("net.sf.proguard:proguard-base:5.1")
37TestDeps = [ 37TestDeps = [
diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java
index 00cff59..a214243 100644
--- a/src/cuchaz/enigma/gui/Gui.java
+++ b/src/cuchaz/enigma/gui/Gui.java
@@ -65,8 +65,6 @@ import javax.swing.tree.DefaultTreeModel;
65import javax.swing.tree.TreeNode; 65import javax.swing.tree.TreeNode;
66import javax.swing.tree.TreePath; 66import javax.swing.tree.TreePath;
67 67
68import jsyntaxpane.DefaultSyntaxKit;
69
70import com.google.common.collect.Lists; 68import com.google.common.collect.Lists;
71 69
72import cuchaz.enigma.Constants; 70import cuchaz.enigma.Constants;
@@ -90,6 +88,7 @@ import cuchaz.enigma.mapping.IllegalNameException;
90import cuchaz.enigma.mapping.MappingParseException; 88import cuchaz.enigma.mapping.MappingParseException;
91import cuchaz.enigma.mapping.MethodEntry; 89import cuchaz.enigma.mapping.MethodEntry;
92import cuchaz.enigma.mapping.Signature; 90import cuchaz.enigma.mapping.Signature;
91import de.sciss.syntaxpane.DefaultSyntaxKit;
93 92
94public class Gui { 93public class Gui {
95 94
@@ -262,7 +261,7 @@ public class Gui {
262 261
263 // turn off token highlighting (it's wrong most of the time anyway...) 262 // turn off token highlighting (it's wrong most of the time anyway...)
264 DefaultSyntaxKit kit = (DefaultSyntaxKit)m_editor.getEditorKit(); 263 DefaultSyntaxKit kit = (DefaultSyntaxKit)m_editor.getEditorKit();
265 kit.toggleComponent(m_editor, "jsyntaxpane.components.TokenMarker"); 264 kit.toggleComponent(m_editor, "de.sciss.syntaxpane.components.TokenMarker");
266 265
267 // init editor popup menu 266 // init editor popup menu
268 JPopupMenu popupMenu = new JPopupMenu(); 267 JPopupMenu popupMenu = new JPopupMenu();