Add AAR and JMOD files support

Author: emmanue1

api/src/main/java/org/jd/gui/spi/ContainerFactory.java

@@ -13,9 +13,9 @@
 import java.nio.file.Path;
 
 public interface ContainerFactory {
-	String getType();
-	
-	boolean accept(API api, Path rootPath);
-	
-	Container make(API api, Container.Entry parentEntry, Path rootPath);
+    String getType();
+
+    boolean accept(API api, Path rootPath);
+
+    Container make(API api, Container.Entry parentEntry, Path rootPath);
 }

app/src/main/java/org/jd/gui/service/fileloader/FileLoaderService.java

@@ -21,12 +21,12 @@ public class FileLoaderService {
     public static FileLoaderService getInstance() { return FILE_LOADER_SERVICE; }
 
     protected final Collection<FileLoader> providers = ExtensionService.getInstance().load(FileLoader.class);
-	
-	protected HashMap<String, FileLoader> mapProviders = new HashMap<>();
 
-	protected FileLoaderService() {
-	    for (FileLoader provider : providers) {
-	        for (String extension : provider.getExtensions()) {
+    protected HashMap<String, FileLoader> mapProviders = new HashMap<>();
+
+    protected FileLoaderService() {
+        for (FileLoader provider : providers) {
+            for (String extension : provider.getExtensions()) {
                 mapProviders.put(extension, provider);
             }
         }
@@ -37,12 +37,7 @@ public FileLoader get(API api, File file) {
         int lastDot = name.lastIndexOf('.');
         String extension = name.substring(lastDot+1);
         FileLoader provider = mapProviders.get(extension);
-
-        if ((provider != null) && provider.accept(api, file)) {
-            return provider;
-        }
-
-        return null;
+        return provider;
     }
 
     public HashMap<String, FileLoader> getMapProviders() {

app/src/main/java/org/jd/gui/service/uriloader/UriLoaderService.java

@@ -20,9 +20,9 @@ public class UriLoaderService {
 
     public static UriLoaderService getInstance() { return URI_LOADER_SERVICE; }
 
-	protected HashMap<String, UriLoader> mapProviders = new HashMap<>();
+    protected HashMap<String, UriLoader> mapProviders = new HashMap<>();
 
-	protected UriLoaderService() {
+    protected UriLoaderService() {
         Collection<UriLoader> providers = ExtensionService.getInstance().load(UriLoader.class);
 
         for (UriLoader provider : providers) {

services/src/main/java/org/jd/gui/model/container/GenericContainer.java

@@ -147,7 +147,20 @@ protected Collection<Container.Entry> loadChildrenFromDirectoryEntry() throws IO
 
                 for (Path subPath : stream) {
                     if (subPath.getNameCount() > parentNameCount) {
-                        children.add(newChildEntry(subPath));
+                        ContainerFactory containerFactory = api.getContainerFactory(subPath);
+
+                        if ((containerFactory == null) || "generic".equals(containerFactory.getType())) {
+                            children.add(newChildEntry(subPath));
+                        } else {
+                            Entry childEntry = newChildEntry(subPath);
+                            Container container = containerFactory.make(api, childEntry, subPath);
+
+                            if (container != null) {
+                                childEntry.children = container.getRoot().getChildren();
+                            }
+
+                            children.add(childEntry);
+                        }
                     }
                 }
 

services/src/main/java/org/jd/gui/model/container/JmodClassesDirectoryContainer.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * This project is distributed under the GPLv3 license.
+ * This is a Copyleft license that gives the user the right to use,
+ * copy and modify the code freely for non-commercial purposes.
+ */
+
+package org.jd.gui.model.container;
+
+import org.jd.gui.api.API;
+import org.jd.gui.api.model.Container;
+
+import java.nio.file.Path;
+
+public class JmodClassesDirectoryContainer extends GenericContainer {
+    public JmodClassesDirectoryContainer(API api, Container.Entry parentEntry, Path rootPath) {
+        super(api, parentEntry, rootPath);
+    }
+
+    public String getType() { return "jmodClassesDirectory"; }
+}

services/src/main/java/org/jd/gui/service/container/EarContainerFactoryProvider.java

@@ -18,9 +18,10 @@
 import java.nio.file.Path;
 
 public class EarContainerFactoryProvider implements ContainerFactory {
-
+    @Override
     public String getType() { return "ear"; }
 
+    @Override
     public boolean accept(API api, Path rootPath) {
         if (rootPath.toUri().toString().toLowerCase().endsWith(".ear!/")) {
             return true;
@@ -35,6 +36,7 @@ public boolean accept(API api, Path rootPath) {
         }
     }
 
+    @Override
     public Container make(API api, Container.Entry parentEntry, Path rootPath) {
         return new EarContainer(api, parentEntry, rootPath);
     }

services/src/main/java/org/jd/gui/service/container/GenericContainerFactoryProvider.java

@@ -15,12 +15,14 @@
 import java.nio.file.Path;
 
 public class GenericContainerFactoryProvider implements ContainerFactory {
+    @Override
+    public String getType() { return "generic"; }
 
-	public String getType() { return "generic"; }
+    @Override
+    public boolean accept(API api, Path rootPath) { return true; }
 
-	public boolean accept(API api, Path rootPath) { return true; }
-
-	public Container make(API api, Container.Entry parentEntry, Path rootPath) {
-		return new GenericContainer(api, parentEntry, rootPath);
-	}
+    @Override
+    public Container make(API api, Container.Entry parentEntry, Path rootPath) {
+        return new GenericContainer(api, parentEntry, rootPath);
+    }
 }

services/src/main/java/org/jd/gui/service/container/JarContainerFactoryProvider.java

@@ -18,9 +18,10 @@
 import java.nio.file.Path;
 
 public class JarContainerFactoryProvider implements ContainerFactory {
-
+    @Override
     public String getType() { return "jar"; }
 
+    @Override
     public boolean accept(API api, Path rootPath) {
         if (rootPath.toUri().toString().toLowerCase().endsWith(".jar!/")) {
             // Specification: http://docs.oracle.com/javase/6/docs/technotes/guides/jar/jar.html
@@ -36,7 +37,8 @@ public boolean accept(API api, Path rootPath) {
         }
     }
 
+    @Override
     public Container make(API api, Container.Entry parentEntry, Path rootPath) {
-		return new JarContainer(api, parentEntry, rootPath);
-	}
+        return new JarContainer(api, parentEntry, rootPath);
+    }
 }

services/src/main/java/org/jd/gui/service/container/JmodClassesDirectoryContainerFactoryProvider.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2008-2019 Emmanuel Dupuy.
+ * This project is distributed under the GPLv3 license.
+ * This is a Copyleft license that gives the user the right to use, 
+ * copy and modify the code freely for non-commercial purposes.
+ */
+
+package org.jd.gui.service.container;
+
+import org.jd.gui.api.API;
+import org.jd.gui.api.model.Container;
+import org.jd.gui.model.container.JmodClassesDirectoryContainer;
+import org.jd.gui.spi.ContainerFactory;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class JmodClassesDirectoryContainerFactoryProvider implements ContainerFactory {
+    @Override
+    public String getType() { return "jmodClassesDirectory"; }
+
+    @Override
+    public boolean accept(API api, Path rootPath) {
+        if (Files.isDirectory(rootPath)) {
+            Path fileName = rootPath.getFileName();
+
+            if ((fileName != null) && "classes".equals(rootPath.getFileName().toString())) {
+                String fileStoreName = rootPath.getFileSystem().getFileStores().iterator().next().name();
+                return  fileStoreName.endsWith(".jmod/");
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public Container make(API api, Container.Entry parentEntry, Path rootPath) {
+        return new JmodClassesDirectoryContainer(api, parentEntry, rootPath);
+    }
+}

services/src/main/java/org/jd/gui/service/container/WarContainerFactoryProvider.java

@@ -18,9 +18,10 @@
 import java.nio.file.Path;
 
 public class WarContainerFactoryProvider implements ContainerFactory {
-
+    @Override
     public String getType() { return "war"; }
 
+    @Override
     public boolean accept(API api, Path rootPath) {
         if (rootPath.toUri().toString().toLowerCase().endsWith(".war!/")) {
             return true;
@@ -35,6 +36,7 @@ public boolean accept(API api, Path rootPath) {
         }
     }
 
+    @Override
     public Container make(API api, Container.Entry parentEntry, Path rootPath) {
         return new WarContainer(api, parentEntry, rootPath);
     }