summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Glassmaker2016-10-18 19:21:06 +0300
committerGravatar Thomas Guillemard2016-10-18 18:21:06 +0200
commita917a5de39f8002ef127aca4c610738f1f1ebfba (patch)
tree348f369169bb6c8139ee74554d31d5ffb5202b75 /src
parentRemove Nullable usage and add null check in equals (diff)
downloadenigma-fork-a917a5de39f8002ef127aca4c610738f1f1ebfba.tar.gz
enigma-fork-a917a5de39f8002ef127aca4c610738f1f1ebfba.tar.xz
enigma-fork-a917a5de39f8002ef127aca4c610738f1f1ebfba.zip
Fixes execution order for line number ruler (Close #39)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/cuchaz/enigma/gui/Gui.java3
-rw-r--r--src/main/java/cuchaz/enigma/gui/panels/PanelEditor.java5
2 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index a81ad06..d3f7406 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 {
136 m_selectionHighlightPainter = new SelectionHighlightPainter(); 136 m_selectionHighlightPainter = new SelectionHighlightPainter();
137 this.editor = new PanelEditor(this); 137 this.editor = new PanelEditor(this);
138 JScrollPane sourceScroller = new JScrollPane(this.editor); 138 JScrollPane sourceScroller = new JScrollPane(this.editor);
139 this.editor.setContentType("text/java");
140 DefaultSyntaxKit kit = (DefaultSyntaxKit) this.editor.getEditorKit();
141 kit.toggleComponent(this.editor, "de.sciss.syntaxpane.components.TokenMarker");
139 142
140 // init editor popup menu 143 // init editor popup menu
141 this.popupMenu = new PopupMenuBar(this); 144 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 cf3c4e9..914952b 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;
10 10
11import cuchaz.enigma.gui.BrowserCaret; 11import cuchaz.enigma.gui.BrowserCaret;
12import cuchaz.enigma.gui.Gui; 12import cuchaz.enigma.gui.Gui;
13import de.sciss.syntaxpane.DefaultSyntaxKit;
14 13
15public class PanelEditor extends JEditorPane { 14public class PanelEditor extends JEditorPane {
16 private final Gui gui; 15 private final Gui gui;
@@ -21,7 +20,6 @@ public class PanelEditor extends JEditorPane {
21 this.setEditable(false); 20 this.setEditable(false);
22 this.setSelectionColor(new Color(31, 46, 90)); 21 this.setSelectionColor(new Color(31, 46, 90));
23 this.setCaret(new BrowserCaret()); 22 this.setCaret(new BrowserCaret());
24 this.setContentType("text/java");
25 this.addCaretListener(event -> gui.onCaretMove(event.getDot())); 23 this.addCaretListener(event -> gui.onCaretMove(event.getDot()));
26 final PanelEditor self = this; 24 final PanelEditor self = this;
27 this.addMouseListener(new MouseAdapter() 25 this.addMouseListener(new MouseAdapter()
@@ -71,8 +69,5 @@ public class PanelEditor extends JEditorPane {
71 } 69 }
72 } 70 }
73 }); 71 });
74
75 DefaultSyntaxKit kit = (DefaultSyntaxKit) this.getEditorKit();
76 kit.toggleComponent(this, "de.sciss.syntaxpane.components.TokenMarker");
77 } 72 }
78} 73}