Commit Graph

66 Commits

Author SHA1 Message Date
Andrin Fassbind 8395a121bb Klassendiagramm 2022-04-16 19:21:30 +02:00
Andrin Fassbind a5069e938f javadoc 2022-04-15 22:06:22 +02:00
fassband 119cd1eb52 Merge pull request #46 from PM2-IT21bWIN-ruiz-mach-krea/refactoring_chatwindowcontroller
fixed Problem setting Username in ClientConnectionHandler
2022-04-15 21:40:36 +02:00
schrom01 e53a751081 fixed Problem setting Username in ClientConnectionHandler
#42
2022-04-15 21:20:03 +02:00
Roman Schenk 64a6137372 Merge pull request #45 from PM2-IT21bWIN-ruiz-mach-krea/remove_server_lock
fixed issue #39
2022-04-15 21:18:13 +02:00
Andrin Fassbind 5257195d82 fixed issue #39 2022-04-15 21:13:28 +02:00
Andrin Fassbind 73dcfb5058 Java Doc Server && ServerConnectionHandler 2022-04-15 19:41:43 +02:00
Roman Schenk 84e59effec Merge pull request #44 from PM2-IT21bWIN-ruiz-mach-krea/continue_connectionhandler
Continue connectionhandler
2022-04-15 17:41:12 +02:00
Andrin Fassbind 9a534b2465 Shrink code in the ConnectionHandlers 2022-04-15 16:39:52 +02:00
Andrin Fassbind 37045ade15 Shrink code in the ConnectionHandlers 2022-04-15 16:25:45 +02:00
Leonardo Brandenberger 313a4f5861 Merge pull request #43 from PM2-IT21bWIN-ruiz-mach-krea/refactoring_chatwindowcontroller
Refactoring chatwindowcontroller to improve MVC
2022-04-15 15:39:47 +02:00
schrom01 2b70299507 removed Method initialize because it's not used anymore. 2022-04-15 15:35:04 +02:00
schrom01 2b01e92e8d sovled #42 2022-04-15 15:34:03 +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