U refactoring

Author: fvarrui

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

@@ -1,8 +1,9 @@
 package io.github.fvarrui.javapackager.packagers;
 
+import static io.github.fvarrui.javapackager.utils.CommandUtils.execute;
+
 import java.io.File;
 
-import io.github.fvarrui.javapackager.utils.CommandUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 import io.github.fvarrui.javapackager.utils.XMLUtils;
@@ -45,13 +46,13 @@ public File apply(Packager packager) throws Exception {
 		// candle wxs file
 		Logger.info("Compiling file " + wxsFile);
 		File wixobjFile = new File(assetsFolder, name + ".wixobj");
-		CommandUtils.execute("candle", "-out", wixobjFile, wxsFile);
+		execute("candle", "-out", wixobjFile, wxsFile);
 		Logger.info("WIXOBJ file generated in " + wixobjFile +  "!");
 
 		// lighting wxs file
 		Logger.info("Linking file " + wixobjFile);
 		File msiFile = new File(outputDirectory, name + "_" + version + ".msi");
-		CommandUtils.execute("light", "-spdb", "-out", msiFile, wixobjFile);
+		execute("light", "-spdb", "-out", msiFile, wixobjFile);
 
 		// setup file
 		if (!msiFile.exists()) {

src/main/java/io/github/fvarrui/javapackager/utils/CommandUtils.java

@@ -34,9 +34,9 @@ public static ExecutionResult executeWithResult(File workingDirectory, String ex
 		command.createArguments(arguments);
 		command.toString();
 
-		result.setCommandLine(command.getCommandLineAsString());
+		String commandLine = command.getCommandLineAsString();
 
-		Logger.info("Executing command: " + result.getCommandLine());
+		Logger.info("Executing command: " + commandLine);
 
 		Process process = command.execute();
 
@@ -57,6 +57,7 @@ public static ExecutionResult executeWithResult(File workingDirectory, String ex
 		output.close();
 		error.close();
 
+		result.setCommandLine(commandLine);
 		result.setOutput(outputBuffer.toString());
 		result.setError(errorBuffer.toString());
 		result.setExitCode(process.exitValue());