Text wird aus der config.ini geladen + Readme.md angepasst + config.ini.sample

AlertHelper -> warn, info, error, exception

.gitignore

@@ -1,2 +1,3 @@
 .idea/
-out/
+out/
+conf.ini

README.md

@@ -0,0 +1,8 @@
+# Tourplaner
+
+# Config
+* DB informationen müssen in das config.ini.sample unter [db] eingetragen werden
+* Datei muss in config.ini umbenannt werden
+* [langde] beinhaltet alle Deutschen Texte der Gui
+* [start] beinhaltet den Title und infos die beim start verabeitet werden
+* [hilfe] beinhaltet die Links zu den Hilfeseiten

conf.ini

@@ -1,9 +0,0 @@
-[start]
-message = Tour Planer App gestartet
-
-[db]
-dbname = tourplaner
-url = 192.168.1.116
-port = 5432
-user = user
-pw = user

conf.ini.sample

@@ -0,0 +1,39 @@
+[start]
+message = Tour Planer App gestartet
+
+[db]
+dbname = tourplaner
+url =
+port = 5432
+user =
+pw =
+
+[hilfe]
+gitrepo = https://git.dergeorg.at/dergeorg/tourplaner
+doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner
+javadoc = https://git.dergeorg.at/dergeorg/tourplaner
+
+
+[langde]
+achtung = ACHTUNG
+openbrowsererror = TourplanerController -> Browser:
+browserexception = Browser Exception
+browserexceptionmsg = Error beim öffnen des Browsers
+suchfeldleer = Suchfeld ist leer!
+suchtextzuerst = Bitte zuerst den Suchtext in das Suchfeld eingeben!
+keinetourselected = Keine Tour ausgewählt!
+tournametitle = Tourname
+tournameheader = Bitte geben Sie den Namen der Tour an!
+tournamemsg = Name:
+namevergebenheader = Name bereits vergeben!
+namevergebenmsg1 = Der Name '
+namevergebenmsg2 = ' ist bereits vergeben, bitte verwenden Sie einen andern!
+startpunkttitle = Tour Startpunkt
+startpunktheader = Bitte geben Sie den Startpunkt der Tour an!
+startpunktmsg = Startpunkt:
+zielpunkttitle = Tour zielpunkt
+zielpunktheader = Bitte geben Sie den Zielpunkt der Tour an!
+zielpunktmsg = Zielpunkt:
+deltournoselect = ViewModel -> DelTour
+deltournoselectmsg = Bitte wählen Sie zuerst eine Tour aus, bevor Sie auf löschen klicken!
+exceptionstackheader = Exception stacktrace:

log/log4j/log.out

@@ -95,3 +95,45 @@ App started
 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 - 
+2021-03-17 15:36:24 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
+2021-03-17 15:38:41 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
+2021-03-17 16:02:24 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 16:02:24 INFO  PostgresHelper:15 - User Table created
+2021-03-17 16:02:26 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 16:02:26 ERROR NullPointerException:33 - 
+2021-03-17 16:03:16 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 16:03:16 INFO  PostgresHelper:15 - User Table created
+2021-03-17 16:03:18 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 16:03:18 ERROR NullPointerException:33 - 
+2021-03-17 16:04:18 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 16:04:18 INFO  PostgresHelper:15 - User Table created
+2021-03-17 16:04:20 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 16:04:20 ERROR NullPointerException:33 - 
+2021-03-17 16:04:26 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 16:04:26 INFO  PostgresHelper:15 - User Table created
+2021-03-17 16:04:28 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 16:04:28 ERROR NullPointerException:33 - 
+2021-03-17 16:06:47 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 16:06:47 INFO  PostgresHelper:15 - User Table created
+2021-03-17 16:06:49 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 16:06:49 ERROR NullPointerException:33 - 
+2021-03-17 16:06:55 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 16:06:55 INFO  PostgresHelper:15 - User Table created
+2021-03-17 16:06:57 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 16:06:57 ERROR NullPointerException:33 - 
+2021-03-17 17:02:33 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 17:02:33 INFO  PostgresHelper:15 - User Table created
+2021-03-17 17:02:35 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 17:02:35 ERROR NullPointerException:33 - 
+2021-03-17 17:02:38 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 17:02:38 INFO  PostgresHelper:15 - User Table created
+2021-03-17 17:02:40 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 17:02:40 ERROR NullPointerException:33 - 
+2021-03-17 17:08:23 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 17:08:23 INFO  PostgresHelper:15 - User Table created
+2021-03-17 17:08:25 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 17:08:25 ERROR NullPointerException:33 - 
+2021-03-17 17:08:31 INFO  TourPlaner:15 - Tour Planer App gestartet
+2021-03-17 17:08:31 INFO  PostgresHelper:15 - User Table created
+2021-03-17 17:08:33 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 17:08:33 ERROR NullPointerException:33 - 

src/tourplaner/Main.java

@@ -6,7 +6,7 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-import tourplaner.business.LogHelper;
+import tourplaner.business.ConfigHelper;
 
 import java.io.IOException;
 
@@ -20,7 +20,7 @@ public class Main extends Application {
     @Override
     public void start(Stage primaryStage) throws IOException {
         Parent root  = FXMLLoader.load(Main.class.getResource("tourplaner.fxml"));
-        primaryStage.setTitle("DerGeorg Touren Planer");
+        primaryStage.setTitle(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "apptitle"));
         primaryStage.setScene(new Scene(root, 600, 600));
         primaryStage.show();
     }

src/tourplaner/business/AlertHelper.java

@@ -0,0 +1,79 @@
+package tourplaner.business;
+
+import javafx.scene.control.Alert;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextInputDialog;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class AlertHelper {
+    public static void warn(String title, String header, String msg){
+        alertType(Alert.AlertType.WARNING, title, header, msg);
+    }
+    public static void inform(String title, String header, String msg){
+        alertType(Alert.AlertType.INFORMATION, title, header, msg);
+    }
+
+    public static void informNoHeader(String title, String msg){
+        inform(title, null, msg);
+    }
+
+    public static void error(String title, String header, String msg){
+        alertType(Alert.AlertType.ERROR, title, header, msg);
+    }
+
+    public static void exerror(String title, String header, String msg, Exception ex){
+        Alert alert = new Alert(Alert.AlertType.ERROR);
+        alert.setTitle(title);
+        alert.setHeaderText(header);
+        alert.setContentText(msg);
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        ex.printStackTrace(pw);
+        String exceptionText = sw.toString();
+        Label label = new Label(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "exceptionstackheader"));
+        TextArea textArea = new TextArea(exceptionText);
+        textArea.setEditable(false);
+        textArea.setWrapText(true);
+        textArea.setMaxWidth(Double.MAX_VALUE);
+        textArea.setMaxHeight(Double.MAX_VALUE);
+        GridPane.setVgrow(textArea, Priority.ALWAYS);
+        GridPane.setHgrow(textArea, Priority.ALWAYS);
+        GridPane expContent = new GridPane();
+        expContent.setMaxWidth(Double.MAX_VALUE);
+        expContent.add(label, 0, 0);
+        expContent.add(textArea, 0, 1);
+        alert.getDialogPane().setExpandableContent(expContent);
+        alert.showAndWait();
+    }
+
+    private static void alertType(Alert.AlertType alertly, String title, String header, String msg){
+        Alert alert = new Alert(alertly);
+        alert.setTitle(title);
+        alert.setHeaderText(header);
+        alert.setContentText(msg);
+
+        alert.showAndWait();
+    }
+
+    public static String inputText(String title, String header, String msg) {
+        TextInputDialog dialog = new TextInputDialog();
+        dialog.setTitle(title);
+        dialog.setHeaderText(header);
+        dialog.setContentText(msg);
+        Optional<String> result = dialog.showAndWait();
+        AtomicReference<String> returnText = new AtomicReference<>("");
+        result.ifPresent(returnText::set);
+        if(!returnText.get().isEmpty()){
+            return returnText.get();
+        }else{
+            return null;
+        }
+    }
+}

src/tourplaner/business/TourPlaner.java

@@ -10,8 +10,8 @@ public class TourPlaner{
     private Logger logger;
 
     public TourPlaner(){
-        String startText = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message");
+        LogHelper.info(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message"),
-        LogHelper.info(startText, "TourPlaner");
+                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "app"));
         new DbConnect().init();
 
     }

src/tourplaner/tourplaner.fxml

@@ -64,9 +64,9 @@
             <Menu mnemonicParsing="false" text="Optionen" />
         <Menu mnemonicParsing="false" text="Hilfe">
           <items>
-            <MenuItem mnemonicParsing="false" text="Git Repo" />
+            <MenuItem mnemonicParsing="false" onAction="#gitWebBrowser" text="Git Repo" />
-                  <MenuItem mnemonicParsing="false" text="JavaDoc" />
+                  <MenuItem mnemonicParsing="false" onAction="#javaDocBrowser" text="JavaDoc" />
-                  <MenuItem mnemonicParsing="false" text="Unspecified Action" />
+                  <MenuItem mnemonicParsing="false" onAction="#doxygenDocBrowser" text="Doxygen Doc" />
           </items>
         </Menu>
       </menus>
@@ -79,7 +79,7 @@
                   <Label layoutX="14.0" layoutY="4.0" text="Tours" />
                   <Button fx:id="tourDel" layoutX="89.0" mnemonicParsing="false" onAction="#delTour" text="-" />
                </children></AnchorPane>
-            <TextField fx:id="sucheInput" text="Suche...." />
+            <TextField fx:id="sucheInput" promptText="Suche..." />
             <Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen" />
          </children>
          <padding>

src/tourplaner/ui/TourplanerController.java

@@ -6,13 +6,22 @@ import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.geometry.Orientation;
 import javafx.scene.control.*;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.web.WebView;
+import tourplaner.business.AlertHelper;
+import tourplaner.business.ConfigHelper;
+import tourplaner.business.LogHelper;
 import tourplaner.object.Tour;
 import tourplaner.viewmodels.ViewModel;
 
+import java.awt.*;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ResourceBundle;
 
@@ -24,7 +33,53 @@ public class TourplanerController implements Initializable {
     public Tab kartenTab, beschreibungTab;
     public TableView<Tour> beschreibungTableView;
     public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
-    public TextField titleTextView;
+    public TextField titleTextView, sucheInput;
+
+    /**
+     * Öffnet github im standart browser
+     *
+     */
+    @FXML
+    private void gitWebBrowser(){
+       openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "gitrepo"), "Git");
+    }
+
+    /**
+     * Öffnet Java Doc im standart browser
+     *
+     */
+    @FXML
+    private void javaDocBrowser(){
+       openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "javadoc"), "JavaDoc");
+    }
+
+    /**
+     * Öffnet Doxygen Doc im standart browser
+     *
+     */
+    @FXML
+    private void doxygenDocBrowser(){
+        openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "doxygendoc"), "Doxygen");
+    }
+
+    /**
+     * Öffnet einen link im Standart Browser
+     * @param uriString
+     * @param appname
+     */
+    private void openBrowser(String uriString, String appname){
+        Desktop desktop = java.awt.Desktop.getDesktop();
+        try {
+            URI oURL = new URI(
+                    uriString);
+            desktop.browse(oURL);
+        } catch (URISyntaxException | IOException e) {
+            LogHelper.error(e.getMessage(), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "openbrowsererror") + appname);
+            AlertHelper.exerror(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "browserexception"),
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "openbrowsererror") + appname,
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "browserexceptionmsg"), e);
+        }
+    }
 
     /**
      * Wird gestartet wenn eine Tour in der Tour listView ausgewählt wird
@@ -79,7 +134,14 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void suche(){
-        this.viewModel.suche();
+        String sucheInput = this.sucheInput.getText();
+        if(sucheInput.isEmpty()){
+            AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "suchfeldleer"),
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "suchtextzuerst"));
+        }else {
+            this.viewModel.suche(sucheInput);
+        }
     }
 
     /**
@@ -92,7 +154,7 @@ public class TourplanerController implements Initializable {
         TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         TourListView.setOrientation(Orientation.VERTICAL);
         TourListView.setItems(this.viewModel.getTourNamen());
-        this.beschreibungTableView.setPlaceholder(new Label("Keine Tour ausgewählt!"));
+        this.beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected")));
-        this.titleTextView.setText("Keine Tour ausgewählt!");
+        this.titleTextView.setText( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"));
     }
 }

src/tourplaner/viewmodels/ViewModel.java

@@ -2,7 +2,11 @@ package tourplaner.viewmodels;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.scene.control.Alert;
 import javafx.scene.control.TextInputDialog;
+import tourplaner.business.AlertHelper;
+import tourplaner.business.ConfigHelper;
+import tourplaner.business.LogHelper;
 import tourplaner.business.TourPlaner;
 import tourplaner.object.Tour;
 import java.util.Optional;
@@ -15,37 +19,40 @@ public class ViewModel {
     private Tour selectedTour;
     private String neueTourName, neueTourStart, neueTourZiel;
 
+    /**
+     * Fügt eine neue Tour hinzu
+     */
     public void addTour(){
-        TextInputDialog dialogName = new TextInputDialog("");
+        while(this.neueTourName == null) {
-        dialogName.setTitle("Tour Name");
+            this.neueTourName = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournametitle"),
-        dialogName.setHeaderText("Bitte geben Sie den Namen der Tour an!");
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournameheader"),
-        dialogName.setContentText("Name: ");
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournamemsg"));
-        Optional<String> resultName = dialogName.showAndWait();
+            if (getTour(this.neueTourName) != null) {
-        resultName.ifPresent(sname ->  {
+                AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
-            this.neueTourName = resultName.get();
+                        ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenheader"),
-            TextInputDialog dialogStart = new TextInputDialog("");
+                        ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenmsg1")
-            dialogStart.setTitle("Tour Startpunkt");
+                                + this.neueTourName +
-            dialogStart.setHeaderText("Bitte geben Sie den Startpunkt der Tour an!");
+                                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenmsg2"));
-            dialogStart.setContentText("Startpunkt: ");
+                this.neueTourName = null;
-            Optional<String> resultStart = dialogStart.showAndWait();
+            }
-            resultStart.ifPresent(sstart -> {
+        }
-                this.neueTourStart = resultStart.get();
+        while(this.neueTourStart == null){
-                TextInputDialog dialogZiel = new TextInputDialog("");
+            this.neueTourStart = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunkttitle"),
-                dialogZiel.setTitle("Tour Zielpunkt");
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunktheader"),
-                dialogZiel.setHeaderText("Bitte geben Sie den Zielpunkt der Tour an!");
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunktmsg"));
-                dialogZiel.setContentText("Zielpunkt: ");
+        }
-                Optional<String> resultZiel = dialogZiel.showAndWait();
+        while(this.neueTourZiel == null){
-                resultZiel.ifPresent(sziel -> {
+            this.neueTourZiel = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunkttitle"),
-                    this.neueTourZiel = resultZiel.get();
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunktheader"),
-                    if (getTour(this.neueTourName) == null) {
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunktmsg"));
-                        tourData.add(new Tour(this.neueTourName, "120", new TourPlaner().getMapJson(this.neueTourStart, this.neueTourZiel), 22.3, this.neueTourStart, this.neueTourZiel));
+        }
-                        tourNamen.add(this.neueTourName);
+        if (getTour(this.neueTourName) == null) {
-                    }else{
+            tourData.add(new Tour(this.neueTourName, "TBD", "TBD", 0, this.neueTourStart, this.neueTourZiel));
-                        // TODO: 17.03.2021 Warning das dieser Tourname bereits vergeben ist
+            tourNamen.add(this.neueTourName);
-                    }
+        }
-                });
+        this.neueTourStart = null;
-            });
+        this.neueTourZiel = null;
-        });
+        this.neueTourName = null;
     }
 
     /**
@@ -109,12 +116,23 @@ public class ViewModel {
      * Entfernt eine Tour anhand der ausgewählten Tour
      */
     public void delTour(){
-        String tourname = this.selectedTour.getName();
+        try {
-        tourData.removeIf(s ->  s.getName().equals(tourname));
+            String tourname = this.selectedTour.getName();
-        tourNamen.removeIf(s -> s.equals(tourname));
+            tourData.removeIf(s -> s.getName().equals(tourname));
+            tourNamen.removeIf(s -> s.equals(tourname));
+        }catch (NullPointerException e){
+            LogHelper.error(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"),
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "deltournoselect"));
+            AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"),
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "deltournoselectmsg"));
+        }
     }
 
-    public void suche(){
+    /**
+     * Sucht eine Tour
+     */
+    public void suche(String suchString){
 
     }
 }