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

FIX::Illegal catch fix: RuntimeException to HttpClientErrorException

Browse Source
This commit is contained in:
Merel Steenbergen
2019-04-05 19:34:08 +02:00
parent dc432df120
commit fb22937864
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ import javafx.stage.Window;
import javafx.util.Duration; import javafx.util.Duration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.client.HttpClientErrorException;
import java.io.IOException; import java.io.IOException;
import java.text.DecimalFormat; import java.text.DecimalFormat;
@@ -221,7 +222,7 @@ public class RegisterWindowController {
//register the user with the provided username and password //register the user with the provided username and password
try { try {
userService.registerUser(userNameText.getText(), passwordField.getText()); userService.registerUser(userNameText.getText(), passwordField.getText());
} catch (Exception ex) { } catch (HttpClientErrorException ex) {
UserController.AlertHelper.showAlert(Alert.AlertType.ERROR, owner, "Username Error!", UserController.AlertHelper.showAlert(Alert.AlertType.ERROR, owner, "Username Error!",
"This username has already been taken!"); "This username has already been taken!");
return; return;

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

@@ -2,6 +2,7 @@ package greenify.client.controller;
import greenify.client.Application; import greenify.client.Application;
import greenify.client.rest.UserService; import greenify.client.rest.UserService;
import greenify.common.ApplicationException;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.Parent; import javafx.scene.Parent;
@@ -14,6 +15,7 @@ import javafx.stage.Stage;
import javafx.stage.Window; import javafx.stage.Window;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.client.HttpClientErrorException;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;
@@ -67,7 +69,7 @@ public class UserController {
//log the user in with the userService method //log the user in with the userService method
try { try {
userService.loginUser(usernameField.getText(), passwordField.getText()); userService.loginUser(usernameField.getText(), passwordField.getText());
} catch (RuntimeException ex) { } catch (HttpClientErrorException ex) {
AlertHelper.showAlert(Alert.AlertType.ERROR, owner, "Log-in Error!", AlertHelper.showAlert(Alert.AlertType.ERROR, owner, "Log-in Error!",
"Your username or password is incorrect!"); "Your username or password is incorrect!");
return; return;