Skip to content

Commit 811646b

Browse files
committed
code cleanup
1 parent 798854f commit 811646b

File tree

4 files changed

+170
-114
lines changed

4 files changed

+170
-114
lines changed

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,37 @@
66
import io.github.fvarrui.javapackager.model.*;
77
import io.github.fvarrui.javapackager.packagers.Context;
88
import io.github.fvarrui.javapackager.packagers.Packager;
9-
import org.gradle.api.*;
10-
import org.gradle.api.tasks.*;
9+
import org.gradle.api.DefaultTask;
10+
import org.gradle.api.Project;
11+
import org.gradle.api.tasks.OutputFiles;
12+
import org.gradle.api.tasks.TaskAction;
1113

1214
import java.io.File;
13-
import java.lang.annotation.Annotation;
14-
import java.lang.reflect.Field;
15-
import java.util.*;
15+
import java.util.ArrayList;
16+
import java.util.List;
1617

1718
public class GradlePackageTask extends DefaultTask implements PackagerFactory {
19+
private final Project gradleProject = Context.getGradleContext().getProject();
1820
/**
1921
* This is the global javapackager extension instance. <br>
2022
* Sadly we need to do it like this because
2123
* we cannot extend {@link PackageTask} because we already
2224
* extend another class. This means that this task
2325
* has no properties, instead we use this extensions properties.
26+
*
2427
* @see PackagePlugin
2528
*/
2629
public PackageTask extension;
27-
private final Project gradleProject = Context.getGradleContext().getProject();
2830
private List<File> outputFiles;
2931

30-
public GradlePackageTask() throws IllegalAccessException {
32+
public GradlePackageTask() {
3133
setGroup(PackagePlugin.GROUP_NAME);
3234
setDescription("Packages the application as a native Windows, Mac OS X or GNU/Linux executable and creates an installer");
3335
getOutputs().upToDateWhen(o -> false);
3436
updateExtension(PackagePlugin.GLOBAL_EXTENSION);
3537
}
3638

37-
public void updateExtension(PackageTask extension){
39+
public void updateExtension(PackageTask extension) {
3840
this.extension = extension;
3941
// Defaults specific to gradle
4042
this.extension.outputDirectory = gradleProject.getBuildDir();
@@ -55,6 +57,7 @@ public List<File> getOutputFiles() {
5557

5658
/**
5759
* Packaging task action
60+
*
5861
* @throws Exception Throwed if something went wrong
5962
*/
6063
@TaskAction

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
4848
}
4949
}
5050

51-
public void setLog(Log log) {
52-
this.log = log;
53-
}
54-
5551
public Log getLog() {
5652
if (this.log == null) {
5753
this.log = new SystemStreamLog();
@@ -60,6 +56,10 @@ public Log getLog() {
6056
return this.log;
6157
}
6258

59+
public void setLog(Log log) {
60+
this.log = log;
61+
}
62+
6363
public Map getPluginContext() {
6464
return this.pluginContext;
6565
}

0 commit comments

Comments
 (0)