Fixed whitespaces ChatWindow.fxml other javadocs in other classes aswell deleted unneccessary declarations
This commit is contained in:
Leonardo Brandenberger
@@ -23,6 +23,7 @@ import static ch.zhaw.pm2.multichat.protocol.ConnectionHandler.State.*;
|
||||
* To Contact the Model Elements needed it also holds references to message and the Connectionhandler.
|
||||
*/
|
||||
public class ChatWindowController {
|
||||
public Button sendButton; //TODO necessary to have a attribute when not used or delete?
|
||||
private ClientConnectionHandler connectionHandler;
|
||||
private ClientMessageList messages;
|
||||
private final WindowCloseHandler windowCloseHandler = new WindowCloseHandler();
|
||||
@@ -156,10 +157,6 @@ public class ChatWindowController {
|
||||
connectionHandler.initialize(serverAddress, serverPort, userName);
|
||||
new Thread(connectionHandler).start();
|
||||
|
||||
//register Listener //TODO what todo with methods?
|
||||
//startConnectionHandlerListener();
|
||||
|
||||
// register window close handler
|
||||
rootPane.getScene().getWindow().addEventHandler(WindowEvent.WINDOW_CLOSE_REQUEST, windowCloseHandler);
|
||||
} else {
|
||||
addError("It is not allowed to have spaces in username!");
|
||||
@@ -240,6 +237,7 @@ public class ChatWindowController {
|
||||
* Nested Class in charge of Closing the wind
|
||||
*/
|
||||
class WindowCloseHandler implements EventHandler<WindowEvent> {
|
||||
|
||||
/**
|
||||
* //TODO
|
||||
*
|
||||
@@ -285,7 +283,7 @@ public class ChatWindowController {
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts a new Listener for messages by using the observable Boolean.
|
||||
* Starts a new Listener for messages by using the observable Boolean.
|
||||
*/
|
||||
private void messageListener() {
|
||||
messages.getChangedProperty().addListener(new ChangeListener<Boolean>() {
|
||||
|
||||
@@ -12,74 +12,82 @@
|
||||
<?import javafx.scene.layout.HBox?>
|
||||
<?import javafx.scene.layout.VBox?>
|
||||
|
||||
<BorderPane fx:id="rootPane" minWidth="-Infinity" prefHeight="500.0" prefWidth="420.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.pm2.multichat.client.ChatWindowController">
|
||||
<top>
|
||||
<VBox BorderPane.alignment="CENTER">
|
||||
<children>
|
||||
<MenuBar>
|
||||
<menus>
|
||||
<Menu mnemonicParsing="false" text="Filter">
|
||||
<items>
|
||||
<MenuItem mnemonicParsing="false" text="press Enter">
|
||||
<graphic>
|
||||
<TextField fx:id="filterValue" onAction="#applyFilter" />
|
||||
</graphic>
|
||||
</MenuItem>
|
||||
</items>
|
||||
</Menu>
|
||||
</menus>
|
||||
</MenuBar>
|
||||
<HBox fillHeight="false" spacing="5.0">
|
||||
<children>
|
||||
<TextField fx:id="userNameField" alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308" minWidth="110.0" promptText="Username" HBox.hgrow="SOMETIMES" />
|
||||
<Label alignment="CENTER" contentDisplay="CENTER" text="\@" textAlignment="CENTER" textOverrun="CLIP" HBox.hgrow="NEVER">
|
||||
<HBox.margin>
|
||||
<Insets bottom="5.0" top="5.0" />
|
||||
</HBox.margin>
|
||||
</Label>
|
||||
<TextField fx:id="serverAddressField" alignment="CENTER_RIGHT" minWidth="110.0" promptText="Host" HBox.hgrow="SOMETIMES" />
|
||||
<Label text=":" HBox.hgrow="NEVER">
|
||||
<HBox.margin>
|
||||
<Insets bottom="5.0" top="5.0" />
|
||||
</HBox.margin>
|
||||
</Label>
|
||||
<TextField fx:id="serverPortField" minWidth="-Infinity" prefWidth="60.0" promptText="Port" HBox.hgrow="NEVER" />
|
||||
<Button fx:id="connectButton" maxWidth="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#toggleConnection" prefWidth="80.0" text="Connect" HBox.hgrow="NEVER">
|
||||
<HBox.margin>
|
||||
<Insets left="5.0" />
|
||||
</HBox.margin>
|
||||
</Button>
|
||||
</children>
|
||||
<BorderPane.margin>
|
||||
<Insets />
|
||||
</BorderPane.margin>
|
||||
<padding>
|
||||
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
|
||||
</padding>
|
||||
</HBox>
|
||||
</children>
|
||||
</VBox>
|
||||
</top>
|
||||
<bottom>
|
||||
<HBox spacing="5.0">
|
||||
<children>
|
||||
<TextField fx:id="messageField" onAction="#message" HBox.hgrow="ALWAYS" />
|
||||
<Button fx:id="sendButton" alignment="CENTER" maxWidth="-Infinity" minWidth="-Infinity" mnemonicParsing="false" onAction="#message" prefWidth="50.0" text="Send" textAlignment="CENTER">
|
||||
<HBox.margin>
|
||||
<Insets left="5.0" />
|
||||
</HBox.margin>
|
||||
</Button>
|
||||
</children>
|
||||
<padding>
|
||||
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
|
||||
</padding>
|
||||
</HBox>
|
||||
</bottom>
|
||||
<center>
|
||||
<TextArea fx:id="messageArea" editable="false" wrapText="true">
|
||||
<BorderPane.margin>
|
||||
<Insets left="5.0" right="5.0" />
|
||||
</BorderPane.margin>
|
||||
</TextArea>
|
||||
</center>
|
||||
<BorderPane xmlns:fx="http://javafx.com/fxml/1" fx:id="rootPane" minWidth="-Infinity" prefHeight="500.0"
|
||||
prefWidth="420.0" xmlns="http://javafx.com/javafx/18"
|
||||
fx:controller="ch.zhaw.pm2.multichat.client.ChatWindowController">
|
||||
<top>
|
||||
<VBox BorderPane.alignment="CENTER">
|
||||
<children>
|
||||
<MenuBar>
|
||||
<menus>
|
||||
<Menu mnemonicParsing="false" text="Filter">
|
||||
<items>
|
||||
<MenuItem mnemonicParsing="false" text="press Enter">
|
||||
<graphic>
|
||||
<TextField fx:id="filterValue" onAction="#applyFilter"/>
|
||||
</graphic>
|
||||
</MenuItem>
|
||||
</items>
|
||||
</Menu>
|
||||
</menus>
|
||||
</MenuBar>
|
||||
<HBox fillHeight="false" spacing="5.0">
|
||||
<children>
|
||||
<TextField fx:id="userNameField" alignment="CENTER_RIGHT" maxWidth="1.7976931348623157E308"
|
||||
minWidth="110.0" promptText="Username" HBox.hgrow="SOMETIMES"/>
|
||||
<Label alignment="CENTER" contentDisplay="CENTER" text="\@" textAlignment="CENTER"
|
||||
textOverrun="CLIP" HBox.hgrow="NEVER">
|
||||
<HBox.margin>
|
||||
<Insets bottom="5.0" top="5.0"/>
|
||||
</HBox.margin>
|
||||
</Label>
|
||||
<TextField fx:id="serverAddressField" alignment="CENTER_RIGHT" minWidth="110.0"
|
||||
promptText="Host" HBox.hgrow="SOMETIMES"/>
|
||||
<Label text=":" HBox.hgrow="NEVER">
|
||||
<HBox.margin>
|
||||
<Insets bottom="5.0" top="5.0"/>
|
||||
</HBox.margin>
|
||||
</Label>
|
||||
<TextField fx:id="serverPortField" minWidth="-Infinity" prefWidth="60.0" promptText="Port"
|
||||
HBox.hgrow="NEVER"/>
|
||||
<Button fx:id="connectButton" maxWidth="-Infinity" minWidth="-Infinity" mnemonicParsing="false"
|
||||
onAction="#toggleConnection" prefWidth="80.0" text="Connect" HBox.hgrow="NEVER">
|
||||
<HBox.margin>
|
||||
<Insets left="5.0"/>
|
||||
</HBox.margin>
|
||||
</Button>
|
||||
</children>
|
||||
<BorderPane.margin>
|
||||
<Insets/>
|
||||
</BorderPane.margin>
|
||||
<padding>
|
||||
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
|
||||
</padding>
|
||||
</HBox>
|
||||
</children>
|
||||
</VBox>
|
||||
</top>
|
||||
<bottom>
|
||||
<HBox spacing="5.0">
|
||||
<children>
|
||||
<TextField fx:id="messageField" onAction="#message" HBox.hgrow="ALWAYS"/>
|
||||
<Button fx:id="sendButton" alignment="CENTER" maxWidth="-Infinity" minWidth="-Infinity"
|
||||
mnemonicParsing="false" onAction="#message" prefWidth="50.0" text="Send" textAlignment="CENTER">
|
||||
<HBox.margin>
|
||||
<Insets left="5.0"/>
|
||||
</HBox.margin>
|
||||
</Button>
|
||||
</children>
|
||||
<padding>
|
||||
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
|
||||
</padding>
|
||||
</HBox>
|
||||
</bottom>
|
||||
<center>
|
||||
<TextArea fx:id="messageArea" editable="false" wrapText="true">
|
||||
<BorderPane.margin>
|
||||
<Insets left="5.0" right="5.0"/>
|
||||
</BorderPane.margin>
|
||||
</TextArea>
|
||||
</center>
|
||||
</BorderPane>
|
||||
|
||||
Reference in New Issue
Block a user