Merge pull request #58 from IDATT2003-gruppe06/jar-file-support

Jar file support

pom.xml

@@ -30,6 +30,26 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.6.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>millions.Main</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

src/main/java/millions/Main.java

@@ -0,0 +1,7 @@
+package millions;
+
+public class Main {
+  public static void main(String[] args) {
+    App.main(args);
+  }
+}

src/main/java/millions/controller/GameController.java

@@ -29,8 +29,8 @@ public void startGame(
       throw new IllegalArgumentException("Pre run weeks cannot be negative");
     }
     try {
-      CSVFileHandler fileHandler = new CSVFileHandler();
-      List<Stock> stocks = fileHandler.getStocksFromFile(stockFilePath);
+      CSVFileHandler csvFileHandler = new CSVFileHandler();
+      List<Stock> stocks = csvFileHandler.getStocksFromFile(stockFilePath);
 
       exchange = new Exchange("Exchange", stocks);
       for (int i = 0; i < preRunWeeks; i++) {
@@ -39,10 +39,10 @@ public void startGame(
 
       player = new Player(name, startingMoney);
 
-    } catch (FileNotFoundException e) {
-      throw new UncheckedFileNotFoundException(e.getMessage());
     } catch (InvalidFormatException e) {
       throw new InvalidFormatException(e.getMessage());
+    } catch (FileNotFoundException e) {
+      throw new UncheckedFileNotFoundException(e.getMessage());
     }
   }
 

src/main/java/millions/controller/fileIO/CSV/InternalResourceUtil.java

@@ -0,0 +1,19 @@
+package millions.controller.fileIO.CSV;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+
+public class InternalResourceUtil {
+  public File getFileFromJar(InputStream resource) throws IOException {
+    if (resource == null) {
+      throw new IOException("Resource not found is null");
+    }
+    File tempFile = File.createTempFile("javafx_app_", ".tmp");
+    tempFile.deleteOnExit();
+    Files.copy(resource, tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+    return tempFile;
+  }
+}

src/main/java/millions/view/StartView.java

@@ -1,6 +1,8 @@
 package millions.view;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -17,6 +19,7 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
+import millions.controller.fileIO.CSV.InternalResourceUtil;
 
 /** The initial game setup screen where the player enters their info. */
 public class StartView extends VBox {
@@ -107,12 +110,13 @@ public StartView(Stage stage) {
 
   private File loadDefaultStocksFile() {
     try {
-      URL resource = Objects.requireNonNull(getClass().getResource("/data/default-stocks.csv"));
-      return Paths.get(resource.toURI()).toFile();
-    } catch (URISyntaxException e) {
-      logger.log(Level.SEVERE, "Error accessing default stocks file", e);
-      throw new IllegalStateException("Could not load default stocks file", e);
+      InputStream resource = Objects.requireNonNull(getClass().getResourceAsStream("/data/default-stocks.csv"));
+      InternalResourceUtil converter =  new InternalResourceUtil();
+      return converter.getFileFromJar(resource);
+    } catch (IOException e) {
+      logger.log(Level.SEVERE, "error loading default file: ", e);
     }
+    return null;
   }
 
   /** Enables/Disables start button */