Skip to content

Commit 798c135

Browse files
committed
U refactoring
1 parent 5a456bf commit 798c135

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
1010
import io.github.fvarrui.javapackager.model.WindowsConfig;
11+
import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
1112
import io.github.fvarrui.javapackager.packagers.AbstractCreateWindowsExe;
1213
import io.github.fvarrui.javapackager.packagers.Context;
1314
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
@@ -19,7 +20,7 @@
1920
public class CreateWindowsExeLaunch4j extends AbstractCreateWindowsExe {
2021

2122
public CreateWindowsExeLaunch4j() {
22-
super("launch4j");
23+
super(WindowsExeCreationTool.launch4j);
2324
}
2425

2526
@Override

src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExeLaunch4j.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.twdata.maven.mojoexecutor.MojoExecutor.Element;
1919

2020
import io.github.fvarrui.javapackager.model.WindowsConfig;
21+
import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
2122
import io.github.fvarrui.javapackager.packagers.AbstractCreateWindowsExe;
2223
import io.github.fvarrui.javapackager.packagers.Context;
2324
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
@@ -29,7 +30,7 @@
2930
public class CreateWindowsExeLaunch4j extends AbstractCreateWindowsExe {
3031

3132
public CreateWindowsExeLaunch4j() {
32-
super("launch4j");
33+
super(WindowsExeCreationTool.launch4j);
3334
}
3435

3536
@Override

src/main/java/io/github/fvarrui/javapackager/packagers/AbstractCreateWindowsExe.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.File;
44

55
import io.github.fvarrui.javapackager.model.Platform;
6+
import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
67
import io.github.fvarrui.javapackager.utils.FileUtils;
78
import io.github.fvarrui.javapackager.utils.VelocityUtils;
89

@@ -14,9 +15,9 @@ public abstract class AbstractCreateWindowsExe extends WindowsArtifactGenerator
1415
private File genericJar;
1516
private File genericExe;
1617

17-
public AbstractCreateWindowsExe(String outputFolderName) {
18-
super("Windows EXE");
19-
this.outputFolder = new File(Context.getContext().getBuildDir(), outputFolderName);
18+
public AbstractCreateWindowsExe(WindowsExeCreationTool tool) {
19+
super(tool.toString());
20+
this.outputFolder = new File(Context.getContext().getBuildDir(), tool.toString());
2021
}
2122

2223
public File getGenericManifest() {

src/main/java/io/github/fvarrui/javapackager/packagers/CreateWindowsExeWhy.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import io.github.fvarrui.javapackager.model.Platform;
66
import io.github.fvarrui.javapackager.model.WindowsConfig;
7+
import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
78
import io.github.fvarrui.javapackager.utils.CommandUtils;
89
import io.github.fvarrui.javapackager.utils.FileUtils;
910
import io.github.fvarrui.javapackager.utils.Logger;
@@ -15,7 +16,7 @@
1516
public class CreateWindowsExeWhy extends AbstractCreateWindowsExe {
1617

1718
public CreateWindowsExeWhy() {
18-
super("why");
19+
super(WindowsExeCreationTool.why);
1920
}
2021

2122
@Override

src/main/java/io/github/fvarrui/javapackager/packagers/CreateWindowsExeWinRun4j.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
import io.github.fvarrui.javapackager.model.Platform;
1313
import io.github.fvarrui.javapackager.model.WindowsConfig;
14+
import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
1415
import io.github.fvarrui.javapackager.utils.CommandUtils;
1516
import io.github.fvarrui.javapackager.utils.FileUtils;
1617
import io.github.fvarrui.javapackager.utils.JarUtils;
@@ -28,7 +29,7 @@ public class CreateWindowsExeWinRun4j extends AbstractCreateWindowsExe {
2829
};
2930

3031
public CreateWindowsExeWinRun4j() {
31-
super("winrun4j");
32+
super(WindowsExeCreationTool.winrun4j);
3233
}
3334

3435
@Override

0 commit comments

Comments
 (0)