Add Java 9+ module support

Author: emmanue1

src/main/java/org/jd/core/v1/api/loader/LoaderException.java

@@ -9,10 +9,10 @@
 
 
 public class LoaderException extends Exception {
-	private static final long serialVersionUID = 9506606333927794L;
-	public LoaderException() {}
-	
-	public LoaderException(String msg) { super(msg); }
+    private static final long serialVersionUID = 9506606333927794L;
+    public LoaderException() {}
 
-	public LoaderException(Throwable cause) { super(cause); }
+    public LoaderException(String msg) { super(msg); }
+
+    public LoaderException(Throwable cause) { super(cause); }
 }

src/main/java/org/jd/core/v1/api/printer/Printer.java

@@ -9,7 +9,7 @@
 
 
 public interface Printer {
-	int UNKNOWN_LINE_NUMBER = 0;
+    int UNKNOWN_LINE_NUMBER = 0;
 
     // Declaration & reference flags
     int TYPE_FLAG = 1;
@@ -27,20 +27,20 @@ public interface Printer {
     void end();
 
     void printText(String text);
-	void printNumericConstant(String constant);
-	void printStringConstant(String constant, String ownerInternalName);
-	void printKeyword(String keyword);
+    void printNumericConstant(String constant);
+    void printStringConstant(String constant, String ownerInternalName);
+    void printKeyword(String keyword);
 
     void printDeclaration(int flags, String internalTypeName, String name, String descriptor);
-	void printReference(int flags, String internalTypeName, String name, String descriptor, String ownerInternalName);
+    void printReference(int flags, String internalTypeName, String name, String descriptor, String ownerInternalName);
 
-	void indent();
-	void unindent();
-	
-	void startLine(int lineNumber);
-	void endLine();
-	void extraLine(int count);
+    void indent();
+    void unindent();
 
-	void startMarker(int type);
-	void endMarker(int type);
+    void startLine(int lineNumber);
+    void endLine();
+    void extraLine(int count);
+
+    void startMarker(int type);
+    void endMarker(int type);
 }

src/main/java/org/jd/core/v1/model/classfile/Constants.java

@@ -8,23 +8,28 @@
 package org.jd.core.v1.model.classfile;
 
 public interface Constants {
-    // Access flag for Class, Field, Method, Nested class
-    short ACC_PUBLIC       = 0x0001; // C F M N
-    short ACC_PRIVATE      = 0x0002; //   F M N
-    short ACC_PROTECTED    = 0x0004; //   F M N
-    short ACC_STATIC       = 0x0008; // C F M N
-    short ACC_FINAL        = 0x0010; // C F M N
-    short ACC_SYNCHRONIZED = 0x0020; //     M
-    short ACC_SUPER        = 0x0020; // C
-    short ACC_VOLATILE     = 0x0040; //   F
-    short ACC_BRIDGE       = 0x0040; //     M
-    short ACC_TRANSIENT    = 0x0080; //   F
-    short ACC_VARARGS      = 0x0080; //     M
-    short ACC_NATIVE       = 0x0100; //     M
-    short ACC_INTERFACE    = 0x0200; // C     N
-    short ACC_ABSTRACT     = 0x0400; // C   M N
-    short ACC_STRICT       = 0x0800; //     M
-    short ACC_SYNTHETIC    = 0x1000; // C F M N
-    short ACC_ANNOTATION   = 0x2000; // C     N
-    short ACC_ENUM         = 0x4000; // C F   N
+    // Access flags for Class, Field, Method, Nested class, Module, Module Requires, Module Exports, Module Opens
+    int ACC_PUBLIC       = 0x0001; // C  F  M  N  .  .  .  .
+    int ACC_PRIVATE      = 0x0002; // .  F  M  N  .  .  .  .
+    int ACC_PROTECTED    = 0x0004; // .  F  M  N  .  .  .  .
+    int ACC_STATIC       = 0x0008; // C  F  M  N  .  .  .  .
+    int ACC_FINAL        = 0x0010; // C  F  M  N  .  .  .  .
+    int ACC_SYNCHRONIZED = 0x0020; // .  .  M  .  .  .  .  .
+    int ACC_SUPER        = 0x0020; // C  .  .  .  .  .  .  .
+    int ACC_OPEN         = 0x0020; // .  .  .  .  Mo .  .  .
+    int ACC_TRANSITIVE   = 0x0020; // .  .  .  .  .  MR .  .
+    int ACC_VOLATILE     = 0x0040; // .  F  .  .  .  .  .  .
+    int ACC_BRIDGE       = 0x0040; // .  .  M  .  .  .  .  .
+    int ACC_STATIC_PHASE = 0x0040; // .  .  M  .  .  MR .  .
+    int ACC_TRANSIENT    = 0x0080; // .  F  .  .  .  .  .  .
+    int ACC_VARARGS      = 0x0080; // .  .  M  .  .  .  .  .
+    int ACC_NATIVE       = 0x0100; // .  .  M  .  .  .  .  .
+    int ACC_INTERFACE    = 0x0200; // C  .  .  N  .  .  .  .
+    int ACC_ABSTRACT     = 0x0400; // C  .  M  N  .  .  .  .
+    int ACC_STRICT       = 0x0800; // .  .  M  .  .  .  .  .
+    int ACC_SYNTHETIC    = 0x1000; // C  F  M  N  Mo MR ME MO
+    int ACC_ANNOTATION   = 0x2000; // C  .  .  N  .  .  .  .
+    int ACC_ENUM         = 0x4000; // C  F  .  N  .  .  .  .
+    int ACC_MODULE       = 0x8000; // C  .  .  .  .  .  .  .
+    int ACC_MANDATED     = 0x8000; // .  .  .  .  Mo MR ME MO
 }

src/main/java/org/jd/core/v1/model/classfile/attribute/AttributeMethodParameters.java

@@ -0,0 +1,20 @@
+/*
+ * 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.core.v1.model.classfile.attribute;
+
+public class AttributeMethodParameters implements Attribute {
+    protected MethodParameter[] parameters;
+
+    public AttributeMethodParameters(MethodParameter[] parameters) {
+        this.parameters = parameters;
+    }
+
+    public MethodParameter[] getParameters() {
+        return parameters;
+    }
+}

src/main/java/org/jd/core/v1/model/classfile/attribute/AttributeModule.java

@@ -0,0 +1,64 @@
+/*
+ * 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.core.v1.model.classfile.attribute;
+
+// Example: https://github.com/netroby/jdk9-dev/blob/master/jdk/src/java.management/share/classes/module-info.java
+public class AttributeModule implements Attribute {
+    protected String name;
+    protected int flags;
+    protected String version;
+
+    protected ModuleInfo[]  requires;
+    protected PackageInfo[] exports;
+    protected PackageInfo[] opens;
+    protected String[]      uses;
+    protected ServiceInfo[] provides;
+
+    public AttributeModule(String name, int flags, String version, ModuleInfo[] requires, PackageInfo[] exports, PackageInfo[] opens, String[] uses, ServiceInfo[] provides) {
+        this.name = name;
+        this.flags = flags;
+        this.version = version;
+        this.requires = requires;
+        this.exports = exports;
+        this.opens = opens;
+        this.uses = uses;
+        this.provides = provides;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getFlags() {
+        return flags;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public ModuleInfo[] getRequires() {
+        return requires;
+    }
+
+    public PackageInfo[] getExports() {
+        return exports;
+    }
+
+    public PackageInfo[] getOpens() {
+        return opens;
+    }
+
+    public String[] getUses() {
+        return uses;
+    }
+
+    public ServiceInfo[] getProvides() {
+        return provides;
+    }
+}

src/main/java/org/jd/core/v1/model/classfile/attribute/AttributeModuleMainClass.java

@@ -0,0 +1,22 @@
+/*
+ * 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.core.v1.model.classfile.attribute;
+
+import org.jd.core.v1.model.classfile.constant.ConstantClass;
+
+public class AttributeModuleMainClass implements Attribute {
+    protected ConstantClass mainClass;
+
+    public AttributeModuleMainClass(ConstantClass mainClass) {
+        this.mainClass = mainClass;
+    }
+
+    public ConstantClass getMainClass() {
+        return mainClass;
+    }
+}

src/main/java/org/jd/core/v1/model/classfile/attribute/AttributeModulePackages.java

@@ -0,0 +1,20 @@
+/*
+ * 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.core.v1.model.classfile.attribute;
+
+public class AttributeModulePackages implements Attribute {
+    protected String[] packageNames;
+
+    public AttributeModulePackages(String[] packageNames) {
+        this.packageNames = packageNames;
+    }
+
+    public String[] getPackageNames() {
+        return packageNames;
+    }
+}

src/main/java/org/jd/core/v1/model/classfile/attribute/MethodParameter.java

@@ -0,0 +1,36 @@
+/*
+ * 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.core.v1.model.classfile.attribute;
+
+public class MethodParameter {
+    protected String name;
+    protected int    access;
+
+    public MethodParameter(String name, int access) {
+        this.name = name;
+        this.access = access;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getAccess() {
+        return access;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("Parameter{name=").append(name);
+        sb.append(", access=").append(access);
+
+        return sb.append("}").toString();
+    }
+}

src/main/java/org/jd/core/v1/model/classfile/attribute/ModuleInfo.java

@@ -0,0 +1,46 @@
+/*
+ * 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.core.v1.model.classfile.attribute;
+
+public class ModuleInfo {
+    protected String name;
+    protected int flags;
+    protected String version;
+
+    public ModuleInfo(String name, int flags, String version) {
+        this.name = name;
+        this.flags = flags;
+        this.version = version;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getFlags() {
+        return flags;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("ModuleInfo{name=").append(name);
+        sb.append(", flags=").append(flags);
+
+        if (version != null) {
+            sb.append(", version=").append(version);
+        }
+
+        return sb.append("}").toString();
+    }
+}

src/main/java/org/jd/core/v1/model/classfile/attribute/PackageInfo.java

@@ -0,0 +1,46 @@
+/*
+ * 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.core.v1.model.classfile.attribute;
+
+public class PackageInfo {
+    protected String   internalName;
+    protected int flags;
+    protected String[] moduleInfoNames;
+
+    public PackageInfo(String internalName, int flags, String[] moduleInfoNames) {
+        this.internalName = internalName;
+        this.flags = flags;
+        this.moduleInfoNames = moduleInfoNames;
+    }
+
+    public String getInternalName() {
+        return internalName;
+    }
+
+    public int getFlags() {
+        return flags;
+    }
+
+    public String[] getModuleInfoNames() {
+        return moduleInfoNames;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("PackageInfo{internalName=").append(internalName);
+        sb.append(", flags=").append(flags);
+
+        if (moduleInfoNames != null) {
+            sb.append(", moduleInfoNames=").append(moduleInfoNames);
+        }
+
+        return sb.append("}").toString();
+    }
+}