ZHAW-IT21b_WIN
/
Uebung-hk1-Schrom01-Fassband-Brandleo
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
83 Commits 18 Branches 0 Tags 920 KiB
Commit Graph

83 Commits

Author SHA1 Message Date
Leonardo Brandenberger 048dc36a7c Merge branch 'main' into Java_Doc_and_Formatting 
# Conflicts:
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
#	client/src/main/java/ch/zhaw/pm2/multichat/client/ClientConnectionHandler.java
#	protocol/src/main/java/ch/zhaw/pm2/multichat/protocol/ConnectionHandler.java
#	server/src/main/java/ch/zhaw/pm2/multichat/server/Server.java
#	server/src/main/java/ch/zhaw/pm2/multichat/server/ServerConnectionHandler.java
 2022-04-16 15:59:21 +02:00
Leonardo Brandenberger c732e82260 General Codestyle and higlighted todos 2022-04-16 08:19:44 +02:00
Leonardo Brandenberger 2acfa708e9 ClientUI JavaDocs finished 2022-04-16 07:10:03 +02:00
Leonardo Brandenberger 7c8bdb3b33 improved java doc in ChatWindowController and Client class finished Client Connection Handler in Progress 2022-04-16 06:36:08 +02:00
Leonardo Brandenberger 4edcc92649 improved java doc in ChatWindowController and Client class finished 2022-04-16 06:36:08 +02:00
Leonardo Brandenberger dcee52cc1b Started Java Doc in ChatWindowController 2022-04-16 06:36:07 +02:00
Leonardo Brandenberger 6d6b9f1564 Java Doc and CodeStyle improvements 2022-04-16 06:36:05 +02:00
Andrin Fassbind c9aed1affd javadoc 2022-04-16 06:36:05 +02:00
schrom01 1d9beb6b7d fixed Problem setting Username in ClientConnectionHandler 
#42
 2022-04-16 06:36:05 +02:00
Andrin Fassbind add410250f fixed issue #39 2022-04-16 06:36:05 +02:00
Andrin Fassbind 5c0e55870d Java Doc Server && ServerConnectionHandler 2022-04-16 06:36:05 +02:00
Andrin Fassbind a94a4c81d8 Shrink code in the ConnectionHandlers 2022-04-16 06:36:05 +02:00
Andrin Fassbind 5022974427 Shrink code in the ConnectionHandlers 2022-04-16 06:36:04 +02:00
schrom01 46b0e4386a sovled #42 2022-04-16 06:36:02 +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
Leonardo Brandenberger 5f6266c017 Java Doc and CodeStyle improvements 2022-04-15 17:10:24 +02:00
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
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
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