From 6a4bc21a63513bf5dd1ddcf72e19e6d503697342 Mon Sep 17 00:00:00 2001 From: jeff Date: Sat, 28 Feb 2015 19:45:52 -0500 Subject: switch to better-maintained version of JSyntaxPane --- build.py | 2 +- src/cuchaz/enigma/gui/Gui.java | 5 ++--- 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 = [ ssjb.ivy.Dep("org.bitbucket.mstrobel:procyon-decompiler:0.5.28-enigma") ] StandaloneDeps = LibDeps + [ - ssjb.ivy.Dep("de.sciss:jsyntaxpane:1.0.0") + ssjb.ivy.Dep("de.sciss:syntaxpane:1.1.4") ] ProguardDep = ssjb.ivy.Dep("net.sf.proguard:proguard-base:5.1") TestDeps = [ 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; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import jsyntaxpane.DefaultSyntaxKit; - import com.google.common.collect.Lists; import cuchaz.enigma.Constants; @@ -90,6 +88,7 @@ import cuchaz.enigma.mapping.IllegalNameException; import cuchaz.enigma.mapping.MappingParseException; import cuchaz.enigma.mapping.MethodEntry; import cuchaz.enigma.mapping.Signature; +import de.sciss.syntaxpane.DefaultSyntaxKit; public class Gui { @@ -262,7 +261,7 @@ public class Gui { // turn off token highlighting (it's wrong most of the time anyway...) DefaultSyntaxKit kit = (DefaultSyntaxKit)m_editor.getEditorKit(); - kit.toggleComponent(m_editor, "jsyntaxpane.components.TokenMarker"); + kit.toggleComponent(m_editor, "de.sciss.syntaxpane.components.TokenMarker"); // init editor popup menu JPopupMenu popupMenu = new JPopupMenu(); -- cgit v1.2.3