Commit Graph
88 Commits
Author SHA1 Message Date
Sebastian Lenzlinger 61697d7597 whisper is functional in with gui. decode whisper msg added to client handler and used in JServerProtcolParser now to correctly decode the messages 2022-04-17 15:38:40 +02:00
Sebastian Lenzlinger 74fdca0efd added whisper functionality for whisper in ClientHandler and Gui and deleted old recources that aren't needed. 2022-04-17 15:06:24 +02:00
Sebastian Lenzlinger 7ba20a9f62 lamdas were a bad idea 2022-04-17 12:14:16 +02:00
Sebastian Lenzlinger bd5aa011a1 Merge branch 'revert-660883f7' into 'master'
Revert "worked through a few warnings, changed a few anonymous classes to lambdas"

See merge request cs108-fs22/Gruppe-8!5
2022-04-17 10:13:28 +00:00
Sebastian Lenzlinger cb8dc1c56a Revert "worked through a few warnings, changed a few anonymous classes to lambdas"
This reverts commit 660883f732
2022-04-17 10:12:58 +00:00
Sebastian Lenzlinger 660883f732 worked through a few warnings, changed a few anonymous classes to lambdas 2022-04-17 11:35:16 +02:00
Sebastian Lenzlinger 4d82af32f4 added javafx.graphics module 2022-04-16 17:23:33 +02:00
Sebastian Lenzlinger 11897a6a68 deleted unsupported modules 2022-04-16 17:20:35 +02:00
Sebastian Lenzlinger f7324f2300 added needed javafx modules to build since I'm getting the following message at runtime:
"JavaFX runtime components are missing, and are required to run this application"
2022-04-16 17:06:27 +02:00
Sebastian Lenzlinger 0270202c3f Extending functionality to connect the incoming msgs to the gui via buffered readers. 2022-04-16 16:05:21 +02:00
Sebastian Lenzlinger 504aa9aef2 Commit to make sure everything is here as I accidentally deleted large portions of my local code. 2022-04-16 14:28:02 +02:00
Sebastian Lenzlinger 3880b3f14f ChatController fields slowly all initialized. 2022-04-16 12:41:14 +02:00
Sebastian Lenzlinger b30f44df6c Added ChatApp class, ChatController class and the fxml representing the view of the chat gui. 2022-04-16 10:49:40 +02:00
Sebastian Lenzlinger 6986a9906f deleted unused classes 2022-04-16 10:41:41 +02:00
Sebastian Lenzlinger 85fca301ff Merge remote-tracking branch 'origin/master' 2022-04-14 16:26:07 +02:00
Sebastian Lenzlinger 13e8002d79 Added GuiChat fxml file 2022-04-14 16:25:59 +02:00
Sebastian Lenzlinger 3290009640 Merge remote-tracking branch 'origin/master' 2022-04-14 14:02:36 +02:00
Sebastian Lenzlinger 17783cb591 Merged Onto Master 2022-04-14 14:02:27 +02:00
Sebastian Lenzlinger 5a36988cd2 Merge branch 'guiSeb' into 'master'
Client GUI Application Elements, namely the Chat

See merge request cs108-fs22/Gruppe-8!3
2022-04-14 10:53:46 +00:00
Sebastian Lenzlinger a6d416e457 final tiny touch ups 2022-04-13 01:47:25 +02:00
Sebastian Lenzlinger 76e1ed3ff1 Added a missing return statement 2022-04-13 01:46:28 +02:00
Sebastian Lenzlinger 3e2288026b Further Building the scene 2022-04-13 01:45:32 +02:00
Sebastian Lenzlinger e4f9776f7f Slowly building the SceneGraph from the bottom.
Created a abstract class that imlements the Toggle interface for toggling between who one wants to chat.
2022-04-13 01:07:49 +02:00
Sebastian Lenzlinger 68248c7175 (noch sehr kurzer) Dairy Update 2022-04-12 23:50:30 +02:00
Sebastian Lenzlinger ca1256f01f Created Classes and Interfaces. Trying to adhere to the MVC pattern 2022-04-12 23:46:38 +02:00
Sebastian Lenzlinger 7df07b490a Getting fuzzyyy. Added LLIST server response. cannot continue. 2022-04-08 19:47:27 +02:00
Sebastian Lenzlinger e9cade1528 listAllLobbiesToClient still does not work properly: TODO added. 2022-04-08 19:30:50 +02:00
Sebastian Lenzlinger da5189311e Changed functionality of listAllLobbiesToClient():
Now it writes to the OutPutStream itself instead of sending a CHATM to client. Hope is that the JClientParser only has to parse once.
2022-04-08 19:28:01 +02:00
Sebastian Lenzlinger e23a749f55 Changed the way LISTL was implemented since it caused problems for the parser of the client. 2022-04-08 19:12:02 +02:00
Sebastian Lenzlinger a10ea16d35 Added some Documenting. Added some fields to ClientAttributes.java that might be useful in case we need this class. 2022-04-08 18:55:21 +02:00
Sebastian Lenzlinger d8692152b4 If a client connection is closed the ClientHandleris now removed from the set of all clients on the server and from any lobby he was in. 2022-04-08 18:38:59 +02:00
Sebastian Lenzlinger b55494c106 Added ClientAttributes.java for possible future use. 2022-04-08 17:58:12 +02:00
Sebastian Lenzlinger 24dceee1d8 Added method to remove disconnected client from central data. client handler uses it. 2022-04-08 17:50:49 +02:00
Sebastian Lenzlinger 709e5323e8 actually call method when LISTL is recieved. 2022-04-08 17:24:20 +02:00
Sebastian Lenzlinger 6297439c3c finnished listAllLobbiesToClient() 2022-04-08 17:21:13 +02:00
Sebastian Lenzlinger 922561d522 added getIdAndAdminForList() method in Lobby to facilitate sending a list of lobbies to a client 2022-04-08 17:09:17 +02:00
Sebastian Lenzlinger f910775f96 listAllLobbies() method started 2022-04-08 16:59:48 +02:00
Sebastian Lenzlinger 372a02a093 synchronized addPlayer() in Lobby.addPlayer 2022-04-08 16:54:57 +02:00
Sebastian Lenzlinger 37a8caa64d Imlemented creating a lobby in the ClientHandler. Added getLobbyID() method to Lobby.java 2022-04-08 16:50:26 +02:00
Sebastian Lenzlinger 8ea39356f2 synchronized adding to shared resources 2022-04-08 16:42:04 +02:00
Sebastian Lenzlinger b0ebbc9c77 Extending CentralServerData to enable lobby creation and joining 2022-04-08 16:34:25 +02:00
Sebastian Lenzlinger 4557b4801b Client chatListener now throws an IO exception of the chatMSg from the server is null. 2022-04-08 16:15:04 +02:00
Sebastian Lenzlinger 968cb94f21 Now the client disconnects if:
1. no pingback recieved
2. isConnected has already been set to false
In this case it looks to be a case where the client isn't responding correctly and the server may close the connection. Added a debog log statement at the respective place.
2022-04-08 16:12:19 +02:00
Sebastian Lenzlinger f57889431d minor change to addPlayer() method 2022-04-08 15:45:35 +02:00
Sebastian Lenzlinger 9e112b493a Test commit zum schauen ob meine Commits wieder richtig zugeordnet werden. 2022-04-08 15:37:08 +02:00
Sebastian Lenzlinger 15db9e4eb9 Some fields and methods where non-static and I changed them to static. 2022-03-26 14:46:05 +01:00
Sebastian Lenzlinger a244903fbb Finnished Dokumenting ClientMsgDecoder.java and removed
unused imports.
2022-03-26 14:11:14 +01:00
Sebastian Lenzlinger edfceb0048 Added Some javadoc to ClientMsgDecoder.java to explain
the use of the class.
2022-03-26 13:39:51 +01:00
Sebastian Lenzlinger 46ee78d298 Further work on CommandExecuter and adjustments to NightServerProtocol. 2022-03-26 13:32:27 +01:00
Sebastian Lenzlinger 8916d7f8b9 Merge remote-tracking branch 'origin/master' 2022-03-26 13:14:53 +01:00
Sebastian Lenzlinger b2d725f4c3 Finnished ClientMsgDecoder!
last thing todo is implement
the execution of the input.
2022-03-26 13:14:36 +01:00
Sebastian Lenzlinger 9b1faa6ce1 Reconsile changes accross Client utility classes 2022-03-26 11:35:51 +01:00
Sebastian Lenzlinger 8f0ccbfa36 Fixed InputToProtocolMap to now contain a encoding map from client input to protocol msg and a set of legal client inputs. 2022-03-26 10:53:22 +01:00
Sebastian Lenzlinger 3f05121925 added "to" in NTtB doc comment... 2022-03-26 10:10:51 +01:00
Sebastian Lenzlinger 5368679933 Added description to NTtBFormatMsg 2022-03-25 14:48:18 +01:00
Sebastian Lenzlinger 3575c2010c deleted unused classes
work on:
NTtBFormatMsg
ClientMsgDecoder
Notice: no correct response is generated yet!
2022-03-25 14:44:47 +01:00
Sebastian Lenzlinger 2b10ff3294 Put the enum NTtBProtocol into the NightTrainProtocol class to have a authority class to validate and keep track of legal commands. 2022-03-25 13:12:03 +01:00
Sebastian Lenzlinger 846d0a8187 Noticed enums can be treated as clases to an extent so added a HashSet that accociates strings with Enum fields of the Protocol.
ProtocolValidator might become redundant!
2022-03-25 12:50:57 +01:00
Sebastian Lenzlinger 30986d2d86 Added ProtocolValidator class
added MSGRS command (message recieved, sent for server to client after recieving a msg with what was recieved as aprameters) to NTtBCommands
continued work on ClientMsgDecoder
2022-03-25 12:17:42 +01:00
Sebastian Lenzlinger 208b0d6586 addded ClientMsgDecoder class and a NoCommmandTokenException class 2022-03-25 11:58:37 +01:00
Sebastian Lenzlinger 90728e3833 Updates to various TODOs 2022-03-25 11:42:24 +01:00
Sebastian Lenzlinger 03d4942552 TODO in CLient: automate/hide connecting sequence in Client Constructor.
Added Comment to ClientHandler that the constructor atm implements connecting logic.
2022-03-25 11:27:41 +01:00
Sebastian Lenzlinger 04df8806cd Added some TODOs in Client.java 2022-03-24 15:57:53 +01:00
Sebastian Lenzlinger 3c89b60592 Clean up. 2022-03-24 15:49:05 +01:00
Sebastian Lenzlinger 65404c210b Merge remote-tracking branch 'origin/master' 2022-03-24 15:37:00 +01:00
Sebastian Lenzlinger dd898c1742 Implemented NTtBProtocolParser.java.
Still needs to be tested.
2022-03-24 15:36:50 +01:00
Sebastian Lenzlinger 532159d466 Updates NTtBCommands, that defines the NTtB Protocol, to include which commands mean what. Added Ping/pong classes where Pinging and Ping-Handling could be implemented. Tried to define useful interfaces. Added Some Command Classes, unsure if they will be needed. 2022-03-24 12:53:30 +01:00
Sebastian Lenzlinger 454f8331c7 Irrelevant change to NTtBFormatMsg constructor 2022-03-23 19:11:50 +01:00
Sebastian Lenzlinger 347984d0db Merge remote-tracking branch 'origin/master' 2022-03-23 19:07:53 +01:00
Sebastian Lenzlinger ccf36dff19 Merge remote-tracking branch 'origin/master' 2022-03-22 15:47:14 +01:00
Sebastian Lenzlinger e8157a6a91 Wiiter mit Client/Server, minor changes 2022-03-22 15:47:07 +01:00
Sebastian Lenzlinger 59a92fa145 Last Changes for Today (SL) 2022-03-21 22:51:38 +01:00
Sebastian Lenzlinger 5f01e494f4 Client Server w/ Group-Chat. 2022-03-21 22:44:29 +01:00
Sebastian Lenzlinger 4fcd68fef5 What am I doing... 2022-03-21 20:44:51 +01:00
Sebastian Lenzlinger 371efdf89c Renamed Client.java to ClientThread.java 2022-03-21 19:55:25 +01:00
Sebastian Lenzlinger fee41d1ef7 Merge remote-tracking branch 'origin/master' 2022-03-21 13:43:29 +01:00
Sebastian Lenzlinger c2676caf60 Added Client Server Skeleton 2022-03-21 13:43:15 +01:00
Sebastian Lenzlinger e79adc0e61 Added Client Server Skeleton 2022-03-21 13:42:42 +01:00
Sebastian f70581b267 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	build/reports/tests/test/classes/ch.unibas.dmi.dbis.cs108.example.HelloWorldTest.html
2022-03-14 13:52:53 +01:00
Sebastian 234ec707f7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	build/reports/tests/test/classes/ch.unibas.dmi.dbis.cs108.example.HelloWorldTest.html
#	build/reports/tests/test/index.html
#	build/reports/tests/test/packages/ch.unibas.dmi.dbis.cs108.example.html
#	build/test-results/test/TEST-ch.unibas.dmi.dbis.cs108.example.HelloWorldTest.xml
#	build/test-results/test/binary/results.bin
2022-03-14 13:52:25 +01:00
Sebastian 414ca85bed Merge remote-tracking branch 'origin/master'
# Conflicts:
#	build/reports/tests/test/classes/ch.unibas.dmi.dbis.cs108.example.HelloWorldTest.html
#	build/reports/tests/test/index.html
#	build/reports/tests/test/packages/ch.unibas.dmi.dbis.cs108.example.html
#	build/test-results/test/TEST-ch.unibas.dmi.dbis.cs108.example.HelloWorldTest.xml
#	build/test-results/test/binary/results.bin
2022-03-14 13:43:47 +01:00
Sebastian efd5c67144 Added my name to CONTRIBUTORS.txt 2022-03-14 13:42:28 +01:00
Sebastian 6c7bbc0df7 Added my name to CONTRIBUTORS.txt 2022-03-14 12:51:59 +01:00
Sebastian 31e532c8f2 Merge branch 'master' of ssh://git.scicore.unibas.ch:2222/cs108-fs22/Gruppe-8 2022-03-14 12:18:38 +01:00
Sebastian 7a6f6d1074 Added my name to CONTRIBUTORS.txt 2022-03-06 13:31:32 +01:00
Sebastian 9a2dc6ea4d Added my name to CONTRIBUTORS.txt 2022-03-06 13:31:20 +01:00
Sebastian 2ff36c6d57 Added my name file 2022-03-06 13:27:58 +01:00
Sebastian 27ae2dc157 Added my name file 2022-03-06 13:27:29 +01:00