Commit Graph

56 Commits

Author SHA1 Message Date
schrom01 77b3057911 removed Method initialize because it's not used anymore. 2022-04-15 17:10:24 +02:00
schrom01 9e027b5c7a sovled #42 2022-04-15 17:10:23 +02:00
Leonardo Brandenberger 28376f1242 trying to fix MVC 2022-04-15 04:57:46 +02:00
Roman Schenk a75d3466ef Merge pull request #41 from PM2-IT21bWIN-ruiz-mach-krea/Server_Console_Display
Fixes issue #37
2022-04-15 01:07:22 +02:00
Leonardo Brandenberger 97b6fff82e fixes #37 2022-04-15 00:14:22 +02:00
fassband 2a8b701f48 Merge pull request #40 from PM2-IT21bWIN-ruiz-mach-krea/Refactoring_ClientConnectionHandler
Refactoring client connection handler
2022-04-14 22:24:13 +02:00
schrom01 86aa801b34 removed Enum State from ServerConnectionHandler.java because it's in ConnectionHandler.java now. 2022-04-14 22:23:49 +02:00
schrom01 2277fee73a merging 2022-04-14 22:12:35 +02:00
schrom01 d8dbd93c15 Merge branch 'main' into Refactoring_ClientConnectionHandler
# Conflicts:
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
2022-04-14 22:02:39 +02:00
Roman Schenk 6e8e560d73 Merge pull request #38 from PM2-IT21bWIN-ruiz-mach-krea/ConnectionHandlerClass
Connection handler class
2022-04-14 21:51:59 +02:00
Andrin Fassbind 5a26c6b127 create setConnection in ConnectionHandlerClass 2022-04-14 21:37:06 +02:00
schrom01 615b3844e3 refactoring of ClientConnectionHandler
Instance is now created in ClientUI.java
solved #24 and #15
2022-04-14 21:13:36 +02:00
Andrin Fassbind 5e6e9d5817 Create ConnectionHandlerClass
Remove Codeduplication
2022-04-14 21:11:58 +02:00
Roman Schenk 4a998b0f61 Merge pull request #36 from PM2-IT21bWIN-ruiz-mach-krea/SpecialCharacterUsername
Special character username
2022-04-14 20:39:05 +02:00
fassband af46e499ff Merge pull request #34 from PM2-IT21bWIN-ruiz-mach-krea/Fix_WindowCloseHandler
fixed Disconnecting when window is closed
2022-04-14 19:36:26 +02:00
Andrin Fassbind b6fd5b569d fixed Issue #28 by checking if username contains space before starting connection 2022-04-14 19:33:18 +02:00
schrom01 8c588ee75c fixed Disconnecting when window is closed
#6
2022-04-14 19:13:21 +02:00
Roman Schenk 800528cc37 Merge pull request #33 from PM2-IT21bWIN-ruiz-mach-krea/Server_Console_Display
fixes Issue #20
2022-04-14 16:02:06 +02:00
Andrin Fassbind b47d98b960 fixed Issue #19 by changing messagePattern 2022-04-14 12:11:03 +02:00
Leonardo Brandenberger 886d9e5e43 fixes #20 2022-04-14 06:55:10 +02:00
fassband 7c68472859 Merge pull request #32 from PM2-IT21bWIN-ruiz-mach-krea/Fixing_private_Messages
fixed Problem "private Messages are visible for sender"
2022-04-13 17:35:48 +02:00
Roman Schenk b9ffb2b133 Update ServerConnectionHandler.java
added Commment for documentation.
2022-04-13 17:35:07 +02:00
schrom01 e69ced4081 fixed Problem "private Messages are visible for sender"
#28
2022-04-13 17:24:22 +02:00
Roman Schenk d1dfe6c1ab Merge pull request #31 from PM2-IT21bWIN-ruiz-mach-krea/Remove_Controller_From_Handler
Remove ChatWindowController from ClientConnectionHandler
2022-04-13 16:13:33 +02:00
Andrin Fassbind 3eedf58685 Remove ChatWindowController from ClientConnectionHandler
Make ChatWindowController listen for message changes

fixed Issue #23
2022-04-13 15:55:08 +02:00
Andrin Fassbind 1777b62582 Make State in ClientConnectionHandler property
Add change listener for stateproperty in ChatWindowController

fixed Issue #21
2022-04-13 15:03:07 +02:00
Roman Schenk a0b7b363c3 Merge pull request #30 from PM2-IT21bWIN-ruiz-mach-krea/Server_Console_Display
fixed issue #5
2022-04-12 21:35:26 +02:00
Leonardo Brandenberger 914fa8f1e2 fixed #5 2022-04-12 16:42:19 +02:00
fassband 9eb352c0fe Merge pull request #25 from PM2-IT21bWIN-ruiz-mach-krea/Class_Message
Class Message
2022-04-12 15:23:35 +02:00
fassband a27b7f4446 Merge pull request #27 from PM2-IT21bWIN-ruiz-mach-krea/ChatWindow_Layout
Chat window layout
2022-04-12 15:23:22 +02:00
schrom01 1a188f6bbd Fixed Problem "Empty Messages can be sent" if receiver != * 2022-04-12 14:26:26 +02:00
schrom01 8661b44fe2 activated Textwrapping for Textarea in ChatWindow.fxml 2022-04-12 13:20:25 +02:00
schrom01 84c852c9b5 fixed Minumum Size of ChatWindow. 2022-04-12 13:16:58 +02:00
schrom01 56200b749d added Javadoc in Class Message 2022-04-12 12:36:43 +02:00
schrom01 7e7333dfaf fixed matchesFilter in Message.java
Problem solved if any String is null.
2022-04-12 11:01:28 +02:00
schrom01 3082da8a91 Solved Problem "Empty Messages can be sent" 2022-04-12 10:00:31 +02:00
schrom01 424a174847 refactoring Methods message() in ChatWindowController and ClientConnectionHandler 2022-04-12 09:43:24 +02:00
schrom01 b246c3c7e3 fix Problem with StringBuilder in ClientMessageList 2022-04-12 08:59:53 +02:00
schrom01 eb0e6d0dbc Refactoring creating ClientMessageList Object in ClientUI 2022-04-12 08:43:19 +02:00
schrom01 0896257fad Refactoring ClientMessageList 2022-04-12 08:25:21 +02:00
schrom01 e11fb136cf created Class Message 2022-04-12 07:36:14 +02:00
Roman Schenk e0ca1c77bb Merge pull request #16 from PM2-IT21bWIN-ruiz-mach-krea/ErrorTesting_Andrin
Functional issues fixed Nr. #4,#3,#8
2022-04-10 21:46:54 +02:00
Andrin Fassbind 60338e4bbb GUI: Clear messagefield after text has been processed 2022-04-10 16:48:15 +02:00
Andrin Fassbind 361037ab9a Make NetworkConnection send(T data) method synchronized 2022-04-10 14:14:11 +02:00
Andrin Fassbind 5054224653 Make ServerConnectionHandler runnable => fixed multiple client connection to server 2022-04-10 10:56:59 +02:00
schrom01 029e099f26 changed Classdiagram-client.drawio Client 2022-04-08 13:09:32 +02:00
schrom01 619b5862ff Merge remote-tracking branch 'origin/main' 2022-04-08 12:29:15 +02:00
schrom01 b841bdb8a3 changed Classdiagram-client.drawio Client 2022-04-08 12:29:03 +02:00
Andrin Fassbind 69a51e36bb Merge remote-tracking branch 'origin/main' 2022-04-08 12:12:36 +02:00
Andrin Fassbind 629680a9b2 Classdiagram 2022-04-08 12:12:27 +02:00