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

Merge branch 'fix/checkstyle' of gitlab.ewi.tudelft.nl:cse1105/2018-2019/oopp-group-43/template into fix/checkstyle

Browse Source
This commit is contained in:
Mika Wauben
2019-04-01 11:38:23 +00:00
parent fcaf3ddb49
commit 644f466696
4 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/reports/checkstyle/20190401_checkstyle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 135 KiB

30
src/Client/src/main/java/greenify/client/controller/DashBoardController.java
View File

@@ -41,6 +41,21 @@ public class DashBoardController {
public ObservableList<Friend> friendLeaderData = FXCollections.observableArrayList();
public ObservableList<Friend> globalLeaderData = FXCollections.observableArrayList();
//these need to be public because they are used by the calculatorController
//suppressing the checkstyle warnings because the fields have to be public
@SuppressWarnings("CheckStyle")
@FXML
public CheckBox localProduce;
@SuppressWarnings("CheckStyle")
@FXML
public CheckBox loweringTemp;
@SuppressWarnings("CheckStyle")
@FXML
public CheckBox bike;
@SuppressWarnings("CheckStyle")
@FXML
public CheckBox solarPanels;
@Autowired
UserService userService;
@@ -145,21 +160,6 @@ public class DashBoardController {
@FXML
private Label snacks;
//these need to be public because they are used by the calculatorController
//suppressing the checkstyle warnings because the fields have to be public
@SuppressWarnings("CheckStyle")
@FXML
public CheckBox localProduce;
@SuppressWarnings("CheckStyle")
@FXML
public CheckBox loweringTemp;
@SuppressWarnings("CheckStyle")
@FXML
public CheckBox bike;
@SuppressWarnings("CheckStyle")
@FXML
public CheckBox solarPanels;
/**
* Loads the the necessary things before anything else.
*/

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

@@ -1,6 +1,5 @@
package greenify.client.rest;
import com.sun.javafx.collections.MappingChange;
import greenify.common.UserDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -13,8 +12,6 @@ import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
import java.awt.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;