[sikuli] 223/385: minor

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit 4aef0698ccc6a9fb272a7e48f0ecb1523f990a9a
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Wed Feb 19 10:21:23 2014 +0100

    minor
---
 IDE/src/main/java/org/sikuli/ide/EditorPane.java        |  7 +++++--
 IDE/src/main/java/org/sikuli/ide/EditorViewFactory.java |  1 -
 IDE/src/main/java/org/sikuli/ide/SikuliEditorKit.java   | 11 ++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/IDE/src/main/java/org/sikuli/ide/EditorPane.java b/IDE/src/main/java/org/sikuli/ide/EditorPane.java
index e0de5ba..2def384 100755
--- a/IDE/src/main/java/org/sikuli/ide/EditorPane.java
+++ b/IDE/src/main/java/org/sikuli/ide/EditorPane.java
@@ -61,6 +61,8 @@ public class EditorPane extends JTextPane implements KeyListener, CaretListener
 	private boolean _can_update_caret_last_x = true;
 	private SikuliIDEPopUpMenu popMenuImage;
 	private String sikuliContentType;
+  private SikuliEditorKit editorKit;
+  private EditorViewFactory editorViewFactory;
 
 	//<editor-fold defaultstate="collapsed" desc="Initialization">
 	public EditorPane(SikuliIDE ide) {
@@ -96,8 +98,9 @@ public class EditorPane extends JTextPane implements KeyListener, CaretListener
 
 		if (scrType != null) {
 			sikuliContentType = scrType;
-			SikuliEditorKit ek = new SikuliEditorKit(this);
-			setEditorKit(ek);
+			editorKit = new SikuliEditorKit();
+      editorViewFactory = (EditorViewFactory) editorKit.getViewFactory();
+			setEditorKit(editorKit);
 			setContentType(scrType);
 
 			if (_indentationLogic != null) {
diff --git a/IDE/src/main/java/org/sikuli/ide/EditorViewFactory.java b/IDE/src/main/java/org/sikuli/ide/EditorViewFactory.java
index 63412a6..50d76cd 100755
--- a/IDE/src/main/java/org/sikuli/ide/EditorViewFactory.java
+++ b/IDE/src/main/java/org/sikuli/ide/EditorViewFactory.java
@@ -525,7 +525,6 @@ class ButtonView extends ComponentView {
   public void paint(Graphics g, Shape shape) {
     JComponent comp = (JComponent) getComponent();
     Rectangle alloc = (shape instanceof Rectangle) ? (Rectangle) shape : shape.getBounds();
-    return;
   }
 }
 //</editor-fold>
diff --git a/IDE/src/main/java/org/sikuli/ide/SikuliEditorKit.java b/IDE/src/main/java/org/sikuli/ide/SikuliEditorKit.java
index 85e01a9..5af1713 100755
--- a/IDE/src/main/java/org/sikuli/ide/SikuliEditorKit.java
+++ b/IDE/src/main/java/org/sikuli/ide/SikuliEditorKit.java
@@ -22,11 +22,6 @@ public class SikuliEditorKit extends StyledEditorKit {
 	private ViewFactory _viewFactory;
 	private EditorPane pane;
 
-	public SikuliEditorKit(EditorPane p) {
-		_viewFactory = new EditorViewFactory();
-		pane = p;
-		((EditorViewFactory) _viewFactory).setContentType(pane.getSikuliContentType());
-	}
 	public static final String deIndentAction = "SKL.DeindentAction";
 	private static final TextAction[] defaultActions = {
 		new InsertTabAction(),
@@ -42,6 +37,12 @@ public class SikuliEditorKit extends StyledEditorKit {
 		new NextVisualPositionAction(selectionDownAction, true, SwingConstants.SOUTH),};
 
 
+	public SikuliEditorKit() {
+    pane = SikuliIDE.getInstance().getCurrentCodePane();
+		_viewFactory = new EditorViewFactory();
+    ((EditorViewFactory) _viewFactory).setContentType(pane.getSikuliContentType());
+	}
+  
 	public static class InsertTabAction extends TextAction {
 
 		private IndentationLogic indentationLogic;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git