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

Merge branch 'Fix/LastCheckstyles' into 'master'

Browse Source 
FIX:: checkstyle error button and missing javadoc

See merge request cse1105/2018-2019/oopp-group-43/template!90
This commit is contained in:
Mika Wauben
2019-04-15 05:44:50 +00:00
parent dd184a1398 84793dc924
commit facebc1334
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,7 @@ public class RegisterWindowController {
TimeUnit.MILLISECONDS.sleep(300);
addSlideAnimation(1100, passwordField2, -420);
signUpButton.setSkin(new registerButtonSkin(signUpButton));
signUpButton.setSkin(new RegisterButtonSkin(signUpButton));
}
/**
@@ -621,12 +621,12 @@ public class RegisterWindowController {
}
@SuppressWarnings("Duplicates")
public class registerButtonSkin extends ButtonSkin {
public class RegisterButtonSkin extends ButtonSkin {
/**
* registers button skins.
* @param button clicking
*/
public registerButtonSkin(Button button) {
public RegisterButtonSkin(Button button) {
super(button);
ScaleTransition scaleUp = new ScaleTransition(Duration.millis(140));

6
src/Client/src/main/java/greenify/client/rest/UserService.java
View File

@@ -371,6 +371,12 @@ public class UserService {
.encode().toUri(), String.class);
}
/**
* Hashes the password of a user.
* @param password password of the user
* @return hashed password
* @throws NoSuchAlgorithmException when there is no such algorithm
*/
public String hashPassword(String password)
throws NoSuchAlgorithmException {
MessageDigest digest = MessageDigest.getInstance("SHA-256");