FIX: Checkstyle fixes after merge conflicts

This commit is contained in:
Merel Steenbergen
2019-03-26 16:01:53 +01:00
parent a540b9e8f2
commit 2abad808ad
4 changed files with 18 additions and 7 deletions

View File

@@ -158,11 +158,16 @@ public class DashBoardController {
pathTrans.play();
}
/**
* Opens the calculator.
* @throws IOException if the Application doesn't load.
*/
public void openCalculator() throws IOException {
Parent calc = Application.load(this.getClass().getClassLoader()
.getResource("fxml/calculator.fxml"));
Scene scene = new Scene(calc);
scene.getStylesheets().add(getClass().getClassLoader().getResource("stylesheets/calculatorStyle.css").toExternalForm());
scene.getStylesheets().add(getClass().getClassLoader()
.getResource("stylesheets/calculatorStyle.css").toExternalForm());
Stage calcStage = new Stage();
calcStage.setScene(scene);

View File

@@ -99,6 +99,12 @@ public class UserService {
.encode().toUri(), String.class);
}
/**
* Adds a friend to the user.
* @param name the username of the current user.
* @param friend the username of the friend you want to add.
* @return a userDTO
*/
@SuppressWarnings("Duplicates")
public String addFriend(String name, String friend) {
HttpHeaders headers = new HttpHeaders();