eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3262 from pvrs12/file-change-detection-3222

Browse Source 
Added buffer to file detection time
This commit is contained in:
Ben Fry
2015-05-11 18:05:17 -04:00
parent 1b36cb699a b91a8e8679
commit f48648a264
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/ChangeDetector.java
+10 -2
View File
@@ -14,6 +14,8 @@ import javax.swing.JOptionPane;
public class ChangeDetector implements WindowFocusListener {
private Sketch sketch;
private Editor editor;
private final int MODIFIED_TIME_BUFFER = 1000;
// Set true if the user selected 'no'. TODO this can't just skip once,
// because subsequent returns to the window w/o saving will keep firing.
@@ -103,18 +105,24 @@ public class ChangeDetector implements WindowFocusListener {
return;
}
SketchCode[] codes = sketch.getCode();
for (SketchCode sc : codes) {
File sketchFile = sc.getFile();
if (sketchFile.exists()) {
long diff = sketchFile.lastModified() - sc.lastModified();
if (diff != 0) {
if (Base.isMacOS() && diff == 1000L) {
if (Base.isMacOS() && diff < 1000L + MODIFIED_TIME_BUFFER) {
// System.err.println("within buffer mac");
// Mac OS X has a one second difference. Not sure if it's a Java bug
// or something else about how OS X is writing files.
continue;
} else if (diff < MODIFIED_TIME_BUFFER) {
//if the file was modified within some reasonable time, then ignore it
// System.err.println("within buffer not mac");
continue;
}
System.out.println(sketchFile.getName() + " " + diff);
// System.out.println(sketchFile.getName() + " " + diff);
reloadSketch(sc);
return;
}