X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FFileScanner.java;h=cfb0c238a286685fe9106caec9bbd22432dc2f0d;hb=967018cd81182ec2fd4f941e271137aadbaa6d81;hp=1790fbfc60a9eb1021c6a66b84c9b71dea278059;hpb=0e88169c3e8decfcd99f39f5ecf3a85df50c3fca;p=jSite.git

diff --git a/src/main/java/de/todesbaum/jsite/gui/FileScanner.java b/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
index 1790fbf..cfb0c23 100644
--- a/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
+++ b/src/main/java/de/todesbaum/jsite/gui/FileScanner.java
@@ -23,7 +23,6 @@ import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -33,10 +32,11 @@ import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.util.io.Closer;
+import net.pterodactylus.util.io.NullOutputStream;
+import net.pterodactylus.util.io.StreamCopier;
 import de.todesbaum.jsite.application.Project;
 import de.todesbaum.jsite.i18n.I18n;
-import de.todesbaum.util.io.Closer;
-import de.todesbaum.util.io.StreamCopier;
 
 /**
  * Scans the local path of a project anychronously and returns the list of found
@@ -110,6 +110,7 @@ public class FileScanner implements Runnable {
 	 *
 	 * @see FileScannerListener#fileScannerFinished(FileScanner)
 	 */
+	@Override
 	public void run() {
 		files = new ArrayList<ScannedFile>();
 		error = false;
@@ -154,6 +155,7 @@ public class FileScanner implements Runnable {
 	private void scanFiles(File rootDir, List<ScannedFile> fileList) throws IOException {
 		File[] files = rootDir.listFiles(new FileFilter() {
 
+			@Override
 			@SuppressWarnings("synthetic-access")
 			public boolean accept(File file) {
 				return !project.isIgnoreHiddenFiles() || !file.isHidden();
@@ -182,7 +184,6 @@ public class FileScanner implements Runnable {
 	 *            The name of the file, relative to the project path
 	 * @return The hash of the file
 	 */
-	@SuppressWarnings("synthetic-access")
 	private static String hashFile(String path, String filename) {
 		InputStream fileInputStream = null;
 		DigestOutputStream digestOutputStream = null;
@@ -219,39 +220,6 @@ public class FileScanner implements Runnable {
 	}
 
 	/**
-	 * {@link OutputStream} that discards all written bytes.
-	 *
-	 * @author David ‘Bombe’ Roden &lt;bombe@freenetproject.org&gt;
-	 */
-	private static class NullOutputStream extends OutputStream {
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public void write(int b) {
-			/* do nothing. */
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public void write(byte[] b) {
-			/* do nothing. */
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		@Override
-		public void write(byte[] b, int off, int len) {
-			/* do nothing. */
-		}
-
-	}
-
-	/**
 	 * Container for a scanned file, consisting of the name of the file and its
 	 * hash.
 	 *
@@ -335,6 +303,7 @@ public class FileScanner implements Runnable {
 		/**
 		 * {@inheritDoc}
 		 */
+		@Override
 		public int compareTo(ScannedFile scannedFile) {
 			return filename.compareTo(scannedFile.filename);
 		}