Beenden Knopf

log/log4j/log.out

@@ -91,3 +91,7 @@ App started
 2021-03-17 14:48:46 INFO  PostgresHelper:15 - User Table created
 2021-03-17 14:48:48 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
 2021-03-17 14:48:48 ERROR NullPointerException:33 - 
+2021-03-17 15:20:09 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 15:20:09 INFO  PostgresHelper:15 - User Table created
+2021-03-17 15:20:11 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
+2021-03-17 15:20:11 ERROR NullPointerException:33 - 

src/tourplaner/tourplaner.fxml

@@ -39,7 +39,6 @@
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SeparatorMenuItem?>
 <?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
@@ -58,51 +57,16 @@
       <menus>
         <Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
           <items>
-            <MenuItem mnemonicParsing="false" text="Neu" />
-            <MenuItem mnemonicParsing="false" text="Öffnen" />
-            <Menu mnemonicParsing="false" text="Open Recent" />
-            <SeparatorMenuItem mnemonicParsing="false" />
-            <MenuItem mnemonicParsing="false" text="Close" />
-            <MenuItem mnemonicParsing="false" text="Save" />
-            <MenuItem mnemonicParsing="false" text="Save As…" />
-            <MenuItem mnemonicParsing="false" text="Revert" />
-            <SeparatorMenuItem mnemonicParsing="false" />
-            <MenuItem mnemonicParsing="false" text="Preferences…" />
-            <SeparatorMenuItem mnemonicParsing="false" />
-            <MenuItem mnemonicParsing="false" text="Quit" />
-          </items>
-        </Menu>
-        <Menu mnemonicParsing="false" text="Bearbeiten">
-          <items>
-            <MenuItem mnemonicParsing="false" text="Undo" />
-            <MenuItem mnemonicParsing="false" text="Redo" />
-            <SeparatorMenuItem mnemonicParsing="false" />
-            <MenuItem mnemonicParsing="false" text="Cut" />
-            <MenuItem mnemonicParsing="false" text="Copy" />
-            <MenuItem mnemonicParsing="false" text="Paste" />
-            <MenuItem mnemonicParsing="false" text="Delete" />
-            <SeparatorMenuItem mnemonicParsing="false" />
-            <MenuItem mnemonicParsing="false" text="Select All" />
-            <MenuItem mnemonicParsing="false" text="Unselect All" />
-          </items>
-        </Menu>
-            <Menu mnemonicParsing="false" text="Optionen">
-               <items>
-                  <MenuItem mnemonicParsing="false" text="Undo" />
-                  <MenuItem mnemonicParsing="false" text="Redo" />
-                  <SeparatorMenuItem mnemonicParsing="false" />
-                  <MenuItem mnemonicParsing="false" text="Cut" />
-                  <MenuItem mnemonicParsing="false" text="Copy" />
-                  <MenuItem mnemonicParsing="false" text="Paste" />
-                  <MenuItem mnemonicParsing="false" text="Delete" />
-                  <SeparatorMenuItem mnemonicParsing="false" />
-                  <MenuItem mnemonicParsing="false" text="Select All" />
-                  <MenuItem mnemonicParsing="false" text="Unselect All" />
+            <MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden" />
           </items>
         </Menu>
+        <Menu mnemonicParsing="false" text="Bearbeiten" />
+            <Menu mnemonicParsing="false" text="Optionen" />
         <Menu mnemonicParsing="false" text="Hilfe">
           <items>
-            <MenuItem mnemonicParsing="false" text="About MyHelloApp" />
+            <MenuItem mnemonicParsing="false" text="Git Repo" />
+                  <MenuItem mnemonicParsing="false" text="JavaDoc" />
+                  <MenuItem mnemonicParsing="false" text="Unspecified Action" />
           </items>
         </Menu>
       </menus>
@@ -126,11 +90,7 @@
       <items>
             <AnchorPane prefWidth="239.0">
                <children>
-                  <ListView fx:id="TourListView" layoutX="-1.0" onMouseClicked="#tourListSelectedItem" prefHeight="520.0" prefWidth="190.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <padding>
-                        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-                     </padding>
-                  </ListView>
+                  <ListView fx:id="TourListView" layoutX="-1.0" onMouseClicked="#tourListSelectedItem" prefHeight="520.0" prefWidth="190.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
                </children>
             </AnchorPane>
             <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="496.0" prefWidth="620.0">

src/tourplaner/ui/TourplanerController.java

@@ -26,9 +26,14 @@ public class TourplanerController implements Initializable {
     public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
     public TextField titleTextView;
 
+    /**
+     * Wird gestartet wenn eine Tour in der Tour listView ausgewählt wird
+     * @param mouseEvent Triggered Event
+     */
     @FXML
     private void tourListSelectedItem(MouseEvent mouseEvent){
         String selectedItem = TourListView.getSelectionModel().getSelectedItem();
+        this.viewModel.selectTour(selectedItem);
         titleTextView.setText(selectedItem);
         beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
         beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
@@ -39,29 +44,55 @@ public class TourplanerController implements Initializable {
         nameCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("name"));
     }
 
+    /**
+     * Beendet die App
+     * Verbunden mit dem Menu -> Datei -> Beenden
+     */
+    @FXML
+    private void quitApp(){
+        System.exit(0);
+    }
+
+    /**
+     * Fügt eine Tour hinzu
+     * Verbunden mit Button -> Tour -> +
+     */
     @FXML
     private void addTour(){
         this.viewModel.addTour();
     }
 
+    /**
+     * Entfernt eine ausgewählte Tour
+     * Verbunden mit Button -> Tour -> -
+     */
     @FXML
     private void delTour(){
+        this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
+        this.titleTextView.setText("Keine Tour ausgewählt!");
         this.viewModel.delTour();
     }
 
+    /**
+     * Sucht eine Tour
+     * Verbunden mit Button -> Suche
+     */
     @FXML
     private void suche(){
         this.viewModel.suche();
     }
 
-    @FXML
-    private WebView mapView;
-
+    /**
+     * Wird beim Start ausgeführt
+     * @param url
+     * @param resourceBundle
+     */
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
         TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         TourListView.setOrientation(Orientation.VERTICAL);
         TourListView.setItems(this.viewModel.getTourNamen());
         this.beschreibungTableView.setPlaceholder(new Label("Keine Tour ausgewählt!"));
+        this.titleTextView.setText("Keine Tour ausgewählt!");
     }
 }

src/tourplaner/viewmodels/ViewModel.java

@@ -11,7 +11,8 @@ import java.util.concurrent.atomic.AtomicReference;
 public class ViewModel {
     private final ObservableList<Tour> tourData = FXCollections.observableArrayList(new Tour("Test 1", "120", "json dings", 22.3, "Wien", "Graz"),new Tour("Test 2", "210", "json dings", 42.3, "Da", "Dort"));
     private final ObservableList<String> tourNamen = FXCollections.observableArrayList("Test 1", "Test 2");
-    private final ObservableList<Tour> selectedTour = FXCollections.observableArrayList();
+    //private final ObservableList<Tour> selectedTour = FXCollections.observableArrayList();
+    private Tour selectedTour;
     private String neueTourName, neueTourStart, neueTourZiel;
 
     public void addTour(){
@@ -47,15 +48,6 @@ public class ViewModel {
         });
     }
 
-    /**
-     * Entfernt eine Tour anhand des Tournamens
-     * @param tourname Name der zu entfernenden Tour
-     */
-    public void removeTour(String tourname){
-        tourData.removeIf(s ->  s.getName().equals(tourname));
-        tourNamen.removeIf(s -> s.equals(tourname));
-    }
-
     /**
      * Holt das Tourobjekt anhand des Namens
      * @param tourname Name der Tour
@@ -71,12 +63,13 @@ public class ViewModel {
         return returnTour.get();
     }
 
-//    public void selectTour(String tourname){
+    public void selectTour(String tourname){
+        this.selectedTour = getTour(tourname);
 //        this.selectedTour.removeIf(s -> true);//Alle deselect
 //        this.selectedTour.add(getTour(tourname));
-//    }
+    }
 
-    public ObservableList<Tour> getSelectedTour() {
+    public Tour getSelectedTour() {
         return selectedTour;
     }
 
@@ -112,7 +105,13 @@ public class ViewModel {
         return tourData;
     }
 
+    /**
+     * Entfernt eine Tour anhand der ausgewählten Tour
+     */
     public void delTour(){
+        String tourname = this.selectedTour.getName();
+        tourData.removeIf(s ->  s.getName().equals(tourname));
+        tourNamen.removeIf(s -> s.equals(tourname));
     }
 
     public void suche(){