designproject-design-6/src/main, branch import-export Unnamed repository; edit this file 'description' to name the repository. Merge branch 'main' into import-export 2025-11-16T07:01:58+00:00 sowgro tpoke.ferrari@gmail.com 2025-11-16T07:01:58+00:00 969b8071dd799dfaed939e10bf77b8a1ad42f9dc # Conflicts: # data/personaldb.json # src/main/java/design/controller/userinput/menus/MainMenu.java # src/main/java/design/persistence/JSONLeagueDatabase.java # src/main/java/design/persistence/JSONPersonalDatabase.java # src/test/java/design/model/ClubTest.java # src/test/java/design/model/GolferTest.java 
# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java
IMPORT-EXPORT WORKING!!!!!!!!!!!!!!!!!!!!!!!!!! 2025-11-16T06:56:27+00:00 sowgro tpoke.ferrari@gmail.com 2025-11-16T06:56:27+00:00 cf59d52cba70742f1d4098c38b4c7a798b3d89fa 






fix datetime issue
2025-11-16T05:22:00+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-16T05:22:00+00:00

4ac38e80c2442e085c53986f5717d44f9d2d821a












fix nulls
2025-11-16T04:27:40+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-16T04:27:40+00:00

73cb1c77c99330360313bb07fcbc3c23a2516680












export almost working
2025-11-14T01:05:25+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-14T01:05:25+00:00

9adc51f8d74577b5c4ae9c1f88341252f2c22939












added comments to adapter
2025-11-13T14:05:29+00:00

WillemDalton
willemhdalton@gmail.com

2025-11-13T14:05:29+00:00

38aacc304d5bc55a8e5705f9eb378ca18fc5a4a7












more work on adapting to XML
2025-11-13T14:00:56+00:00

WillemDalton
willemhdalton@gmail.com

2025-11-13T14:00:56+00:00

18a142e6d76288ae9bc6a597461e06a5ee02f6ad












added league JSON import/export, still working with XML import
2025-11-13T13:28:18+00:00

WillemDalton
willemhdalton@gmail.com

2025-11-13T13:28:18+00:00

0efa0586e27c173211153b186ae08eb3b7c8d588












fix constructor
2025-11-13T13:22:39+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-13T13:22:39+00:00

43530df067b1132b944e9619bdf60b72264829ec












Merge remote-tracking branch 'origin/league-model'
2025-11-13T13:20:04+00:00

sowgro
tpoke.ferrari@gmail.com

2025-11-13T13:20:04+00:00

c1bf473e5c6735ae00c3fbfec0f9d16c421387db

# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java





# Conflicts:
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/model/Golfer.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java