Further review fixes

EngineHub · May 21, 2023 · a9cca78 · a9cca78
1 parent 838de06
commit a9cca78
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/...src/main/java/com/sk89q/worldedit/internal/schematic/backends/DummySchematicsBackend.java b/...src/main/java/com/sk89q/worldedit/internal/schematic/backends/DummySchematicsBackend.java
@@ -19,10 +19,7 @@
 
 package com.sk89q.worldedit.internal.schematic.backends;
 
-import com.sk89q.worldedit.internal.annotation.SchematicPath;
-
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

diff --git a/...in/java/com/sk89q/worldedit/internal/schematic/backends/FileWatcherSchematicsBackend.java b/...in/java/com/sk89q/worldedit/internal/schematic/backends/FileWatcherSchematicsBackend.java
@@ -69,16 +69,16 @@ public void init() {
                 lock.writeLock().unlock();
             }
             if (event instanceof RecursiveDirectoryWatcher.FileCreatedEvent) {
-                LOGGER.info("New Schematic found: " + event.path());
+                LOGGER.debug("New Schematic found: " + event.path());
             } else if (event instanceof RecursiveDirectoryWatcher.FileDeletedEvent) {
-                LOGGER.info("Schematic deleted: " + event.path());
+                LOGGER.debug("Schematic deleted: " + event.path());
             }
         });
     }
 
     @Override
     public void uninit() {
-        directoryWatcher.stop();
+        directoryWatcher.close();
     }
 
     @Override

diff --git a/...c/main/java/com/sk89q/worldedit/internal/schematic/backends/PollingSchematicsBackend.java b/...c/main/java/com/sk89q/worldedit/internal/schematic/backends/PollingSchematicsBackend.java
@@ -70,7 +70,7 @@ private List<Path> scanFolder(Path root) {
                 }
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            LOGGER.error(e);
         }
         return pathList;
     }

diff --git a/...dedit-core/src/main/java/com/sk89q/worldedit/internal/util/RecursiveDirectoryWatcher.java b/...dedit-core/src/main/java/com/sk89q/worldedit/internal/util/RecursiveDirectoryWatcher.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.HashBiMap;
 import org.apache.logging.log4j.Logger;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.nio.file.ClosedWatchServiceException;
 import java.nio.file.Files;
@@ -40,7 +41,7 @@
  * @apiNote File and folder events might be sent multiple times. Users of this class need to employ their own
  *      deduplication!
  */
-public class RecursiveDirectoryWatcher {
+public class RecursiveDirectoryWatcher implements Closeable {
 
     /**
      * Base interface for all change events.
@@ -131,7 +132,9 @@ public void start(Consumer<DirEntryChangeEvent> eventConsumer) {
 
             try {
                 registerFolderWatchAndScanInitially(root);
-            } catch (IOException e) { e.printStackTrace(); }
+            } catch (IOException e) {
+                LOGGER.error(e);
+            }
 
             try {
                 WatchKey watchKey;
@@ -155,7 +158,9 @@ public void start(Consumer<DirEntryChangeEvent> eventConsumer) {
                             if (Files.isDirectory(path)) { // new subfolder created, create watch for it
                                 try {
                                     registerFolderWatchAndScanInitially(path);
-                                } catch (IOException e) { e.printStackTrace(); }
+                                } catch (IOException e) {
+                                    LOGGER.error(e);
+                                }
                             } else { // new file created
                                 eventConsumer.accept(new FileCreatedEvent(path));
                             }
@@ -191,20 +196,25 @@ public void start(Consumer<DirEntryChangeEvent> eventConsumer) {
     }
 
     /**
-     * Stop this RecursiveDirectoryWatcher instance and wait for it to be completely shut down.
+     * Close this RecursiveDirectoryWatcher instance and wait for it to be completely shut down.
      * @apiNote RecursiveDirectoryWatcher is not reusable!
      */
-    public void stop() {
+    @Override
+    public void close() {
         try {
             watchService.close();
-        } catch (IOException e) { e.printStackTrace(); }
+        } catch (IOException e) {
+            LOGGER.error(e);
+        }
         if (watchThread != null) {
             try {
                 watchThread.join();
-            } catch (InterruptedException e) { e.printStackTrace(); }
+            } catch (InterruptedException e) {
+                LOGGER.error(e);
+            }
             watchThread = null;
         }
         eventConsumer = null;
     }
 
-}
+}