watcher: move repaint to main thread

Author: facchinm

Diff for: app/src/processing/app/Editor.java

@@ -242,6 +242,7 @@ public void windowActivated(WindowEvent e) {
             watcher = null;
           }
           base.handleActivated(Editor.this);
+          getTabs().forEach(tab -> tab.reload());
         }
 
         // added for 1.0.5
@@ -1723,6 +1724,9 @@ public synchronized void addTab(SketchFile file, String contents) throws IOExcep
   public synchronized void removeTab(SketchFile file) throws IOException {
     int index = findTabIndex(file);
     tabs.remove(index);
+    if (index == currentTabIndex) {
+      currentTabIndex = currentTabIndex -1;
+    }
   }
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

Diff for: app/src/processing/app/tools/WatchDir.java

@@ -153,18 +153,15 @@ public void processEvents(Editor editor) {
                     }
                   } catch (IOException e) {}
                 } else if (kind == ENTRY_DELETE) {
-                  List<EditorTab> tabs = editor.getTabs();
-                  Iterator<EditorTab> iter = tabs.iterator();
-                  while (iter.hasNext()) {
-                    EditorTab tab = iter.next();
-                    if (name.getFileName().toString().equals(tab.getSketchFile().getFileName())) {
-                      try {
-                        editor.removeTab(tab.getSketchFile());
-                      } catch (IOException e) {}
-                    }
+                  try {
+                    Thread.sleep(100);
+                    int index = editor.getSketch().findFileIndex(child.toAbsolutePath().toFile());
+                    editor.removeTab(editor.getSketch().getFile(index));
+                  } catch (Exception e1) {
+                    // Totally fine, if the sleep gets interrupted it means that
+                    // the action was executed in the UI, not externally
                   }
                 }
-                editor.getTabs().forEach(tab -> tab.reload());
 
                 // if directory is created, and watching recursively, then
                 // register it and its sub-directories