Code formatting and small cleanups.

briar-desktop/src/org/briarproject/plugins/file/UnixRemovableDriveMonitor.java

@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -23,11 +22,11 @@ JNotifyListener {
 	private Callback callback = null;
 
 	protected abstract String[] getPathsToWatch();
-	
+
 	//TODO: rationalise this in a further refactor
 	private final Lock synchLock = new ReentrantLock();
 	private static final Lock staticSynchLock = new ReentrantLock();
-	
+
 	private static Throwable tryLoad() {
 		try {
 			Class.forName("net.contentobjects.jnotify.JNotify");
@@ -47,8 +46,7 @@ JNotifyListener {
 				triedLoad = true;
 			}
 			if(loadError != null) throw new IOException(loadError.toString());
-		} 
-		finally{
+		} finally {
 			staticSynchLock.unlock();
 		}
 	}
@@ -61,46 +59,43 @@ JNotifyListener {
 			if(new File(path).exists())
 				watches.add(JNotify.addWatch(path, mask, false, this));
 		}
-			synchLock.lock();
-			try {
-				assert !started;
-				assert this.callback == null;
-				started = true;
-				this.callback = callback;
-				this.watches.addAll(watches);
-			} 
-			finally{
-				synchLock.unlock();
-			}
+		synchLock.lock();
+		try {
+			assert !started;
+			assert this.callback == null;
+			started = true;
+			this.callback = callback;
+			this.watches.addAll(watches);
+		} finally {
+			synchLock.unlock();
+		}
 	}
 
 	public void stop() throws IOException {
 		checkEnabled();
 		List<Integer> watches;
-			synchLock.lock();
-			try {
-				assert started;
-				assert callback != null;
-				started = false;
-				callback = null;
-				watches = new ArrayList<Integer>(this.watches);
-				this.watches.clear();
-			} 
-			finally{
-				synchLock.unlock();
-			}
+		synchLock.lock();
+		try {
+			assert started;
+			assert callback != null;
+			started = false;
+			callback = null;
+			watches = new ArrayList<Integer>(this.watches);
+			this.watches.clear();
+		} finally {
+			synchLock.unlock();
+		}
 		for(Integer w : watches) JNotify.removeWatch(w);
 	}
 
 	public void fileCreated(int wd, String rootPath, String name) {
 		Callback callback;
-			synchLock.lock();
-			try {
-				callback = this.callback;
-			} 
-			finally{
-				synchLock.unlock();
-			}
+		synchLock.lock();
+		try {
+			callback = this.callback;
+		} finally {
+			synchLock.unlock();
+		}
 		if(callback != null)
 			callback.driveInserted(new File(rootPath + "/" + name));
 	}