diff --git a/build.gradle b/build.gradle index d7946bd..26ea4f3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id 'java-library' id 'application' + id 'org.beryx.jlink' version '2.12.0' id 'org.openjfx.javafxplugin' version '0.0.10' id 'jacoco' } @@ -31,8 +32,8 @@ dependencies { implementation 'org.apache.logging.log4j:log4j-api:2.17.1' implementation 'org.apache.logging.log4j:log4j-core:2.17.1' implementation 'org.openjfx:javafx-controls:18' - implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4' - implementation group: 'org.openjfx', name: 'javafx', version: '11', ext: 'pom' + implementation 'org.apache.commons:commons-collections4:4.4' + implementation 'org.openjfx:javafx:19-ea+5' testImplementation('org.junit.jupiter:junit-jupiter:5.8.2') } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java index 72a6fef..2a852d5 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java @@ -1,21 +1,21 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.chat; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ClientModel; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.net.URL; +import java.util.Objects; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; -import javafx.scene.layout.AnchorPane; import javafx.stage.Stage; public class ChatApp extends Application { ClientModel clientModel; private ChatController chatController; - + public ChatApp() { + super(); + } public ChatApp(ClientModel clientModel) { this.clientModel = clientModel; this.chatController = new ChatController(clientModel); @@ -36,14 +36,25 @@ public class ChatApp extends Application { */ @Override public void start(Stage primaryStage) throws Exception { - + URL resource = ChatApp.class.getResource( + "splitPaneChatView.fxml"); + if (resource == null) { + System.out.println("File wasnt found"); + } //ChatApp chatApp = new ChatApp(new ClientModel()); - Parent root = FXMLLoader.load(getClass().getResource("splitPaneChatView.fxml")); - // TODO bin chatController.getChatPaneRoot() border to root border for rezising - Scene scene = new Scene(root); + try { + Parent root = FXMLLoader.load( + Objects.requireNonNull(ChatApp.class.getResource( + "splitPaneChatView.fxml"))); + // TODO bin chatController.getChatPaneRoot() border to root border for rezising + Scene scene = new Scene(root); + scene.setRoot(root); + primaryStage.setScene(scene); + } catch (Exception e) { + e.printStackTrace(); + } primaryStage.setResizable(true); primaryStage.setTitle("Chat"); - primaryStage.setScene(scene); primaryStage.show(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java index 6ed8a1d..d5396e7 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java @@ -51,7 +51,9 @@ public class ChatController implements Initializable { private static final String chatToAll = Protocol.chatMsgToAll; private static final String chatToLobby = Protocol.chatMsgToLobby; - + public ChatController() { + super(); + } public ChatController(ClientModel client) { this.client = client; whisperTargetChosen = new SimpleBooleanProperty(); diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/splitPaneChatView.fxml b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/splitPaneChatView.fxml new file mode 100644 index 0000000..b9479ab --- /dev/null +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/splitPaneChatView.fxml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +