diff options
| author | Andreas Weninger <e01526989@student.tuwien.ac.at> | 2018-05-16 14:16:03 +0200 | 
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-21 16:46:56 +0200 | 
| commit | c536a6ca362b25295b23884088b31aa9a1a7b312 (patch) | |
| tree | 450a545f59c88057a5aa20f8d6dd2345682cefd6 /src/main/java/at/ac/tuwien/sepm/assignment | |
| parent | cdf57c4aadaca14e75782cb42b6458fdae6d9a19 (diff) | |
| download | sepm-groupproject-c536a6ca362b25295b23884088b31aa9a1a7b312.tar.gz sepm-groupproject-c536a6ca362b25295b23884088b31aa9a1a7b312.tar.xz sepm-groupproject-c536a6ca362b25295b23884088b31aa9a1a7b312.zip  | |
[#25958] Reformating.
Diffstat (limited to 'src/main/java/at/ac/tuwien/sepm/assignment')
3 files changed, 23 insertions, 8 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java index 92386e1..ac8a626 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java @@ -74,7 +74,6 @@ public class VehicleServiceImpl implements VehicleService {      @Override      public Set<Vehicle> list(EnumSet<Status> statuses) throws ServiceException { -          if (statuses == null) {              throw new ServiceException("statuses may not be null");          } diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java index d0dcbae..b575699 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java @@ -12,16 +12,12 @@ import javafx.scene.Node;  import javafx.scene.image.Image;  import javafx.scene.image.ImageView;  import javafx.scene.text.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory;  public class VehiclePaneController { -    @FXML private Text txtType; -    @FXML private Text txtNumber; -    @FXML private ImageView ivNEF; -    @FXML private Text txtNEF; -    @FXML private ImageView ivQualification; -    @FXML private Text txtQualification; -    @FXML private Text txtRooftype; +    private static Logger LOG = LoggerFactory.getLogger(VehiclePaneController.class);      public static VehiclePaneController createVehiclePane() throws IOException {          FXMLLoader fxmlLoader = @@ -33,6 +29,14 @@ public class VehiclePaneController {          return result;      } +    @FXML private Text txtType; +    @FXML private Text txtNumber; +    @FXML private ImageView ivNEF; +    @FXML private Text txtNEF; +    @FXML private ImageView ivQualification; +    @FXML private Text txtQualification; +    @FXML private Text txtRooftype; +      private Node rootElement;      private Vehicle data; diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java index 512087f..41da62e 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java @@ -26,6 +26,7 @@ import java.util.List;  import java.util.Set;  import javafx.event.ActionEvent;  import javafx.fxml.FXML; +import javafx.scene.Node;  import javafx.scene.Parent;  import javafx.scene.Scene;  import javafx.scene.control.Alert; @@ -57,6 +58,7 @@ public class CreateOperationController {      public ListView lvActiveOperations;      public Label lblChosenVehicles;      public FlowPane fpVehicles; +    @FXML private Node smMenu;      private LinkedList<Vehicle> chosenVehicles = new LinkedList<>(); @@ -74,6 +76,10 @@ public class CreateOperationController {      @FXML      public void initialize() {          lblChosenVehicles.setText("keine ausgewählt"); + +        smMenu.setVisible(false); + +        //        showStatusMenu(500, 250);      }      public void updateList() { @@ -265,4 +271,10 @@ public class CreateOperationController {          updateList();      } + +    private void showStatusMenu(int x, int y) { +        smMenu.setVisible(true); +        smMenu.setLayoutX(x); +        smMenu.setLayoutY(y); +    }  }  | 
