Commit Graph

202 Commits

Author SHA1 Message Date
Roman Schenk 86b57547cf Merge pull request #57 from PM2-IT21bWIN-ruiz-mach-krea/logging_and_docs
Logging and docs
2022-05-13 23:57:50 +02:00
Andrin Fassbind 631ea90225 Merge remote-tracking branch 'origin/main' 2022-05-13 23:57:41 +02:00
Andrin Fassbind 30afecb379 javadoc 2022-05-13 23:57:31 +02:00
Leonardo Brandenberger b52fbb6d55 Merge remote-tracking branch 'origin/main' 2022-05-13 23:56:37 +02:00
Leonardo Brandenberger c11d6f8ef7 Last javadoc and logger implemented 2022-05-13 23:56:26 +02:00
Roman Schenk d23d8cef74 Merge pull request #56 from PM2-IT21bWIN-ruiz-mach-krea/testing
fixed FileIO Test.
2022-05-13 23:54:59 +02:00
schrom01 5ed0f38db6 fixed FileIO Test. 2022-05-13 23:54:27 +02:00
schrom01 6f043e7925 javadocs in TournamentDecorator.java 2022-05-13 23:49:18 +02:00
Leonardo Brandenberger 1aa05d6251 Merge remote-tracking branch 'origin/main' 2022-05-13 23:48:38 +02:00
Leonardo Brandenberger 73ba3b3b9e Created Readme 2022-05-13 23:48:13 +02:00
fassband b598eb660b Merge pull request #55 from PM2-IT21bWIN-ruiz-mach-krea/testing
Testing
2022-05-13 23:48:11 +02:00
Andrin Fassbind ec256d40c6 FactoryDecoratorTest 2022-05-13 23:47:06 +02:00
Andrin Fassbind 2a8caf8efd FactoryDecoratorTest 2022-05-13 23:45:49 +02:00
schrom01 7f2776d49d javadocs in FactoryDecorator.java 2022-05-13 23:31:06 +02:00
schrom01 003f065662 fixed merge problem. 2022-05-13 23:29:39 +02:00
Roman Schenk 186c389bd2 uploaded new ClassDiagram 2022-05-13 23:04:17 +02:00
Roman Schenk 9f745b3198 Merge pull request #54 from PM2-IT21bWIN-ruiz-mach-krea/testing
Testing
2022-05-13 23:03:37 +02:00
Andrin Fassbind 4db2c582e2 merge conflict 2022-05-13 23:03:15 +02:00
Roman Schenk 4392fabc38 Merge branch 'main' into testing 2022-05-13 22:59:35 +02:00
Andrin Fassbind a8a2a0a463 create FactoryTest
merged
2022-05-13 22:56:24 +02:00
Roman Schenk caa21c8aa0 Merge pull request #53 from PM2-IT21bWIN-ruiz-mach-krea/logging_and_docs
Logging and docs added in several classes #27 #28
2022-05-13 22:54:03 +02:00
schrom01 7114097601 fixed merge problem. 2022-05-13 22:53:49 +02:00
Andrin Fassbind 418f583955 Merge remote-tracking branch 'origin/logging_and_docs' into testing
# Conflicts:
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Factory.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/LogConfiguration.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/AlertNewSchedule.java
#	app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
2022-05-13 22:53:30 +02:00
Roman Schenk bbaf70f9af Merge branch 'main' into logging_and_docs 2022-05-13 22:52:07 +02:00
Leonardo Brandenberger 56030d0baa Merge remote-tracking branch 'origin/logging_and_docs' into logging_and_docs 2022-05-13 22:43:07 +02:00
Leonardo Brandenberger 52b79ed501 PlacesFormularController JavaDoc and Logger 2022-05-13 22:42:51 +02:00
schrom01 92360ad607 finished javadocs in Factory.java 2022-05-13 22:41:42 +02:00
schrom01 30ae77a11d java docs in Factory.java 2022-05-13 22:35:05 +02:00
Andrin Fassbind 7f8de3e8f1 create FactoryTest 2022-05-13 22:35:01 +02:00
Andrin Fassbind df3fc5df2d create TeamTest 2022-05-13 22:22:39 +02:00
Leonardo Brandenberger f94572c1fe Fixed small logger error 2022-05-13 22:13:50 +02:00
Leonardo Brandenberger 023cb5a99f Added MainWindow and MainWindowController javadoc and logger 2022-05-13 22:11:03 +02:00
Leonardo Brandenberger 784cbfdd76 Added MainWindow and MainWindowController javadoc and logger 2022-05-13 22:10:41 +02:00
schrom01 aee3549669 uploaded ClassDiagram.png 2022-05-13 22:08:20 +02:00
Andrin Fassbind 2e314497db create PlaceTest 2022-05-13 22:06:58 +02:00
Andrin Fassbind fd06e24e21 create PersonTest 2022-05-13 21:54:21 +02:00
Andrin Fassbind 2ef4c3f584 create PlayerTest 2022-05-13 21:46:31 +02:00
Leonardo Brandenberger c7d9fd0908 FileIOTest Java Doc and also started with Factory and Factory Decorator 2022-05-13 21:15:31 +02:00
Andrin Fassbind 135ec7e8d5 sync TournamentTest with new changes
create GameTest
2022-05-13 21:11:33 +02:00
Andrin Fassbind c8eff00e33 Merge remote-tracking branch 'origin/main' into testing 2022-05-13 20:54:58 +02:00
fassband 9e599014ec Merge pull request #52 from PM2-IT21bWIN-ruiz-mach-krea/language_Dev
Language dev
2022-05-13 20:54:30 +02:00
Andrin Fassbind ac68af3638 extend dictionary 2022-05-13 20:53:33 +02:00
Andrin Fassbind c086cf18a4 test game 2022-05-13 19:41:20 +02:00
Andrin Fassbind d530d89db4 edit layout 2022-05-13 19:20:07 +02:00
Andrin Fassbind ddae1e297f solve bug PlacesFormularController id name not valid 2022-05-13 19:18:51 +02:00
Leonardo Brandenberger 459cd1bec8 Code Cleanup and Java Doc and logging 2022-05-13 19:09:51 +02:00
Andrin Fassbind 1b22506047 solve bug game teilnehmername 2022-05-13 19:00:08 +02:00
Andrin Fassbind dc54eaa872 Merge remote-tracking branch 'origin/main' into language_Dev 2022-05-13 18:57:39 +02:00
Andrin Fassbind c4f0a5335d Create Language Change 2022-05-13 18:57:27 +02:00
Leonardo Brandenberger b49ca9172d Code Cleanup in fileio, invalidnameexception and observers 2022-05-13 18:36:08 +02:00