Changed Icon

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644 (file)
index 0000000..51a6f93
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>de.diejungsvondertanke.tankstelle</groupId>
+  <artifactId>tankstelle</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>${main.Class}</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.5.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <transformers>
+                <transformer>
+                  <mainClass>${main.Class}</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>6.2.1</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <release>${java.version}</release>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.Beta2</version>
+        <executions>
+          <execution>
+            <id>create-runtime-image</id>
+            <phase>package</phase>
+            <goals>
+              <goal>create-runtime-image</goal>
+            </goals>
+            <configuration>
+              <modulePath>
+                <path>${project.build.directory}/modules</path>
+              </modulePath>
+              <modules>
+                <module>${project.groupId}</module>
+              </modules>
+              <launcher>
+                <name>${project.groupId}</name>
+              </launcher>
+              <compression>2</compression>
+              <stripDebug>true</stripDebug>
+              <outputDirectory>${project.build.directory}/jlink-image</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/modules</outputDirectory>
+              <includeScope>runtime</includeScope>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.11.0</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+          <mainClass>${main.Class}</mainClass>
+          <commandlineArgs>--module-path
+                        ${java.home}/lib
+                        --add-modules=javafx.controls,javafx.fxml</commandlineArgs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.openjfx</groupId>
+        <artifactId>javafx-maven-plugin</artifactId>
+        <version>${javafx.version}</version>
+        <executions>
+          <execution>
+            <id>default-cli</id>
+            <configuration>
+              <mainClass>${main.Class}</mainClass>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <properties>
+    <maven.compiler.target>25</maven.compiler.target>
+    <java.version>25</java.version>
+    <maven.compiler.source>25</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <classifier>win</classifier>
+    <javafx.version>23.0.2</javafx.version>
+    <main.Class>de.diejungsvondertanke.tankstelle.ui.JFX</main.Class>
+  </properties>
+</project>

diff --git a/pom.xml b/pom.xml
index c6fd48592d0025e78de6a84f3666deffd0d4eb93..5a93173bf48c91bd7fc71016519885e744e6aa35 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <build>
         <plugins>
             <!-- Adds the mainClass to the jar so it will run outside -->
-            <plugin>
+            <!-- <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.1.0</version>
                 <configuration>
@@ -21,9 +21,39 @@
                     </archive>
                 </configuration>
             </plugin>
-
-            <!-- sets up the version of Java you are running -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <transformers>
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>${main.Class}</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin> -->
+            <!-- sets up the version of Java you are running -->
+            <!-- <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
@@ -37,6 +67,37 @@
                         <version>6.2.1</version>
                     </dependency>
                 </dependencies>
+            </plugin> -->
+
+            <!-- Makes the jLink setup so you can give it to your friends  -->
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <version>1.0.0.Beta2</version>
+                <executions>
+                    <execution>
+                        <id>create-runtime-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>create-runtime-image</goal>
+                        </goals>
+                        <configuration>
+                            <modulePath>
+                                <path>${project.build.directory}/modules</path>
+                            </modulePath>
+                            <modules>
+                                <module>${project.groupId}</module>
+                            </modules>
+                            <launcher>
+                                <name>${project.groupId}</name>
+
+                            </launcher>
+                            <compression>2</compression>
+                            <stripDebug>true</stripDebug>
+                            <outputDirectory>${project.build.directory}/jlink-image</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
             <!-- Copies the depend FX files to your program  -->
@@ -82,7 +143,24 @@
                     </commandlineArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>${javafx.version}</version>
+                <executions>
+                    <execution>
+                        <id>default-cli</id>
+                        <configuration>
+                            <mainClass>${main.Class}</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
         </plugins>
+
+
     </build>
 
     <properties>
@@ -91,6 +169,7 @@
         <maven.compiler.target>25</maven.compiler.target>
         <java.version>25</java.version>
         <javafx.version>23.0.2</javafx.version>
+        <classifier>win</classifier>
         <main.Class>de.diejungsvondertanke.tankstelle.ui.JFX</main.Class>
     </properties>
     <dependencies>
@@ -99,16 +178,19 @@
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
             <version>${javafx.version}</version>
+            <!-- <classifier>${classifier}</classifier> -->
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
             <version>${javafx.version}</version>
+            <!-- <classifier>${classifier}</classifier> -->
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-graphics</artifactId>
             <version>${javafx.version}</version>
+            <!-- <classifier>${classifier}</classifier> -->
         </dependency>
 
         <!-- Optional: if you use TableView + properties -->
@@ -116,6 +198,7 @@
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-base</artifactId>
             <version>${javafx.version}</version>
+            <!-- <classifier>${classifier}</classifier> -->
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
index a95b2a0e402b8f98921d97a23ae5bf6d0eb4ae84..f10ee65151066df862378a738868f6a02a046e54 100644 (file)
--- a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
+++ b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
@@ -101,7 +101,6 @@ public class FuelStationUIController {
                         overviewTabController.setParentController(this);
                         // overviewTabController.refresh();
                     });
-
         } catch (Exception e) {
             e.printStackTrace();
             // TODO: handle exception

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/ui/JFX.java b/src/main/java/de/diejungsvondertanke/tankstelle/ui/JFX.java
index 659572a5d08ed51179c12b892bd7cea04c83b067..bc7469fa1ef32ebbc39a71c17f977da6ab1da3e1 100644 (file)
--- a/src/main/java/de/diejungsvondertanke/tankstelle/ui/JFX.java
+++ b/src/main/java/de/diejungsvondertanke/tankstelle/ui/JFX.java
@@ -28,7 +28,7 @@ public class JFX extends Application {
 
         stage.setScene(scene);
         stage.setTitle("Fuel Station Management System");
-        stage.getIcons().add(new Image(getClass().getResourceAsStream("/icon/gasstation_4334.png")));
+        stage.getIcons().add(new Image(getClass().getResourceAsStream("/icon/AppIcon.png")));
         initializeKeybinds();
         stage.show();
     }
@@ -89,10 +89,12 @@ public class JFX extends Application {
     }
 
     void exit() {
+        quit();
         System.exit(0);
     }
 
     void exit(int status) {
+        quit();
         System.exit(status);
     }
 

diff --git a/src/main/resources/icon/AppIcon.png b/src/main/resources/icon/AppIcon.png
new file mode 100644 (file)
index 0000000..ff965e4
Binary files /dev/null and b/src/main/resources/icon/AppIcon.png differ

diff --git a/src/main/resources/icon/gasstation_4334.ico b/src/main/resources/icon/gasstation_4334.ico
deleted file mode 100644 (file)
index e2d0d80..0000000
Binary files a/src/main/resources/icon/gasstation_4334.ico and /dev/null differ

diff --git a/src/main/resources/icon/gasstation_4334.png b/src/main/resources/icon/gasstation_4334.png
deleted file mode 100644 (file)
index 484cc27..0000000
Binary files a/src/main/resources/icon/gasstation_4334.png and /dev/null differ