From d41e083700751fca112fff95b70667e7bf1ee799 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Sat, 6 Aug 2016 14:52:42 -0400
Subject: [PATCH] moving more things into Editor

---
 app/src/processing/app/ui/Editor.java         |  5 ++++
 core/todo.txt                                 |  7 +++++-
 java/src/processing/mode/java/JavaEditor.java | 23 +------------------
 .../mode/java/pdex/JavaTextAreaPainter.java   |  4 ++--
 todo.txt                                      |  2 ++
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
index 73ce7d46d..2db1e9ebb 100644
--- a/app/src/processing/app/ui/Editor.java
+++ b/app/src/processing/app/ui/Editor.java
@@ -278,6 +278,11 @@ public abstract class Editor extends JFrame implements RunnerListener {
         }
       });
     }
+    textarea.addCaretListener(new CaretListener() {
+      public void caretUpdate(CaretEvent e) {
+        updateEditorStatus();
+      }
+    });
 
     footer = createFooter();
 
diff --git a/core/todo.txt b/core/todo.txt
index 203a3111c..4be30e948 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -12,10 +12,15 @@ X Fix resizing targets for async save
 X   https://github.com/processing/processing/pull/4607
 X   https://github.com/processing/processing/issues/4578
 
+contrib
+X Make loadStrings() and loadJSONObject/loadJSONArray() error msgs consistent
+X   https://github.com/processing/processing/issues/4265
+X   https://github.com/processing/processing/pull/4268
+
+
 _ disable OpenGL ES on Linux? 
 _   https://github.com/processing/processing/issues/4584
 
-
 _ Can't render PGraphics object using image() within a PDF
 _   https://github.com/processing/processing/issues/4473
 
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 3504c2485..14bf6d560 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -80,21 +80,6 @@ public class JavaEditor extends Editor {
     debugger = new Debugger(this);
     inspector = new VariableInspector(this);
 
-    // set action on frame close
-    //        addWindowListener(new WindowAdapter() {
-    //            @Override
-    //            public void windowClosing(WindowEvent e) {
-    //                onWindowClosing(e);
-    //            }
-    //        });
-
-
-//    // load settings from theme.txt
-//    breakpointColor = mode.getColor("breakpoint.bgcolor");
-//    breakpointMarkerColor = mode.getColor("breakpoint.marker.color");
-//    currentLineColor = mode.getColor("currentline.bgcolor");
-//    currentLineMarkerColor = mode.getColor("currentline.marker.color");
-
     // set breakpoints from marker comments
     for (LineID lineID : stripBreakpointComments()) {
       //System.out.println("setting: " + lineID);
@@ -119,7 +104,7 @@ public class JavaEditor extends Editor {
     // add our hacked version back to the editor
     box.add(textAndError);
 
-    getJavaTextArea().setMode(jmode);
+    getPdeTextArea().setMode(jmode);
 
     preprocessingService = new PreprocessingService(this);
     pdex = new PDEX(this, preprocessingService);
@@ -134,12 +119,6 @@ public class JavaEditor extends Editor {
 
       public void windowGainedFocus(WindowEvent e) { }
     });
-
-    textarea.addCaretListener(new CaretListener() {
-      public void caretUpdate(CaretEvent e) {
-        updateEditorStatus();
-      }
-    });
   }
 
 
diff --git a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java b/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
index 7859c1e73..0bd682a15 100644
--- a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
+++ b/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
@@ -234,7 +234,7 @@ public class JavaTextAreaPainter extends PdeTextAreaPainter {
 		this.handles = handles;
 		this.colorBoxes = colorBoxes;
 
-		initTweakInterfacePositions();
+		updateTweakInterfacePositions();
 		repaint();
 	}
 
@@ -244,7 +244,7 @@ public class JavaTextAreaPainter extends PdeTextAreaPainter {
 	* synchronize this method to prevent the execution of 'paint' in the middle.
 	* (don't paint while we make changes to the text of the editor)
 	*/
-	private synchronized void initTweakInterfacePositions() {
+	private synchronized void updateTweakInterfacePositions() {
 		SketchCode[] code = getEditor().getSketch().getCode();
 		int prevScroll = textArea.getVerticalScrollPosition();
 		String prevText = textArea.getText();
diff --git a/todo.txt b/todo.txt
index 3aca8844e..682d3aeec 100644
--- a/todo.txt
+++ b/todo.txt
@@ -51,6 +51,8 @@ _   https://github.com/processing/processing/issues/3965
 medium
 _ Move general PDE code out of JavaMode and into general base classes
 _   https://github.com/processing/processing/issues/4606
+_ detect changes in case with libraries
+_   https://github.com/processing/processing/issues/4507
 
 lower
 _ make when opening new editor window, open on the same display as current