Notify ECS that sketch changed on adding/removing tab

JakubValtar · JakubValtar · commit 64b7bf681ae7 · 2016-04-30T17:08:37.000+02:00
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
@@ -673,11 +673,12 @@ public void handleDeleteCode() {
         // remove code from the list
         removeCode(current);
 
+        // update the tabs
+        editor.rebuildHeader();
+
         // just set current tab to the main tab
         setCurrentCode(0);
 
-        // update the tabs
-        editor.rebuildHeader();
       }
     }
   }
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
@@ -5,6 +5,7 @@
 import java.beans.*;
 import java.io.*;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -130,9 +131,6 @@ public void actionPerformed(ActionEvent e) {
     getSketch().setModified(false);
 
     hasJavaTabs = checkForJavaTabs();
-    //initializeErrorChecker();
-
-    initErrorChecker();
 
     // hack to add a JPanel to the right-hand side of the text area
     JPanel textAndError = new JPanel();
@@ -150,6 +148,8 @@ public void actionPerformed(ActionEvent e) {
 
     getJavaTextArea().setMode(jmode);
 
+    initErrorChecker();
+
     // ensure completion is hidden when editor loses focus
     addWindowFocusListener(new WindowFocusListener() {
       public void windowLostFocus(WindowEvent e) {
@@ -195,6 +195,8 @@ public EditorToolbar createToolbar() {
   }
 
 
+  private int previousTabCount = 1;
+
   // Override the parent call to add hook to the rebuild() method
   public EditorHeader createHeader() {
     return new EditorHeader(this) {
@@ -203,6 +205,14 @@ public void rebuild() {
 
         // after Rename and New Tab, we may have new .java tabs
         hasJavaTabs = checkForJavaTabs();
+
+        if (errorCheckerService != null) {
+          int currentTabCount = sketch.getCodeCount();
+          if (currentTabCount != previousTabCount) {
+            previousTabCount = currentTabCount;
+            errorCheckerService.notifySketchChanged();
+          }
+        }
       }
     };
   }

Original file line number	Diff line number	Diff line change
`@@ -673,11 +673,12 @@ public void handleDeleteCode() {`
`673`	`673`	`// remove code from the list`
`674`	`674`	`removeCode(current);`
`675`	`675`
	`676`	`+ // update the tabs`
	`677`	`+ editor.rebuildHeader();`
	`678`	`+`
`676`	`679`	`// just set current tab to the main tab`
`677`	`680`	`setCurrentCode(0);`
`678`	`681`
`679`		`- // update the tabs`
`680`		`- editor.rebuildHeader();`
`681`	`682`	`}`
`682`	`683`	`}`
`683`	`684`	`}`