From 1684068385d5889b6ddb6618bf76848456abc5f2 Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Thu, 4 Apr 2019 20:59:08 +0200 Subject: [PATCH] FIX::More CheckStyle errors --- .../client/controller/CalculatorController.java | 11 ++++++++--- .../client/controller/RegisterWindowController.java | 5 ++--- .../greenify/client/controller/UserController.java | 4 +--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java index c080071..74ed99f 100644 --- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java +++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java @@ -14,7 +14,12 @@ import javafx.beans.value.ObservableValue; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.Node; -import javafx.scene.control.*; +import javafx.scene.control.Button; +import javafx.scene.control.CheckBox; +import javafx.scene.control.Label; +import javafx.scene.control.ScrollPane; +import javafx.scene.control.Slider; +import javafx.scene.control.TextField; import javafx.scene.layout.AnchorPane; import javafx.scene.text.Text; import javafx.stage.Stage; @@ -520,7 +525,7 @@ public class CalculatorController { Stage current = (Stage) owner; current.close(); controller.updateLeaderboard(); - CalculatorController.AlertHelper.showAlert - (Alert.AlertType.CONFIRMATION, owner, "Footprint saved!", "Your footprint is saved!"); + CalculatorController.AlertHelper.showAlert(Alert.AlertType.CONFIRMATION, + owner, "Footprint saved!", "Your footprint is saved!"); } } \ No newline at end of file diff --git a/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java b/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java index 5963a12..9ecad09 100644 --- a/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java +++ b/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java @@ -2,7 +2,6 @@ package greenify.client.controller; import greenify.client.Application; import greenify.client.rest.UserService; -import greenify.common.ApplicationException; import javafx.animation.Interpolator; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; @@ -229,10 +228,10 @@ public class RegisterWindowController { } //register the user with the provided username and password - try{ + try { userService.registerUser(userNameText.getText(), passwordField.getText()); } - catch(RuntimeException ex){ + catch (RuntimeException ex) { UserController.AlertHelper.showAlert(Alert.AlertType.ERROR, owner, "Username Error!", "This username has already been taken!"); return; diff --git a/src/Client/src/main/java/greenify/client/controller/UserController.java b/src/Client/src/main/java/greenify/client/controller/UserController.java index 4693577..19af71a 100644 --- a/src/Client/src/main/java/greenify/client/controller/UserController.java +++ b/src/Client/src/main/java/greenify/client/controller/UserController.java @@ -2,7 +2,6 @@ package greenify.client.controller; import greenify.client.Application; import greenify.client.rest.UserService; -import greenify.common.ApplicationException; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.Parent; @@ -17,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.util.Objects; /** @@ -70,7 +68,7 @@ public class UserController { try { userService.loginUser(usernameField.getText(), passwordField.getText()); } - catch(RuntimeException ex){ + catch (RuntimeException ex) { AlertHelper.showAlert(Alert.AlertType.ERROR, owner, "Log-in Error!", "Your username or password is incorrect!"); return;