U fixed packagers generics

Author: fvarrui

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

@@ -20,7 +20,7 @@
  * Creates a DEB package file including all app folder's content only for 
  * GNU/Linux so app could be easily distributed on Gradle context
  */
-public class GenerateDeb extends ArtifactGenerator {
+public class GenerateDeb extends ArtifactGenerator<LinuxPackager> {
 
 	private Console console;
 
@@ -47,33 +47,31 @@ public void debug(String message) {
 	}
 
 	@Override
-	public boolean skip(Packager packager) {
+	public boolean skip(LinuxPackager packager) {
 		return !packager.getLinuxConfig().isGenerateDeb();
 	}
 
 	@Override
-	protected File doApply(Packager packager) throws Exception {
+	protected File doApply(LinuxPackager packager) throws Exception {
 
-		LinuxPackager linuxPackager = (LinuxPackager) packager;
-		
-		File assetsFolder = linuxPackager.getAssetsFolder();
-		String name = linuxPackager.getName();
-		File appFolder = linuxPackager.getAppFolder();
-		File outputDirectory = linuxPackager.getOutputDirectory();
-		String version = linuxPackager.getVersion();
-		boolean bundleJre = linuxPackager.getBundleJre();
-		String jreDirectoryName = linuxPackager.getJreDirectoryName();
-		File executable = linuxPackager.getExecutable();
+		File assetsFolder = packager.getAssetsFolder();
+		String name = packager.getName();
+		File appFolder = packager.getAppFolder();
+		File outputDirectory = packager.getOutputDirectory();
+		String version = packager.getVersion();
+		boolean bundleJre = packager.getBundleJre();
+		String jreDirectoryName = packager.getJreDirectoryName();
+		File executable = packager.getExecutable();
 		File javaFile = new File(appFolder, jreDirectoryName + "/bin/java");
 
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
-		VelocityUtils.render("linux/desktop.vtl", desktopFile, linuxPackager);
+		VelocityUtils.render("linux/desktop.vtl", desktopFile, packager);
 		Logger.info("Desktop file rendered in " + desktopFile.getAbsolutePath());
 
 		// generates deb control file from velocity template
 		File controlFile = new File(assetsFolder, "control");
-		VelocityUtils.render("linux/control.vtl", controlFile, linuxPackager);
+		VelocityUtils.render("linux/control.vtl", controlFile, packager);
 		Logger.info("Control file rendered in " + controlFile.getAbsolutePath());
 
 		// generated deb file

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

@@ -26,7 +26,7 @@ public GenerateDmg() {
 	}
 
 	@Override
-	public boolean skip(Packager packager) {
+	public boolean skip(MacPackager packager) {
 
 		if (!packager.getMacConfig().isGenerateDmg()) {
 			return true;

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

@@ -20,7 +20,7 @@ public GenerateMsi() {
 	}
 
 	@Override
-	public boolean skip(Packager packager) {
+	public boolean skip(WindowsPackager packager) {
 
 		if (!packager.getWinConfig().isGenerateMsi()) {
 			return true;

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

@@ -19,7 +19,7 @@ public GenerateMsm() {
 	}
 
 	@Override
-	public boolean skip(Packager packager) {
+	public boolean skip(WindowsPackager packager) {
 
 		if (!packager.getWinConfig().isGenerateMsm() && !packager.getWinConfig().isGenerateMsi()) {
 			return true;

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

@@ -17,7 +17,7 @@ public GeneratePkg() {
 	}
 
 	@Override
-	public boolean skip(Packager packager) {
+	public boolean skip(MacPackager packager) {
 
 		if (!packager.getMacConfig().isGeneratePkg()) {
 			return true;

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

@@ -19,35 +19,33 @@
  * Creates a RPM package file including all app folder's content only for
  * GNU/Linux so app could be easily distributed on Gradle context
  */
-public class GenerateRpm extends ArtifactGenerator {
+public class GenerateRpm extends ArtifactGenerator<LinuxPackager> {
 
 	public GenerateRpm() {
 		super("RPM package");
 	}
 
 	@Override
-	public boolean skip(Packager packager) {
+	public boolean skip(LinuxPackager packager) {
 		return !packager.getLinuxConfig().isGenerateRpm();
 	}
 
 	@Override
-	protected File doApply(Packager packager) throws Exception {
-
-		LinuxPackager linuxPackager = (LinuxPackager) packager;
-
-		File appFolder = linuxPackager.getAppFolder();
-		String name = linuxPackager.getName();
-		String version = linuxPackager.getVersion();
-		String description = linuxPackager.getDescription();
-		String organizationName = linuxPackager.getOrganizationName();
-		File outputDirectory = linuxPackager.getOutputDirectory();
-		File executable = linuxPackager.getExecutable();
-		File assetsFolder = linuxPackager.getAssetsFolder();
-		String jreDirectoryName = linuxPackager.getJreDirectoryName();
+	protected File doApply(LinuxPackager packager) throws Exception {
+
+		File appFolder = packager.getAppFolder();
+		String name = packager.getName();
+		String version = packager.getVersion();
+		String description = packager.getDescription();
+		String organizationName = packager.getOrganizationName();
+		File outputDirectory = packager.getOutputDirectory();
+		File executable = packager.getExecutable();
+		File assetsFolder = packager.getAssetsFolder();
+		String jreDirectoryName = packager.getJreDirectoryName();
 
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
-		VelocityUtils.render("linux/desktop.vtl", desktopFile, linuxPackager);
+		VelocityUtils.render("linux/desktop.vtl", desktopFile, packager);
 		Logger.info("Rendering desktop file to " + desktopFile.getAbsolutePath());
 
 		// copies desktop file to app

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

@@ -22,7 +22,7 @@ public GenerateSetup() {
 	}
 
 	@Override
-	public boolean skip(Packager packager) {
+	public boolean skip(WindowsPackager packager) {
 
 		if (!packager.getWinConfig().isGenerateSetup()) {
 			return true;

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

@@ -59,6 +59,7 @@ public class PackagerSettings {
 	protected String jreMinVersion;
 	protected Manifest manifest;
 	protected List<File> additionalModulePaths;
+	protected List<FileAssociation> fileAssociations;
 	protected File packagingJdk;
 
 	public File getPackagingJdk() {