fixes for Python Mode crashing on startup

benfry · benfry · commit 51add87ed902 · 2016-08-19T11:29:05.000-04:00
diff --git a/app/src/processing/app/syntax/PdeInputHandler.java b/app/src/processing/app/syntax/PdeInputHandler.java
@@ -48,13 +48,19 @@ public class PdeInputHandler extends DefaultInputHandler {
   protected Editor editor;
 
 
-  /** Not recommended, but included for compatibility. */
-  public PdeInputHandler() { }
-
-
+  /**
+   * Recommended constructor.
+   * @since 3.2
+   */
   public PdeInputHandler(Editor editor) {
     this.editor = editor;
+  }
+
 
+  /**
+   * Not recommended, but included for API compatibility.
+   */
+  public PdeInputHandler() {
     // Use option on mac for text edit controls that are ctrl on Windows/Linux.
     // (i.e. ctrl-left/right is option-left/right on OS X)
     String mod = Platform.isMacOS() ? "A" : "C";
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -296,7 +296,10 @@ public void caretUpdate(CaretEvent e) {
     upper.add(editorPanel);
 
     // set colors and fonts for the painter object
-    getPdeTextArea().setMode(mode);
+    PdeTextArea pta = getPdeTextArea();
+    if (pta != null) {
+      pta.setMode(mode);
+    }
 
     splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, upper, footer);
 
@@ -1594,7 +1597,7 @@ public JEditTextArea getTextArea() {
 
 
   public PdeTextArea getPdeTextArea() {
-    return (PdeTextArea) textarea;
+    return (textarea instanceof PdeTextArea) ? (PdeTextArea) textarea : null;
   }
 
 
diff --git a/app/src/processing/app/ui/MarkerColumn.java b/app/src/processing/app/ui/MarkerColumn.java
@@ -37,6 +37,7 @@
 import processing.app.Problem;
 import processing.app.Sketch;
 import processing.app.SketchCode;
+import processing.app.syntax.PdeTextArea;
 import processing.app.ui.Editor;
 import processing.core.PApplet;
 
@@ -92,8 +93,11 @@ public void repaint() {
 
   @Override
   public void paintComponent(Graphics g) {
-    g.drawImage(editor.getPdeTextArea().getGutterGradient(),
-                0, 0, getWidth(), getHeight(), this);
+    PdeTextArea pta = editor.getPdeTextArea();
+    if (pta != null) {
+      g.drawImage(pta.getGutterGradient(),
+                  0, 0, getWidth(), getHeight(), this);
+    }
 
     int currentTabIndex = editor.getSketch().getCurrentCodeIndex();
 
diff --git a/todo.txt b/todo.txt
@@ -1,10 +1,14 @@
 0253 (3.2.1)
 X &ldquo;Could not replace preferences.old&rdquo; error message
 X   https://github.com/processing/processing/issues/4626
-o 3.2 not starting up on Windows 10 (64-bit)
+_ Version 3.2 won't run from paths with spaces on Windows
 X   https://github.com/processing/processing/issues/4623
-o   can't reproduce; might be #4626?
+_   might be ext.dirs trouble with spaces in path names?
+_     or the backwards slashes?
+X fixes for Python Mode crashing on startup
 
+_ library compilations handled oddly
+_   https://github.com/processing/processing/issues/4630
 
 _ update launch4j to 3.9
 _   https://sourceforge.net/projects/launch4j/files/launch4j-3/3.9/
