diff -r a9b41094a261 masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java --- a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java Thu Aug 20 17:55:11 2009 +0200 +++ b/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java Thu Aug 20 23:28:16 2009 +0200 @@ -203,6 +203,17 @@ public final boolean isRoot() { return false; } + + public final java.util.Date lastModified() { + final File f = getFileName().getFile(); + final long lastModified = f.lastModified(); + + final FolderObj fo = getExistingParent(); + if (fo != null) { + fo.storeTimeStamps(lastModified); + } + return new Date(lastModified); + } @Override public final FileObject move(FileLock lock, FileObject target, String name, String ext) throws IOException { diff -r a9b41094a261 masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObj.java --- a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObj.java Thu Aug 20 17:55:11 2009 +0200 +++ b/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObj.java Thu Aug 20 23:28:16 2009 +0200 @@ -210,11 +210,6 @@ return super.canWrite(); } - public final Date lastModified() { - final File f = getFileName().getFile(); - return new Date(f.lastModified()); - } - final void setLastModified(long lastModified) { if (this.lastModified != 0) { // #130998 - don't set when already invalidated if (this.lastModified != -1 && !realLastModifiedCached) { diff -r a9b41094a261 masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObj.java --- a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObj.java Thu Aug 20 17:55:11 2009 +0200 +++ b/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObj.java Thu Aug 20 23:28:16 2009 +0200 @@ -49,6 +49,7 @@ import java.io.SyncFailedException; import java.util.ArrayList; import java.util.Date; +import java.util.Enumeration; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; @@ -62,6 +63,7 @@ import org.netbeans.modules.masterfs.filebasedfs.FileBasedFileSystem.FSCallable; import org.netbeans.modules.masterfs.filebasedfs.children.ChildrenCache; import org.netbeans.modules.masterfs.filebasedfs.children.ChildrenSupport; +import org.netbeans.modules.masterfs.filebasedfs.fileobjects.FileObjectFactory.Caller; import org.netbeans.modules.masterfs.filebasedfs.naming.FileName; import org.netbeans.modules.masterfs.filebasedfs.naming.FileNaming; import org.netbeans.modules.masterfs.filebasedfs.naming.NamingFactory; @@ -82,7 +84,8 @@ private static final Mutex mutex = new Mutex(FolderObj.mp); private FolderChildrenCache folderChildren; - boolean valid = true; + boolean valid = true; + private long childrenStamps = -1; /** * Creates a new instance of FolderImpl @@ -330,9 +333,18 @@ } } + final void storeTimeStamps(long lastModified) { + if (lastModified > childrenStamps) { + childrenStamps = lastModified; + } + } + + + public void refreshImpl(final boolean expected, boolean fire) { final ChildrenCache cache = getChildrenCache(); final Mutex.Privileged mutexPrivileged = cache.getMutexPrivileged(); + final long previous = childrenStamps; Set oldChildren = null; Map refreshResult = null; @@ -412,6 +424,24 @@ fireFileDeletedEvent(expected); } } + + if (childrenStamps > 0) { + long highest = 0; + final File[] arr = getFileName().getFile().listFiles(); + if (arr != null) { + for (File f : arr) { + final long time = f.lastModified(); + if (time > highest) { + highest = time; + } + if (time > previous) { + BaseFileObj who = factory.getValidFileObject(f, Caller.Others); + who.fireFileChangedEvent(false); + } + childrenStamps = highest; + } + } + } } @Override @@ -487,10 +517,6 @@ throw new IOException(getPath()); } - public final java.util.Date lastModified() { - final File f = getFileName().getFile(); - return new Date(f.lastModified()); - } public final FileLock lock() throws IOException { return new FileLock(); diff -r a9b41094a261 masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/ReplaceForSerialization.java --- a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/ReplaceForSerialization.java Thu Aug 20 17:55:11 2009 +0200 +++ b/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/ReplaceForSerialization.java Thu Aug 20 23:28:16 2009 +0200 @@ -91,10 +91,6 @@ return false; } - public Date lastModified() { - return new Date(0L); - } - /* Test whether the file is valid. The file can be invalid if it has been deserialized * and the file no longer exists on disk; or if the file has been deleted. * diff -r a9b41094a261 masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/ExternalTouchTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/ExternalTouchTest.java Thu Aug 20 23:28:16 2009 +0200 @@ -0,0 +1,185 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * Contributor(s): + * + * The Original Software is NetBeans. The Initial Developer of the Original + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2009 Sun + * Microsystems, Inc. All Rights Reserved. + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + */ +package org.netbeans.modules.masterfs.filebasedfs.fileobjects; + +import java.io.File; +import java.io.FileOutputStream; +import java.lang.ref.Reference; +import java.lang.ref.WeakReference; +import java.util.Date; +import org.netbeans.junit.NbTestCase; +import org.openide.filesystems.FileChangeAdapter; +import org.openide.filesystems.FileEvent; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; + +public class ExternalTouchTest extends NbTestCase { + + public ExternalTouchTest(String testName) { + super(testName); + } + + public void testChangeInChildrenNoticed() throws Exception { + clearWorkDir(); + FileObject testFolder = FileUtil.toFileObject(getWorkDir()); + + FileObject fileObject1 = testFolder.createData("fileObject1"); + final Date lm = fileObject1.lastModified(); + assertNotNull("Just to initialize the stamp", lm); + FileObject[] arr = testFolder.getChildren(); + assertEquals("One child", 1, arr.length); + assertEquals("Right child", fileObject1, arr[0]); + + File file = FileUtil.toFile(fileObject1); + assertNotNull("File found", file); + Reference ref = new WeakReference(fileObject1); + arr = null; + fileObject1 = null; + assertGC("File Object can disappear", ref); + + Thread.sleep(1000); + + class L extends FileChangeAdapter { + int cnt; + FileEvent event; + + @Override + public void fileChanged(FileEvent fe) { + cnt++; + event = fe; + } + } + L listener = new L(); + testFolder.addFileChangeListener(listener); + + FileOutputStream os = new FileOutputStream(file); + os.write(10); + os.close(); + + if (lm.getTime() > file.lastModified() - 50) { + fail("New modification time shall be at last 50ms after the original one: " + (file.lastModified() - lm.getTime())); + } + + testFolder.refresh(); + + assertEquals("Change notified", 1, listener.cnt); + assertEquals("Right file", file, FileUtil.toFile(listener.event.getFile())); + } + public void testNewChildNoticed() throws Exception { + clearWorkDir(); + FileObject testFolder = FileUtil.toFileObject(getWorkDir()); + FileObject fileObject1 = testFolder.createData("fileObject1"); + assertNotNull("Just to initialize the stamp", fileObject1.lastModified()); + FileObject[] arr = testFolder.getChildren(); + assertEquals("One child", 1, arr.length); + assertEquals("Right child", fileObject1, arr[0]); + + File file = FileUtil.toFile(fileObject1); + assertNotNull("File found", file); + arr = null; + fileObject1 = null; + Reference ref = new WeakReference(fileObject1); + assertGC("File Object can disappear", ref); + + Thread.sleep(100); + + class L extends FileChangeAdapter { + int cnt; + FileEvent event; + + @Override + public void fileDataCreated(FileEvent fe) { + cnt++; + event = fe; + } + + } + L listener = new L(); + testFolder.addFileChangeListener(listener); + + File nfile = new File(file.getParentFile(), "new.txt"); + nfile.createNewFile(); + + testFolder.refresh(); + + assertEquals("Change notified", 1, listener.cnt); + assertEquals("Right file", nfile, FileUtil.toFile(listener.event.getFile())); + } + public void testDeleteOfAChildNoticed() throws Exception { + clearWorkDir(); + FileObject testFolder = FileUtil.toFileObject(getWorkDir()); + FileObject fileObject1 = testFolder.createData("fileObject1"); + assertNotNull("Just to initialize the stamp", fileObject1.lastModified()); + FileObject[] arr = testFolder.getChildren(); + assertEquals("One child", 1, arr.length); + assertEquals("Right child", fileObject1, arr[0]); + + File file = FileUtil.toFile(fileObject1); + assertNotNull("File found", file); + arr = null; + fileObject1 = null; + Reference ref = new WeakReference(fileObject1); + assertGC("File Object can disappear", ref); + + Thread.sleep(100); + + class L extends FileChangeAdapter { + int cnt; + FileEvent event; + + @Override + public void fileDeleted(FileEvent fe) { + cnt++; + event = fe; + } + + } + L listener = new L(); + testFolder.addFileChangeListener(listener); + + file.delete(); + + testFolder.refresh(); + + assertEquals("Change notified", 1, listener.cnt); + assertEquals("Right file", file, FileUtil.toFile(listener.event.getFile())); + } +}