sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX::More CheckStyle errors

Browse Source
This commit is contained in:
Merel Steenbergen
2019-04-04 20:59:08 +02:00
parent e929680477
commit 1684068385
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Client/src/main/java/greenify/client/controller/CalculatorController.java
View File

@@ -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!");
}
}

5
src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java
View File

@@ -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;

4
src/Client/src/main/java/greenify/client/controller/UserController.java
View File

@@ -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;