Merge pull request #83 from Ktt-Development/drive-name-fix@4ad8b17

Fixed root names not working

Author: Katsute

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.kttdevelopment</groupId>
     <artifactId>simplehttpserver</artifactId>
-    <version>03.05.04</version>
+    <version>03.05.05</version>
     <packaging>jar</packaging>
 
     <url>https://github.com/Ktt-Development/simplehttpserver</url>

src/main/java/com/kttdevelopment/simplehttpserver/handler/FileHandler.java

@@ -24,7 +24,7 @@
  * @see SimpleHttpHandler
  * @see com.sun.net.httpserver.HttpHandler
  * @since 02.00.00
- * @version 03.05.03
+ * @version 03.05.05
  * @author Ktt Development
  */
 public class FileHandler implements SimpleHttpHandler {
@@ -49,7 +49,7 @@ public byte[] getBytes(final File file, final byte[] bytes){
 
             @Override
             public String getName(final File file){
-                return file.getName();
+                return FileHandler.this.getName(file);
             }
         };
     }
@@ -340,7 +340,7 @@ public final void addFiles(final String context, final File[] files, final ByteL
      * @author Ktt Development
      */
     public final void addDirectory(final File directory){
-        addDirectory("",directory,directory.getName(),ByteLoadingOption.LIVELOAD,false);
+        addDirectory("",directory,getName(directory),ByteLoadingOption.LIVELOAD,false);
     }
 
     /**
@@ -368,7 +368,7 @@ public final void addDirectory(final File directory){
      * @author Ktt Development
      */
     public final void addDirectory(final File directory, final boolean walk){
-        addDirectory("",directory,directory.getName(),ByteLoadingOption.LIVELOAD,walk);
+        addDirectory("",directory,getName(directory),ByteLoadingOption.LIVELOAD,walk);
     }
 
     /**
@@ -397,7 +397,7 @@ public final void addDirectory(final File directory, final boolean walk){
      * @author Ktt Development
      */
     public final void addDirectory(final File directory, final ByteLoadingOption loadingOption){
-        addDirectory("",directory,directory.getName(),loadingOption,false);
+        addDirectory("",directory,getName(directory),loadingOption,false);
     }
 
     /**
@@ -427,7 +427,7 @@ public final void addDirectory(final File directory, final ByteLoadingOption loa
      * @author Ktt Development
      */
     public final void addDirectory(final File directory, final ByteLoadingOption loadingOption, final boolean walk){
-        addDirectory("",directory,directory.getName(),loadingOption,walk);
+        addDirectory("",directory,getName(directory),loadingOption,walk);
     }
 
     /**
@@ -573,7 +573,7 @@ public final void addDirectory(final File directory, final String directoryName,
      * @author Ktt Development
      */
     public final void addDirectory(final String context, final File directory){
-        addDirectory(context,directory,directory.getName(),ByteLoadingOption.LIVELOAD,false);
+        addDirectory(context,directory,getName(directory),ByteLoadingOption.LIVELOAD,false);
     }
 
     /**
@@ -600,7 +600,7 @@ public final void addDirectory(final String context, final File directory){
      * @see #addDirectory(String, File, String, ByteLoadingOption, boolean)
      */
     public final void addDirectory(final String context, final File directory, final boolean walk){
-        addDirectory(context,directory,directory.getName(),ByteLoadingOption.LIVELOAD,walk);
+        addDirectory(context,directory,getName(directory),ByteLoadingOption.LIVELOAD,walk);
     }
 
     /**
@@ -630,7 +630,7 @@ public final void addDirectory(final String context, final File directory, final
      * @author Ktt Development
      */
     public final void addDirectory(final String context, final File directory, final ByteLoadingOption loadingOption){
-        addDirectory(context,directory,directory.getName(),loadingOption,false);
+        addDirectory(context,directory,getName(directory),loadingOption,false);
     }
 
     /**
@@ -661,7 +661,7 @@ public final void addDirectory(final String context, final File directory, final
      * @author Ktt Development
      */
     public final void addDirectory(final String context, final File directory, final ByteLoadingOption loadingOption, final boolean walk){
-        addDirectory(context,directory,directory.getName(),loadingOption,walk);
+        addDirectory(context,directory,getName(directory),loadingOption,walk);
     }
 
     /**
@@ -792,6 +792,12 @@ public final void addDirectory(final String context, final File directory, final
         }catch(final UncheckedIOException ignored){}
     }
 
+//
+
+    private String getName(final File file){
+        return file.getParentFile() == null ? file.getPath() : file.getName();
+    }
+
 //
 
     @Override