Merge pull request #3907 from JakubValtar/update-status

benfry · benfry · commit c2d9fabf91cb · 2015-09-29T18:05:58.000-04:00
Update status error/warning when changing the line
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -2789,6 +2789,14 @@ public String getStatusMessage() {
   }
 
 
+  /**
+   * Returns the current notice message in the editor status bar.
+   */
+  public int getStatusMode() {
+    return status.mode;
+  }
+
+
 //  /**
 //   * Returns the current mode of the editor status bar: NOTICE, ERR or EDIT.
 //   */
diff --git a/app/src/processing/app/ui/EditorStatus.java b/app/src/processing/app/ui/EditorStatus.java
@@ -50,8 +50,9 @@ public class EditorStatus extends BasicSplitPaneDivider {  //JPanel {
 
   @SuppressWarnings("hiding")
   static public final int ERROR   = 1;
-  static public final int COMPILER_ERROR = 1;  // temporary
-  static public final int WARNING = 2;
+  static public final int CURSOR_LINE_ERROR = 2;
+  static public final int WARNING = 3;
+  static public final int CURSOR_LINE_WARNING = 4;
   static public final int NOTICE  = 0;
 
   static final int YES    = 1;
@@ -121,19 +122,25 @@ public void updateMode() {
     fgColor = new Color[] {
       mode.getColor("status.notice.fgcolor"),
       mode.getColor("status.error.fgcolor"),
+      mode.getColor("status.error.fgcolor"),
+      mode.getColor("status.warning.fgcolor"),
       mode.getColor("status.warning.fgcolor")
     };
 
     bgColor = new Color[] {
       mode.getColor("status.notice.bgcolor"),
       mode.getColor("status.error.bgcolor"),
+      mode.getColor("status.error.bgcolor"),
+      mode.getColor("status.warning.bgcolor"),
       mode.getColor("status.warning.bgcolor")
     };
 
     bgImage = new Image[] {
       mode.loadImage("/lib/status/notice.png"),
       mode.loadImage("/lib/status/error.png"),
-      mode.loadImage("/lib/status/edit.png")
+      mode.loadImage("/lib/status/error.png"),
+      mode.loadImage("/lib/status/warning.png"),
+      mode.loadImage("/lib/status/warning.png")
     };
 
     font = mode.getFont("status.font");
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
@@ -167,6 +167,12 @@ public void windowLostFocus(WindowEvent e) {
 
       public void windowGainedFocus(WindowEvent e) { }
     });
+
+    textarea.addCaretListener(new CaretListener() {
+      public void caretUpdate(CaretEvent e) {
+        errorCheckerService.updateEditorStatus();
+      }
+    });
   }
 
 
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -953,13 +953,18 @@ public void updateEditorStatus() {
       if (errorMarker != null) {
         if (errorMarker.getType() == LineMarker.WARNING) {
           editor.statusMessage(errorMarker.getProblem().getMessage(),
-                               EditorStatus.WARNING);
+                               EditorStatus.CURSOR_LINE_WARNING);
         } else {
           editor.statusMessage(errorMarker.getProblem().getMessage(),
-                               EditorStatus.COMPILER_ERROR);
+                               EditorStatus.CURSOR_LINE_ERROR);
         }
       } else {
-        editor.statusEmpty(); // No error, clear the status
+        switch (editor.getStatusMode()) {
+          case EditorStatus.CURSOR_LINE_ERROR:
+          case EditorStatus.CURSOR_LINE_WARNING:
+            editor.statusEmpty();
+            break;
+        }
       }
     }
 
