added comments and added GLOBAL_EXTENSION

Author: Osiris-Team

src/main/java/io/github/fvarrui/javapackager/GradlePackageTask.java

@@ -15,15 +15,23 @@
 import java.util.*;
 
 public class GradlePackageTask extends DefaultTask implements PackagerFactory {
-    public PackageTask extension = new PackageTask();
+    /**
+     * This is the global javapackager instance. <br>
+     * Sadly we need to do it like this because
+     * we cannot extend {@link PackageTask} because we already
+     * extend another class. This means that this task
+     * has no properties, instead we use this extensions properties.
+     * @see PackagePlugin
+     */
+    public PackageTask extension;
     private final Project gradleProject = Context.getGradleContext().getProject();
     private List<File> outputFiles;
 
     public GradlePackageTask() throws IllegalAccessException {
         setGroup(PackagePlugin.GROUP_NAME);
         setDescription("Packages the application as a native Windows, Mac OS X or GNU/Linux executable and creates an installer");
         getOutputs().upToDateWhen(o -> false);
-        updateExtension(extension);
+        updateExtension(PackagePlugin.GLOBAL_EXTENSION);
     }
 
     public void updateExtension(PackageTask extension){
@@ -40,16 +48,6 @@ public void updateExtension(PackageTask extension){
         this.extension.assetsDir = new File(gradleProject.getProjectDir(), "assets");
     }
 
-    private List<Field> getFieldsWithAnnotation(Field[] fields, Class<? extends Annotation> annotationClass) {
-        List<Field> list = new ArrayList<>();
-        for (Field field : fields) {
-            if(field.isAnnotationPresent(annotationClass)){
-                list.add(field);
-            }
-        }
-        return list;
-    }
-
     @OutputFiles
     public List<File> getOutputFiles() {
         return outputFiles != null ? outputFiles : new ArrayList<>();

src/main/java/io/github/fvarrui/javapackager/gradle/PackagePlugin.java

@@ -16,7 +16,8 @@ public class PackagePlugin implements Plugin<Project> {
 
 	public static final String GROUP_NAME = "JavaPackager";
 	public static final String SETTINGS_EXT_NAME = "javapackager";
-	public static final String PACKAGE_TASK_NAME = "package";	
+	public static final String PACKAGE_TASK_NAME = "package";
+	public static PackageTask GLOBAL_EXTENSION;
 
 	@Override
 	public void apply(Project project) {
@@ -26,10 +27,9 @@ public void apply(Project project) {
 		project.getPluginManager().apply("java");
 		project.getPluginManager().apply("edu.sc.seis.launch4j");
 
-		PackageTask extension = project.getExtensions().create(SETTINGS_EXT_NAME, PackageTask.class);
+		GLOBAL_EXTENSION = project.getExtensions().create(SETTINGS_EXT_NAME, PackageTask.class);
 		GradlePackageTask task = (GradlePackageTask) project.getTasks().create(PACKAGE_TASK_NAME, GradlePackageTask.class).dependsOn("build");
-		task.updateExtension(extension);
-		task.getExtensions().add(SETTINGS_EXT_NAME, extension);
+		task.getExtensions().add(SETTINGS_EXT_NAME, GLOBAL_EXTENSION);
 
 		Context.getGradleContext().setLibraryTask(project.getTasks().create("launch4j_" + UUID.randomUUID(), Launch4jLibraryTask.class));
 	}