RecentRunner/group-2-threaded-project-petshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade desktop to JDK 25

Browse Source
This commit is contained in:
Harkamal Randhawa
2026-03-11 09:26:15 -06:00
parent 33674fc6a6
commit 520c1db334
3 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -10,7 +10,7 @@
<name>PetShopDesktop</name> <name>PetShopDesktop</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javafx.version>17.0.10</javafx.version> <javafx.version>25.0.1</javafx.version>
<junit.version>5.12.1</junit.version> <junit.version>5.12.1</junit.version>
</properties> </properties>
@@ -68,7 +68,7 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version> <version>3.13.0</version>
<configuration> <configuration>
<release>17</release> <release>25</release>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

16
src/main/resources/org/example/petshopdesktop/login-view.fxml
View File

@@ -7,7 +7,6 @@
<?import javafx.scene.control.TextField?> <?import javafx.scene.control.TextField?>
<?import javafx.scene.image.Image?> <?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?> <?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
@@ -20,19 +19,14 @@
<Insets bottom="40.0" left="50.0" right="50.0" top="40.0" /> <Insets bottom="40.0" left="50.0" right="50.0" top="40.0" />
</padding> </padding>
<children> <children>
<StackPane maxWidth="220.0" maxHeight="220.0" prefWidth="220.0" prefHeight="220.0" style="-fx-background-color: #f8fafc; -fx-background-radius: 999; -fx-padding: 12; -fx-border-color: #d7dee8; -fx-border-radius: 999; -fx-border-width: 1;"> <ImageView fitHeight="190.0" fitWidth="190.0" preserveRatio="true" smooth="true" style="-fx-effect: dropshadow(gaussian, rgba(15,23,42,0.22), 18, 0.16, 0, 6);">
<children> <image>
<ImageView fitHeight="180.0" fitWidth="180.0" preserveRatio="true" smooth="true"> <Image url="@images/leons-pet-store-badge-text.png" />
<image> </image>
<Image url="@images/leons-pet-store-badge-text.png" />
</image>
</ImageView>
</children>
<style>-fx-effect: dropshadow(gaussian, rgba(15,23,42,0.22), 22, 0.18, 0, 8);</style>
<VBox.margin> <VBox.margin>
<Insets bottom="35.0" /> <Insets bottom="35.0" />
</VBox.margin> </VBox.margin>
</StackPane> </ImageView>
<Label text="Username" textFill="#cccccc"> <Label text="Username" textFill="#cccccc">
<font> <font>

15
src/main/resources/org/example/petshopdesktop/main-layout-view.fxml
View File

@@ -9,7 +9,6 @@
<?import javafx.scene.image.ImageView?> <?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
@@ -23,15 +22,11 @@
</padding> </padding>
<children> <children>
<HBox alignment="CENTER"> <HBox alignment="CENTER">
<StackPane maxWidth="106.0" maxHeight="106.0" prefWidth="106.0" prefHeight="106.0" onMouseClicked="#logoClicked" style="-fx-cursor: hand; -fx-effect: dropshadow(gaussian, rgba(15,23,42,0.22), 18, 0.16, 0, 6); -fx-background-color: #f8fafc; -fx-background-radius: 999; -fx-padding: 8; -fx-border-color: #d7dee8; -fx-border-radius: 999; -fx-border-width: 1;"> <ImageView fx:id="imgLogo" fitHeight="104.0" fitWidth="104.0" preserveRatio="true" smooth="true" onMouseClicked="#logoClicked" style="-fx-cursor: hand; -fx-effect: dropshadow(gaussian, rgba(15,23,42,0.22), 18, 0.16, 0, 6);">
<children> <image>
<ImageView fx:id="imgLogo" fitHeight="90.0" fitWidth="90.0" preserveRatio="true" smooth="true"> <Image url="@images/leons-pet-store-badge.png" />
<image> </image>
<Image url="@images/leons-pet-store-badge.png" /> </ImageView>
</image>
</ImageView>
</children>
</StackPane>
<VBox.margin> <VBox.margin>
<Insets bottom="15.0" /> <Insets bottom="15.0" />
</VBox.margin> </VBox.margin>