X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Faccessor%2Fimpl%2FDirectoryWatch.java;h=854e7e8ab9df9e39f3d8e114369fb99d9eed5fbb;hb=refs%2Fchanges%2F65%2F2565%2F2;hp=1e83fd4939bb778fb9dafe03d3abd8ab9949b5b8;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/impl/DirectoryWatch.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/impl/DirectoryWatch.java
index 1e83fd493..854e7e8ab 100644
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/impl/DirectoryWatch.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/impl/DirectoryWatch.java
@@ -1,164 +1,164 @@
-/*******************************************************************************
- * Copyright (c) 2010- Association for Decentralized Information Management in
- * Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.databoard.accessor.impl;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * DirectoryWatch monitors a directory for file additions / removals.
- * <p>
- * DirectoryWatch is used in the long wait for WatchService.   
- *
- * @author Toni Kalajainen <toni.kalajainen@vtt.fi>
- */
-public class DirectoryWatch {
-
-	public static final long POLL_INTERVAL = 10000; // seconds
-	
-	Timer timer;
-	FileFilter filter;
-	File directory;
-	List<File> knownFiles;
-	CopyOnWriteArrayList<DirectoryListener> listeners = new CopyOnWriteArrayList<DirectoryListener>();
-
-	TimerTask task = new TimerTask() { 
-		public void run() {
-			poll();
-		} 
-	};
-	
-	public DirectoryWatch(File directory, FileFilter filter) {
-		this.directory = directory;
-		this.filter = filter;
-		knownFiles = readFiles();
-		timer = new Timer(directory.toString()+" watcher", true);
-		timer.schedule(task, 1, POLL_INTERVAL);
-	}
-	
-	/**
-	 * Close the timer. 
-	 * This method does one last poll.
-	 */
-	public void close() {		
-		timer.cancel();
-		poll();
-	}
-	
-	public static class DirectoryEvent {
-		public Set<File> filesAdded = new HashSet<File>();
-		public Set<File> filesRemoved = new HashSet<File>();
-	}
-	
-	public interface DirectoryListener {
-		void onWatchEvent(DirectoryEvent e);
-	}
-	
-	public void addListener(DirectoryListener listener) {
-		listeners.add(listener);		
-	}
-	
-	public void removeListener(DirectoryListener listener) {		
-		listeners.remove(listener);
-	}
-	
-	/**
-	 * Get a snapshot of currently known files
-	 * 
-	 * @return a snapshot of files
-	 */
-	public List<File> files() {
-		return knownFiles;
-	}
-	
-	/**
-	 * Reload the directory
-	 */
-	public void refresh() {
-		poll();
-	}
-	
-	/**
-	 * Add file to the known list without reading the disk. 
-	 * The modification is void after next timer refresh. 
-	 * 
-	 * @param f
-	 */
-	public synchronized void add(File f) {
-		ArrayList<File> newList = new ArrayList<File>( knownFiles );
-		newList.add(f);
-		knownFiles = newList;
-	}
-	
-	/**
-	 * Remove file from the known list without reading the disk.
-	 * The modification is void after next timer refresh. 
-	 * 
-	 * @param f
-	 */
-	public synchronized void remove(File f) {
-		ArrayList<File> newList = new ArrayList<File>( knownFiles );
-		newList.remove(f);
-		knownFiles = newList;		
-	}
-	
-	/**
-	 * Read files
-	 * @return a list of absolute files
-	 */
-	private List<File> readFiles() {		
-		File[] files = directory.listFiles(filter);
-		List<File> newFiles = new ArrayList<File>( files.length );
-		for (File f : files) {
-//			System.out.println(f);
-//			f = f.getAbsoluteFile();
-//			System.out.println(f);
-			newFiles.add(f);		
-		}
-		return newFiles;
-	}
-	
-	/**
-	 * Read files and spawn events
-	 */
-	private synchronized void poll() {
-		DirectoryEvent e = read();
-		if (e.filesAdded.isEmpty() && e.filesRemoved.isEmpty()) return;
-		// Spawn an event
-		for (DirectoryListener l : listeners)
-			l.onWatchEvent(e);
-	}
-	
-	private DirectoryEvent read() {
-		List<File> oldFiles = knownFiles;
-		List<File> newFiles = readFiles();
-		knownFiles = newFiles;
-
-		DirectoryEvent result = new DirectoryEvent();
-		result.filesAdded.addAll(newFiles);
-		result.filesAdded.removeAll(oldFiles);
-
-		result.filesRemoved.addAll(oldFiles);
-		result.filesRemoved.removeAll(newFiles);
-		
-		return result;
-	}
-	
-}
-
+/*******************************************************************************
+ * Copyright (c) 2010- Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.databoard.accessor.impl;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * DirectoryWatch monitors a directory for file additions / removals.
+ * <p>
+ * DirectoryWatch is used in the long wait for WatchService.   
+ *
+ * @author Toni Kalajainen <toni.kalajainen@vtt.fi>
+ */
+public class DirectoryWatch {
+
+	public static final long POLL_INTERVAL = 10000; // seconds
+	
+	Timer timer;
+	FileFilter filter;
+	File directory;
+	List<File> knownFiles;
+	CopyOnWriteArrayList<DirectoryListener> listeners = new CopyOnWriteArrayList<DirectoryListener>();
+
+	TimerTask task = new TimerTask() { 
+		public void run() {
+			poll();
+		} 
+	};
+	
+	public DirectoryWatch(File directory, FileFilter filter) {
+		this.directory = directory;
+		this.filter = filter;
+		knownFiles = readFiles();
+		timer = new Timer(directory.toString()+" watcher", true);
+		timer.schedule(task, 1, POLL_INTERVAL);
+	}
+	
+	/**
+	 * Close the timer. 
+	 * This method does one last poll.
+	 */
+	public void close() {		
+		timer.cancel();
+		poll();
+	}
+	
+	public static class DirectoryEvent {
+		public Set<File> filesAdded = new HashSet<File>();
+		public Set<File> filesRemoved = new HashSet<File>();
+	}
+	
+	public interface DirectoryListener {
+		void onWatchEvent(DirectoryEvent e);
+	}
+	
+	public void addListener(DirectoryListener listener) {
+		listeners.add(listener);		
+	}
+	
+	public void removeListener(DirectoryListener listener) {		
+		listeners.remove(listener);
+	}
+	
+	/**
+	 * Get a snapshot of currently known files
+	 * 
+	 * @return a snapshot of files
+	 */
+	public List<File> files() {
+		return knownFiles;
+	}
+	
+	/**
+	 * Reload the directory
+	 */
+	public void refresh() {
+		poll();
+	}
+	
+	/**
+	 * Add file to the known list without reading the disk. 
+	 * The modification is void after next timer refresh. 
+	 * 
+	 * @param f
+	 */
+	public synchronized void add(File f) {
+		ArrayList<File> newList = new ArrayList<File>( knownFiles );
+		newList.add(f);
+		knownFiles = newList;
+	}
+	
+	/**
+	 * Remove file from the known list without reading the disk.
+	 * The modification is void after next timer refresh. 
+	 * 
+	 * @param f
+	 */
+	public synchronized void remove(File f) {
+		ArrayList<File> newList = new ArrayList<File>( knownFiles );
+		newList.remove(f);
+		knownFiles = newList;		
+	}
+	
+	/**
+	 * Read files
+	 * @return a list of absolute files
+	 */
+	private List<File> readFiles() {		
+		File[] files = directory.listFiles(filter);
+		List<File> newFiles = new ArrayList<File>( files.length );
+		for (File f : files) {
+//			System.out.println(f);
+//			f = f.getAbsoluteFile();
+//			System.out.println(f);
+			newFiles.add(f);		
+		}
+		return newFiles;
+	}
+	
+	/**
+	 * Read files and spawn events
+	 */
+	private synchronized void poll() {
+		DirectoryEvent e = read();
+		if (e.filesAdded.isEmpty() && e.filesRemoved.isEmpty()) return;
+		// Spawn an event
+		for (DirectoryListener l : listeners)
+			l.onWatchEvent(e);
+	}
+	
+	private DirectoryEvent read() {
+		List<File> oldFiles = knownFiles;
+		List<File> newFiles = readFiles();
+		knownFiles = newFiles;
+
+		DirectoryEvent result = new DirectoryEvent();
+		result.filesAdded.addAll(newFiles);
+		result.filesAdded.removeAll(oldFiles);
+
+		result.filesRemoved.addAll(oldFiles);
+		result.filesRemoved.removeAll(newFiles);
+		
+		return result;
+	}
+	
+}
+