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

src/Client/src/main/java/greenify/client/controller/CalculatorController.java

@@ -472,16 +472,16 @@ public class CalculatorController {
                     servicesLabel.getText().replace("€ / month", ""));
         }
         Float footprint = userService.saveFootprint(userService.currentUser.getName());
-        if(localProduceCheckbox.isSelected()) {
+        if (localProduceCheckbox.isSelected()) {
             controller.localProduce.setSelected(true);
         }
-        if(bikeCheckbox.isSelected()) {
+        if (bikeCheckbox.isSelected()) {
             controller.bike.setSelected(true);
         }
-        if(temperatureCheckbox.isSelected()) {
+        if (temperatureCheckbox.isSelected()) {
             controller.loweringTemp.setSelected(true);
         }
-        if(solarPanelsCheckbox.isSelected()) {
+        if (solarPanelsCheckbox.isSelected()) {
             controller.solarPanels.setSelected(true);
         }
         Window owner = saveButton.getScene().getWindow();

src/Client/src/main/java/greenify/client/controller/DashBoardController.java

@@ -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.
      */

src/Client/src/main/java/greenify/client/rest/UserService.java

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