move watcher to Editor instance

Author: facchinm

app/src/processing/app/Editor.java

@@ -44,6 +44,7 @@
 import processing.app.syntax.SketchTextArea;
 import processing.app.tools.MenuScroller;
 import processing.app.tools.Tool;
+import processing.app.tools.WatchDir;
 
 import javax.swing.*;
 import javax.swing.event.*;
@@ -72,11 +73,19 @@
 import static processing.app.I18n.tr;
 import static processing.app.Theme.scale;
 
+import static java.nio.file.StandardWatchEventKinds.*;
+import java.nio.file.WatchService;
+import java.nio.file.WatchKey;
+import java.nio.file.WatchEvent;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.io.File;
+
 /**
  * Main editor panel for the Processing Development Environment.
  */
 @SuppressWarnings("serial")
-public class Editor extends JFrame implements RunnerListener {
+public class Editor extends JFrame implements RunnerListener, FocusListener {
 
   public static final int MAX_TIME_AWAITING_FOR_RESUMING_SERIAL_MONITOR = 10000;
 
@@ -198,6 +207,9 @@ public boolean test(SketchController sketch) {
   private Runnable exportAppHandler;
   private Runnable timeoutUploadHandler;
 
+  protected Thread watcher = null;
+  protected Runnable task = null;
+
   public Editor(Base ibase, File file, int[] storedLocation, int[] defaultLocation, Platform platform) throws Exception {
     super("Arduino");
     this.base = ibase;
@@ -341,6 +353,21 @@ public void windowDeactivated(WindowEvent e) {
     if (!loaded) sketchController = null;
   }
 
+  @Override
+  public void focusGained(FocusEvent fe){
+    if (watcher != null) {
+      watcher.interrupt();
+      watcher = null;
+    }
+  }
+
+  @Override
+  public void focusLost(FocusEvent fe){
+    if (watcher == null) {
+      watcher = new Thread(task);
+      watcher.start();
+    }
+  }
 
   /**
    * Handles files dragged & dropped from the desktop and into the editor
@@ -1649,7 +1676,7 @@ public void reorderTabs() {
    *          the given file.
    * @throws IOException
    */
-  protected void addTab(SketchFile file, String contents) throws IOException {
+  public void addTab(SketchFile file, String contents) throws IOException {
     EditorTab tab = new EditorTab(this, file, contents);
     tab.getTextArea().getDocument()
         .addDocumentListener(new DocumentTextChangeListener(
@@ -1658,7 +1685,7 @@ protected void addTab(SketchFile file, String contents) throws IOException {
     reorderTabs();
   }
 
-  protected void removeTab(SketchFile file) throws IOException {
+  public void removeTab(SketchFile file) throws IOException {
     int index = findTabIndex(file);
     tabs.remove(index);
   }
@@ -1927,6 +1954,25 @@ protected boolean handleOpenInternal(File sketchFile) {
     // Disable untitled setting from previous document, if any
     untitled = false;
 
+	// Add FS watcher for current Editor instance
+    Path dir = file.toPath().getParent();
+
+	Editor instance = this;
+
+    task = new Runnable() {
+      public void run() {
+        try {
+          new WatchDir(dir, true).processEvents(instance);
+        } catch (IOException x) {
+          System.err.println(x);
+        }
+      }
+    };
+
+    addFocusListener(this);
+    getTabs().forEach(tab -> tab.getScrollPane().addFocusListener(this));
+    getTabs().forEach(tab -> tab.getTextArea().addFocusListener(this));
+
     // opening was successful
     return true;
   }

app/src/processing/app/EditorTab.java

@@ -75,16 +75,14 @@
 /**
  * Single tab, editing a single file, in the main window.
  */
-public class EditorTab extends JPanel implements SketchFile.TextStorage, FocusListener {
+public class EditorTab extends JPanel implements SketchFile.TextStorage {
   protected Editor editor;
   protected SketchTextArea textarea;
   protected RTextScrollPane scrollPane;
   protected SketchFile file;
   protected boolean modified;
   /** Is external editing mode currently enabled? */
   protected boolean external;
-  protected Thread watcher = null;
-  protected Runnable task = null;
 
   /**
    * Create a new EditorTab
@@ -119,29 +117,10 @@ public EditorTab(Editor editor, SketchFile file, String contents)
     file.setStorage(this);
     applyPreferences();
     add(scrollPane, BorderLayout.CENTER);
-    addFocusListener(this);
-    textarea.addFocusListener(this);
-    scrollPane.addFocusListener(this);
     setFocusable(true);
     setRequestFocusEnabled(true);
   }
 
-  @Override
-  public void focusGained(FocusEvent fe){
-    if (watcher != null) {
-      watcher.interrupt();
-      watcher = null;
-    }
-  }
-
-  @Override
-  public void focusLost(FocusEvent fe){
-    if (watcher == null) {
-      watcher = new Thread(task);
-      watcher.start();
-    }
-  }
-
   private RSyntaxDocument createDocument(String contents) {
     RSyntaxDocument document = new RSyntaxDocument(new ArduinoTokenMakerFactory(editor.base.getPdeKeywords()), RSyntaxDocument.SYNTAX_STYLE_CPLUSPLUS);
     document.putProperty(PlainDocument.tabSizeAttribute, PreferencesData.getInteger("editor.tabs.size"));
@@ -155,24 +134,6 @@ private RSyntaxDocument createDocument(String contents) {
     document.addDocumentListener(new DocumentTextChangeListener(
         () -> setModified(true)));
 
-    // Add FS watcher for modification
-    File dir_s = this.file.getFile();
-    Path dir = dir_s.toPath().getParent();
-    EditorTab tab = this;
-
-    task = new Runnable() {
-      public void run() {
-        try {
-          new WatchDir(dir, true).processEvents(tab);
-        } catch (IOException x) {
-          System.err.println(x);
-        }
-      }
-    };
-
-    watcher = new Thread(task);
-    watcher.start();
-
     return document;
   }
 
@@ -509,7 +470,11 @@ public void setSelection(int start, int stop) {
   public int getScrollPosition() {
     return scrollPane.getVerticalScrollBar().getValue();
   }
-    
+
+  public RTextScrollPane getScrollPane() {
+    return scrollPane;
+  }
+
   public void setScrollPosition(int pos) {
     scrollPane.getVerticalScrollBar().setValue(pos);
   }

app/src/processing/app/tools/WatchDir.java

@@ -37,7 +37,10 @@
 import java.nio.file.attribute.*;
 import java.io.*;
 import java.util.*;
-import processing.app.EditorTab;
+import processing.app.Editor;
+import processing.app.Sketch;
+import processing.app.SketchFile;
+import processing.app.helpers.FileUtils;
 
 /**
  * Example to watch a directory (or tree) for changes to files.
@@ -109,7 +112,7 @@ public WatchDir(Path dir, boolean recursive) throws IOException {
     /**
      * Process all events for keys queued to the watcher
      */
-    public void processEvents(EditorTab tab) {
+    public void processEvents(Editor editor) {
         for (;;) {
 
             // wait for key to be signalled
@@ -139,7 +142,26 @@ public void processEvents(EditorTab tab) {
                 Path child = dir.resolve(name);
 
                 // reload the tab content
-                tab.reload();
+                if (kind == ENTRY_CREATE) {
+					try {
+						String filename = name.toString();
+						FileUtils.SplitFile split = FileUtils.splitFilename(filename);
+						if (Sketch.EXTENSIONS.contains(split.extension.toLowerCase())) {
+							SketchFile sketch = editor.getSketch().addFile(filename);
+							editor.addTab(sketch, null);
+						}
+					} catch (IOException e) {}
+                } else if (kind == ENTRY_DELETE) {
+					editor.getTabs().forEach(tab -> {
+						try {
+							if (name.getFileName().toString() == tab.getSketchFile().getFileName()) {
+								editor.removeTab(tab.getSketchFile());
+							}
+						} catch (IOException x) {}
+					});
+				} else {
+					editor.getTabs().forEach(tab -> tab.reload());
+				}
 
                 // if directory is created, and watching recursively, then
                 // register it and its sub-directories
@@ -166,4 +188,4 @@ public void processEvents(EditorTab tab) {
             }
         }
     }
-}
+}