steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'quickfixforconfigissue' into 'main'

Browse source 
fixed 2 checkstyle errors and ConfigServiceTest.java issue

See merge request cse1105/2025-2026/teams/csep-team-76!27
This commit is contained in:
Aysegul Aydinlik 2025-12-18 03:00:11 +01:00
commit 397bbedd9f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/main/java/client/utils/Navigation.java
View file

@ -9,7 +9,7 @@ public class Navigation {
private final MyFXML myFXML; private final MyFXML myFXML;
private Pane screen; private Pane screen;
/** /**.
* Constructs a Navigation Object that uses a fxml object and Pane that will allow to switch UI screens * Constructs a Navigation Object that uses a fxml object and Pane that will allow to switch UI screens
* @param x - a MyFXML Object * @param x - a MyFXML Object
* @param y - a Pane Object * @param y - a Pane Object
@ -19,7 +19,7 @@ public class Navigation {
this.screen = y; this.screen = y;
} }
/** /**.
* The show function takes in an FxmlPath and changes the current pane to the value given by the path * The show function takes in an FxmlPath and changes the current pane to the value given by the path
* using the load function of the myFXML object * using the load function of the myFXML object
* @param fxmlpath - FXML path provided to show the next pane * @param fxmlpath - FXML path provided to show the next pane

2
client/src/test/java/client/scenes/ConfigServiceTest.java
View file

@ -41,7 +41,7 @@ public class ConfigServiceTest {
{ {
"language": "de", "language": "de",
"serverUrl": "http://exmple12.com", "serverUrl": "http://exmple12.com",
"favourites": ["banana bread", "pineapple pie"], "favourites": [23412, 25412],
"shoppingList": ["milk", "butter"] "shoppingList": ["milk", "butter"]
} }
"""; """;