From a917a5de39f8002ef127aca4c610738f1f1ebfba Mon Sep 17 00:00:00 2001
From: Glassmaker
Date: Tue, 18 Oct 2016 19:21:06 +0300
Subject: Fixes execution order for line number ruler (Close #39)

---
 src/main/java/cuchaz/enigma/gui/Gui.java                | 3 +++
 src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index a81ad066..d3f74060 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -136,6 +136,9 @@ public class Gui {
         m_selectionHighlightPainter = new SelectionHighlightPainter();
         this.editor = new PanelEditor(this);
         JScrollPane sourceScroller = new JScrollPane(this.editor);
+        this.editor.setContentType("text/java");
+        DefaultSyntaxKit kit = (DefaultSyntaxKit) this.editor.getEditorKit();
+        kit.toggleComponent(this.editor, "de.sciss.syntaxpane.components.TokenMarker");
 
         // init editor popup menu
         this.popupMenu = new PopupMenuBar(this);
diff --git a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
index cf3c4e93..914952b9 100644
--- a/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
+++ b/src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java
@@ -10,7 +10,6 @@ import javax.swing.JEditorPane;
 
 import cuchaz.enigma.gui.BrowserCaret;
 import cuchaz.enigma.gui.Gui;
-import de.sciss.syntaxpane.DefaultSyntaxKit;
 
 public class PanelEditor extends JEditorPane {
     private final Gui gui;
@@ -21,7 +20,6 @@ public class PanelEditor extends JEditorPane {
         this.setEditable(false);
         this.setSelectionColor(new Color(31, 46, 90));
         this.setCaret(new BrowserCaret());
-        this.setContentType("text/java");
         this.addCaretListener(event -> gui.onCaretMove(event.getDot()));
         final PanelEditor self = this;
         this.addMouseListener(new MouseAdapter()
@@ -71,8 +69,5 @@ public class PanelEditor extends JEditorPane {
                 }
             }
         });
-
-        DefaultSyntaxKit kit = (DefaultSyntaxKit) this.getEditorKit();
-        kit.toggleComponent(this, "de.sciss.syntaxpane.components.TokenMarker");
     }
 }
-- 
cgit v1.2.3