Fixed #4

2 files changed, 19 insertions, 1 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
index d1edb9b6..b8f3ab2e 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsReader.java
@@ -53,6 +53,7 @@ public class MappingsReader {
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
         JsonClass jsonClass = gson.fromJson(buf.toString(), JsonClass.class);
         load(null, jsonClass, mappings);
+        in.close();
     }
 
     public void load(ClassMapping parent, JsonClass jsonClass, Mappings mappings) {
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java
index bfd60638..4b2db9dc 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java
@@ -32,7 +32,7 @@ public class MappingsWriter {
         String[] entries = file.list();
         for (String s : entries) {
             File currentFile = new File(file.getPath(), s);
-            currentFile.delete();
+            deleteDirectory(currentFile);
         }
 
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
@@ -83,4 +83,21 @@ public class MappingsWriter {
         Collections.sort(out);
         return out;
     }
+
+    public static boolean deleteDirectory(File directory) {
+        if(directory.exists()){
+            File[] files = directory.listFiles();
+            if(null!=files){
+                for(int i=0; i<files.length; i++) {
+                    if(files[i].isDirectory()) {
+                        deleteDirectory(files[i]);
+                    }
+                    else {
+                        files[i].delete();
+                    }
+                }
+            }
+        }
+        return(directory.delete());
+    }
 }