Setting -> Deutsch / Englisch

langen.ini

@@ -0,0 +1,62 @@
+[langen]
+achtung = ATTENTION
+openbrowsererror = TourplanerController -> Browser:
+browserexception = Browser Exception
+browserexceptionmsg = Error at opening Browser
+suchfeldleer = Search field is empty!
+suchtextzuerst = Please enter search term first!
+keinetourselected = No Tour selected
+tournametitle = Tour name
+tournameheader = Please enter a Tourname!
+tournamemsg = Name:
+namevergebenheader = Name is already occupied!
+namevergebenmsg1 = The name '
+namevergebenmsg2 = ' is already in use!
+startpunkttitle = Tour start
+startpunktheader = Please enter the start of the Tour
+startpunktmsg = Start:
+zielpunkttitle = Tour destination:
+zielpunktheader = Please enter the tour destination!
+zielpunktmsg = Destination:
+deltournoselect = ViewModel -> DelTour
+deltournoselectmsg = Please select a tour first!
+exceptionstackheader = Exception stacktrace:
+keinelogsvorhanden = First add a Log!
+datum = Date
+dauer = Duration
+strecke = Distance
+streckemsg = Distance of the log entry
+dauermsg = Duration of the log entry
+doppelpunkt = :
+fktnichtimplementiert = Not implementet jet
+vergessenodernochnichtsoweit = Not implementet jet
+logtournotselectedmsg = Please select a tour first!
+keintextimfeld = Please enter a text!
+nurzahlen = Only numbers!
+nurpositivezahlen = Only positiv numbers!
+pause = Break
+pausemsg = Duration of the break
+hightmeter = Vertical meters
+hightmetermsg = Vertical meters of the etape
+bemerkung = Comment
+bemerkungheader = Please enter a Comment, can also be empty!
+tourreportvon = Tour Report from ->
+tourplanervon = Tourplaner by DerGeorg
+reportkeywords = Tourplaner, Tour, Report
+tourplaner = Tourplaner
+tour = Tour
+reportvon = Report created by:
+reportstart = Start of the tour:
+reportziel = Destination of the tour:
+reportdauercal = Calculated duration of the tour:
+reportstreckecal = Calculated distance of the tour:
+logs = Logs
+countlog = Number of log entries:
+logvom = Log from:
+logdauer = Duration:
+logpause = Break from that:
+loggegangen = Gone away:
+logavg = Calculated averrage speed:
+logstrecke = Distance:
+loghight = Vertical meters:
+logbemerkung = Comment:

src/tourplaner/business/ConfigHelper.java

@@ -43,7 +43,7 @@ public class ConfigHelper {
         try {
             ini = new Wini(new File(filename));
         } catch (IOException e) {
-            LogHelper.error(e.getMessage(), e.getClass().getName());
+            LogHelper.error(e);
         }
         assert ini != null;
         return ini.get(sectionName, optionName, String.class);
@@ -56,7 +56,7 @@ public class ConfigHelper {
      * @return Den angeforderten String
      */
     public static String getLangIniString(String optionName){
-        return ConfigHelper.getIniString(ConfigHelper.getStandartLangde(), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
+        return ConfigHelper.getIniString(getIniString(getStandartConfig(), "lang", "lang") + ".ini", ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
     }
 
     /**
@@ -92,7 +92,7 @@ public class ConfigHelper {
             ini.put(sectionName, optionName, value);
             ini.store();
         } catch (IOException e) {
-            LogHelper.error(e.getMessage(), e.getClass().getName());
+            LogHelper.error(e);
         }
     }
 

src/tourplaner/business/DirectionMap.java

@@ -31,8 +31,10 @@ public class DirectionMap {
         FileHelper.saveImage(this.map, "jpg", new File(this.file));
         FileHelper.saveImage(this.mappdf, "jpg", new File(this.filepdf));
         getDirections(start, ende);
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
             FileHelper.openDefault(file);
         }
+    }
 
     /**
      * Get berechnete Dauer in Minuten
@@ -68,7 +70,10 @@ public class DirectionMap {
      * @throws IOException Fehler beim besorgen der infos über die Tour
      */
     private void getDirections(String start, String ende) throws IOException {
+        System.out.println("LOCS: " + start + ende);
         String json = HttpHelper.httpGetJsonString("https://www.mapquestapi.com/directions/v2/route?key="+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")+"&from="+start+"&to="+ende+"&outFormat=json&ambiguities=ignore&routeType=fastest&doReverseGeocode=false&enhancedNarrative=false&avoidTimedConditions=false");
+        System.out.println("JSON: " + json);
+        System.out.println("URL https://www.mapquestapi.com/directions/v2/route?key="+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")+"&from="+start+"&to="+ende+"&outFormat=json&ambiguities=ignore&routeType=fastest&doReverseGeocode=false&enhancedNarrative=false&avoidTimedConditions=false");
         this.strecke = JsonHelper.getDoubleFromJson(json, "distance");
         this.dauer = formatetTimeToMinutes(JsonHelper.getStingFromJson(json, "formattedTime"));
     }

src/tourplaner/business/Exporter.java

@@ -3,7 +3,10 @@ package tourplaner.business;
 import tourplaner.data.DbConnect;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
+import tourplaner.ui.AlertHelper;
+import tourplaner.ui.ProgressBar;
 
+import javax.swing.*;
 import java.io.*;
 import java.util.ArrayList;
 
@@ -28,10 +31,16 @@ public class Exporter {
      * @throws IOException Fehler beim File erstellen
      */
     public void doExport() throws IOException {
+        ProgressBar progressBar = new ProgressBar("Export...");
+        int step = progressBar.getProgressSize(4, 100);
         ArrayList<Tour> data = new DbConnect().getAllTouren();
+        progressBar.addProgress(step);
         FileWriter fileWriter = new FileWriter(path + ".json");
+        progressBar.addProgress(step);
         JsonHelper.getJsonFromObj(data, fileWriter);
+        progressBar.addProgress(step);
         BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+        progressBar.setProgress(100);
         bufferedWriter.close();
     }
 
@@ -39,17 +48,29 @@ public class Exporter {
      * Führt den Imput aus -> File holen, Daten in db erstellen
      * @throws IOException Fehler beim File öffnen
      */
-    public void doImport() throws IOException {
+    public void doImport() {
+        ProgressBar progressBar = new ProgressBar("Import...");
+        try {
             this.touren = JsonHelper.getTourenFromJson(new FileReader(this.path));
             DbConnect dbConnect = new DbConnect();
             dbConnect.delAllData();
+            progressBar.addProgress(5);
+            int size = progressBar.getProgressSize(this.touren.size() * 3, 100);
             for (Tour tour:this.touren) {
                     new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
+                progressBar.addProgress(size);
                 dbConnect.addTour(tour);
+                progressBar.addProgress(size);
                 ArrayList<Log> logs = tour.getLogs();
                 for (Log log:logs) {
                     dbConnect.addLog(tour.getName(), log);
                 }
-        }
+                progressBar.addProgress(size);
+            }
+        } catch (IOException e) {
+            LogHelper.error(e);
+            progressBar.setProgress(100);
+        }
+        progressBar.setProgress(100);
     }
 }

src/tourplaner/business/Reporter.java

@@ -53,8 +53,10 @@ public class Reporter {
         } catch (DocumentException | FileNotFoundException e) {
             LogHelper.error(e.getMessage(), e.getClass().getName());
         }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1) {
             FileHelper.openDefault(file);
         }
+    }
 
     /**
      * Content des Sumary reports
@@ -109,8 +111,10 @@ public class Reporter {
         } catch (DocumentException | FileNotFoundException e) {
             LogHelper.error(e.getMessage(), e.getClass().getName());
         }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1) {
             FileHelper.openDefault(file);
         }
+    }
 
     // iText allows to add metadata to the PDF which can be viewed in your Adobe
     // Reader

src/tourplaner/business/TourPlaner.java

@@ -4,6 +4,7 @@ import org.apache.log4j.Logger;
 import tourplaner.data.DbConnect;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
+import tourplaner.ui.ProgressBar;
 
 import java.awt.*;
 import java.io.File;
@@ -39,12 +40,18 @@ public class TourPlaner{
      * @return false bei error
      */
     public static boolean editTour(String oldname, Tour tour) throws IOException {
+        ProgressBar progressBar = new ProgressBar("Edit...");
+        int step = progressBar.getProgressSize(3, 100);
         FileHelper.delFile(new File(getImagePath(oldname)));
         FileHelper.delFile(new File(getImagePdfPath(oldname)));
+        progressBar.addProgress(step);
         DirectionMap directionMap = new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
+        progressBar.addProgress(step);
         tour.setDauer(directionMap.getDauer()+"");
         tour.setStrecke(directionMap.getStrecke());
-        return new DbConnect().editTour(oldname, tour);
+        boolean ret = new DbConnect().editTour(oldname, tour);
+        progressBar.setProgress(100);
+        return ret;
     }
 
     /**
@@ -53,20 +60,30 @@ public class TourPlaner{
      * @return false bei error
      */
     public static boolean delTour(String tourname){
+        ProgressBar progressBar = new ProgressBar("Del...");
+        int step = progressBar.getProgressSize(3, 100);
         FileHelper.delFile(new File(getImagePath(tourname)));
+        progressBar.addProgress(step);
         FileHelper.delFile(new File(getImagePdfPath(tourname)));
-        return new DbConnect().delTour(tourname);
+        progressBar.addProgress(step);
+        boolean ret = new DbConnect().delTour(tourname);
+        progressBar.setProgress(100);
+        return ret;
     }
     /**
      * Fügt eine Tour hinzu
      * @param newTour Neue Tour
      * @return false bei error
      */
-    public static boolean addTour(Tour newTour) throws IOException {
+    public static boolean addTour(Tour newTour, ProgressBar progressBar) throws IOException {
+        int step = progressBar.getProgressSize(2, 100);
         DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
+        progressBar.addProgress(step);
         newTour.setDauer(directionMap.getDauer()+"");
         newTour.setStrecke(directionMap.getStrecke());
-        return new DbConnect().addTour(newTour);
+        boolean ret = new DbConnect().addTour(newTour);
+        progressBar.setProgress(100);
+        return ret;
     }
 
     /**
@@ -102,8 +119,10 @@ public class TourPlaner{
      * @param tourname Tourname
      */
     public static void openImage(String tourname){
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
             FileHelper.openDefault(getImagePath(tourname));
         }
+    }
 
 
     /**
@@ -165,14 +184,18 @@ public class TourPlaner{
     }
 
     /**
-     * Exportiert die Daten
+     * Sucht alle touren die den gegebenen tournamen enthalten
-     * @param path Path zu den Daten
+     * @param tourname Name der zu suchen ist
-     * @throws IOException Fehler beim schreiben der Daten
+     * @return Alle touren die auf den Suchterm passen
      */
-    public static void exportData(String path) throws IOException {
+    public static ArrayList<Tour> sucheTour(String tourname){
-            Exporter exporter = new Exporter(path);
+        ArrayList<Tour> touren = new ArrayList<>();
-            exporter.doExport();
+        getAllTours().forEach(t ->{
-            FileHelper.openDefault(path);
+            if(t.getName().contains(tourname)){
+                touren.add(t);
+            }
+        });
+        return touren;
     }
 
 }

src/tourplaner/data/DbConnect.java

@@ -1,13 +1,13 @@
 package tourplaner.data;
 
 import javafx.geometry.Pos;
+import tourplaner.business.LogHelper;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
+import tourplaner.ui.AlertHelper;
+import tourplaner.ui.ProgressBar;
 
-import java.sql.Connection;
+import java.sql.*;
-import java.sql.Date;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.time.LocalDate;
 import java.util.ArrayList;
 
@@ -155,10 +155,25 @@ public class DbConnect {
     }
 
     public boolean delLog(String tourname, String id){
-        System.out.println("DELETE FROM public.log WHERE tourname = '"+tourname+"' and id = '"+id+"'");
         return PostgresHelper.executeUpdate("DELETE FROM public.log WHERE tourname = '"+tourname+"' and id = '"+id+"'");
     }
 
+    private int getTourSize() throws SQLException {
+        Connection con = PostgresHelper.con();
+        Statement s = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
+        ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM tour;");
+        int size =0;
+        if (rs != null)
+        {
+            rs.last();    // moves cursor to the last row
+            size = rs.getInt("count"); // get row id
+            con.close();
+            return size;
+        }
+        con.close();
+        return -1;
+    }
+
     /**
      * Holt alle Touren aus der Datenbank
      * @return Null bei fehler, sonst eine List aus den IDs
@@ -167,9 +182,11 @@ public class DbConnect {
         this.c = PostgresHelper.con();
         String tourname, mapjson, start, ziel;
         double dauer, strecke;
-
         ArrayList<Tour> touren = new ArrayList<>();
+        ProgressBar progressBar = new ProgressBar("Get...");
         try {
+            int tourSize = getTourSize();
+            int step =  progressBar.getProgressSize(tourSize, 100);
             stmt = this.c.createStatement();
             ResultSet rs = stmt.executeQuery("select * from tour;");
             while (rs.next()) {
@@ -181,16 +198,20 @@ public class DbConnect {
                 strecke = rs.getDouble("strecke");
                 if (!tourname.isEmpty()) {
                     touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel, getLogs(tourname)));
+                    progressBar.addProgress(step);
                 }else {
+                    progressBar.setProgress(100);
                     return null;
                 }
             }
+            progressBar.setProgress(100);
             rs.close();
             stmt.close();
             this.c.close();
             return touren;
         } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            LogHelper.error(e);
+            progressBar.setProgress(100);
             return null;
         }
     }

src/tourplaner/tourplaner.fxml

@@ -45,6 +45,8 @@
       <menus>
         <Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
           <items>
+                  <MenuItem mnemonicParsing="false" onAction="#reportSum" text="Report Summary" />
+                  <MenuItem mnemonicParsing="false" onAction="#tourReport" text="Tour Report" />
             <MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden" />
           </items>
         </Menu>
@@ -52,13 +54,18 @@
                <items>
                   <MenuItem mnemonicParsing="false" onAction="#importBtn" text="Import" />
                   <MenuItem mnemonicParsing="false" onAction="#exportBtn" text="Export" />
-                  <MenuItem mnemonicParsing="false" onAction="#reportSum" text="Report alles" />
-                  <MenuItem mnemonicParsing="false" onAction="#tourReport" text="Tour Report erstellen" />
                </items>
         </Menu>
             <Menu mnemonicParsing="false" text="Optionen">
                <items>
-                  <MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
+                  <CheckMenuItem fx:id="openmap" mnemonicParsing="false" onAction="#openmapaction" text="Map automatisch öffnen" />
+                  <CheckMenuItem fx:id="openpdf" mnemonicParsing="false" onAction="#openpdfaction" text="Report automatisch öffnen" />
+                  <Menu mnemonicParsing="false" text="Sprache">
+                    <items>
+                        <RadioMenuItem fx:id="langdeutsch" mnemonicParsing="false" onAction="#onlangdeutsch" text="Deutsch" />
+                        <RadioMenuItem fx:id="langenglisch" mnemonicParsing="false" onAction="#onlangenglisch" text="Englisch" />
+                    </items>
+                  </Menu>
                </items>
             </Menu>
         <Menu mnemonicParsing="false" text="Hilfe">

src/tourplaner/ui/AlertHelper.java

@@ -12,6 +12,10 @@ import javafx.stage.WindowEvent;
 import tourplaner.business.ConfigHelper;
 
 import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.time.LocalDate;

src/tourplaner/ui/ProgressBar.java

@@ -0,0 +1,66 @@
+package tourplaner.ui;
+
+import javafx.scene.image.Image;
+import tourplaner.business.ConfigHelper;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+public class ProgressBar {
+    private int status;
+    private JFrame frame;
+    private JProgressBar progressBar;
+
+    public ProgressBar(String title){
+        this.frame = new JFrame(title);
+        File pathToFile = new File(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "logo"));
+        try {
+            BufferedImage image = ImageIO.read(pathToFile);
+            this.frame.setIconImage(image);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        this.frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+        Container content = this.frame.getContentPane();
+        this.progressBar = new JProgressBar();
+        this.progressBar.setValue(0);
+        this.progressBar.setStringPainted(true);
+        TitledBorder border = BorderFactory.createTitledBorder("Laden....");
+        this.progressBar.setBorder(border);
+        content.add(this.progressBar, BorderLayout.NORTH);
+        this.frame.setSize(300, 100);
+        this.frame.setVisible(true);
+    }
+
+    public void addProgress(int add){
+        this.status += add;
+        this.progressBar.setValue(this.status);
+        closeOnFinish();
+    }
+
+    private void closeOnFinish(){
+        if(this.status >= 100){
+            closeProgress();
+        }
+    }
+
+    public void setProgress(int set){
+        this.status = set;
+        closeOnFinish();
+    }
+
+    public void closeProgress(){
+        this.frame.setVisible(false);
+    }
+
+    public int getProgressSize(int todo, int maxLevel){
+        int steps = (progressBar.getValue() - maxLevel) / todo;
+        if(steps < 0) steps = steps*-1;
+        return steps;
+    }
+}

src/tourplaner/ui/TourplanerController.java

@@ -1,6 +1,8 @@
 package tourplaner.ui;
 
 import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.geometry.Orientation;
@@ -17,6 +19,7 @@ import tourplaner.object.Log;
 import tourplaner.object.Tour;
 import tourplaner.viewmodels.ViewModel;
 
+import javax.swing.*;
 import java.awt.*;
 import java.io.IOException;
 import java.net.URI;
@@ -42,6 +45,20 @@ public class TourplanerController implements Initializable {
     //Log -> rechts unten
     public TableView<Log> logTableView;
     public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;
+    //Menue
+    public CheckMenuItem openmap, openpdf;
+    public RadioMenuItem langenglisch, langdeutsch;
+    public ToggleGroup langgroup;
+
+    @FXML
+    private void onlangenglisch(){
+        ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langen");
+    }
+
+    @FXML
+    private void onlangdeutsch(){
+        ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langde");
+    }
 
     @FXML
     private void tourReport(){
@@ -92,18 +109,18 @@ public class TourplanerController implements Initializable {
     }
 
     private void syncTour(String selectedItem){
-        beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
+        beschreibungTableView.getItems().clear(); //Leert die Table View komplett
         beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
         mapImageView.setImage(this.viewModel.getImage(selectedItem));
     }
 
     private void syncTourNamen(){
-        TourListView.getItems().removeIf(s -> true);
+        TourListView.getItems().clear();
         TourListView.setItems(this.viewModel.getTourNamen());
     }
 
     private void syncLogs(){
-        logTableView.getItems().removeIf(s -> true);
+        logTableView.getItems().clear();
         logTableView.setItems(this.viewModel.getLogData());
     }
 
@@ -114,10 +131,13 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void tourListSelectedItem(MouseEvent mouseEvent){
+        ProgressBar progressBar = new ProgressBar("Tour auswählen...");
         String selectedItem = TourListView.getSelectionModel().getSelectedItem();
         this.viewModel.selectTour(selectedItem);
         titleTextView.setText(selectedItem);
+        progressBar.addProgress(10);
         syncTour(selectedItem);
+        progressBar.addProgress(10);
         startCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("start"));
         zielCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("ziel"));
         dauerCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("dauer"));
@@ -126,8 +146,10 @@ public class TourplanerController implements Initializable {
 
         //Log anzeigen
         logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
-        logTableView.getItems().removeIf(s -> true);
+        logTableView.getItems().clear();
+        progressBar.addProgress(10);
         logTableView.setItems(this.viewModel.getLogData());
+        progressBar.addProgress(10);
         logDauerCol.setCellValueFactory(new PropertyValueFactory<Log, String>("dauer"));
         logStreckeCol.setCellValueFactory(new PropertyValueFactory<Log, String>("strecke"));
         logDatumCol.setCellValueFactory(new PropertyValueFactory<Log, String>("datum"));
@@ -136,8 +158,16 @@ public class TourplanerController implements Initializable {
         logPauseCol.setCellValueFactory(new PropertyValueFactory<Log, String>("pause"));
         logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
         logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
-
+        progressBar.addProgress(10);
         mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
+        if(this.viewModel.isSucheAktiv()){
+            this.viewModel.setSucheAktiv(false);
+            progressBar.addProgress(10);
+            syncTourNamen();
+            progressBar.addProgress(40);
+            this.sucheInput.setText("");
+        }
+        progressBar.addProgress(50);
     }
 
     /**
@@ -155,8 +185,7 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void addTour(){
-        this.viewModel.addTour();
+        if(this.viewModel.addTour()) this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
-        this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
     }
 
     /**
@@ -165,7 +194,7 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void delTour(){
-        this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
+        this.beschreibungTableView.getItems().clear(); //löscht alles aus der tabelle
         this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
         this.viewModel.delTour();
         logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
@@ -178,7 +207,10 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void suche(){
+        ProgressBar progressBar = new ProgressBar("Suche");
         this.viewModel.suche(this.sucheInput.getText());
+        progressBar.addProgress(100);
+        progressBar.closeProgress();
     }
 
     /**
@@ -218,7 +250,40 @@ public class TourplanerController implements Initializable {
         TourListView.setOrientation(Orientation.VERTICAL);
         syncTourNamen();
         deselectAll();
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1){
+            this.openpdf.setSelected(true);
+        }else {
+            this.openpdf.setSelected(false);
+        }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1){
+            this.openmap.setSelected(true);
+        }else {
+            this.openmap.setSelected(false);
+        }
+        this.langgroup = new ToggleGroup();
+        this.langdeutsch.setToggleGroup(this.langgroup);
+        this.langenglisch.setToggleGroup(this.langgroup);
+        if(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang").equals("langde")){
+            this.langdeutsch.setSelected(true);
+            this.langenglisch.setSelected(false);
+        }else if(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang").equals("langen")){
+            this.langdeutsch.setSelected(false);
+            this.langenglisch.setSelected(true);
+        }
+    }
 
+    @FXML
+    private void openpdfaction(){
+        int selected = 0;
+        if(this.openpdf.isSelected()) selected = 1;
+        ConfigHelper.setIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf", selected);
+    }
+
+    @FXML
+    private void openmapaction(){
+        int selected = 0;
+        if(this.openmap.isSelected()) selected = 1;
+        ConfigHelper.setIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap", selected);
     }
 
     private void deselectAll(){

src/tourplaner/viewmodels/ViewModel.java

@@ -7,9 +7,9 @@ import tourplaner.business.*;
 import tourplaner.ui.AlertHelper;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
+import tourplaner.ui.ProgressBar;
 
 import java.awt.*;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -28,7 +28,8 @@ public class ViewModel {
     //Log
     private final ObservableList<Log> logData = FXCollections.observableArrayList();
     private Log selectedLog;
-
+// Suche
+    private boolean sucheAktiv;
 
 
     public Image getImage(String tourname){
@@ -78,9 +79,10 @@ public class ViewModel {
 
     /**
      * Input mit duplications check des Namens und ohne content im input feld
+     * @return false beim schließen
      */
-    private void tourNameInput(){
+    private boolean tourNameInput(){
-        tourNameInputDuplicatCheck("", true);
+        return tourNameInputDuplicatCheck("", true);
     }
 
     /**
@@ -151,24 +153,31 @@ public class ViewModel {
     /**
      * Fügt eine neue Tour hinzu
      */
-    public void addTour(){
+    public boolean addTour(){
-        tourNameInput();
+        if(tourNameInput()) {
-        tourStartInput("");
+            if(tourStartInput("")) {
-        tourZielInput("");
+                if (tourZielInput("")) {
                     if (getTour(this.neueTourName) == null) {
+                        ProgressBar progressBar = new ProgressBar("Add Tour...");
                         Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
                         tourData.add(newTour);
                         tourNamen.add(this.neueTourName);
                         this.selectedTour = newTour;
+                        progressBar.addProgress(10);
                         try {
-                TourPlaner.addTour(newTour);
+                            TourPlaner.addTour(newTour, progressBar);
                         } catch (IOException e) {
-                e.printStackTrace();
+                            LogHelper.error(e);
+                            return false;
                         }
                     }
+                }else return false;
+            }else return false;
+        }else return false;
         this.neueTourStart = null;
         this.neueTourZiel = null;
         this.neueTourName = null;
+        return true;
     }
 
     private boolean keineTourSelected(){
@@ -207,11 +216,11 @@ public class ViewModel {
         if (dauer >= 0) {
             strecke = streckeInput(this.selectedLog.getStrecke() + "");
             if (strecke >= 0) {
-                pause = pauseInput("");
+                pause = pauseInput(this.selectedLog.getPause() + "");
                 if(pause >= 0.0) {
-                    hightmeter = hightmeterInput("");
+                    hightmeter = hightmeterInput(this.selectedLog.getHightmeter() + "");
                     if (hightmeter >= 0.0) {
-                        bemerkung = bemerkungInput("");
+                        bemerkung = bemerkungInput(this.selectedLog.getBemerkung());
                         if (bemerkung) {
                             datum = dateInput(this.selectedLog.getDatum());
                             if (datum != null) {
@@ -457,7 +466,7 @@ public class ViewModel {
         getTourData().forEach(s -> {
             namen.add(s.getName());
         });
-        tourNamen.removeAll();
+        tourNamen.clear();
         tourNamen.addAll(namen);
         return tourNamen;
     }
@@ -479,8 +488,11 @@ public class ViewModel {
     }
 
     public ObservableList<Tour> getTourData() {
-        tourData.removeAll();
+        tourData.clear();
-        tourData.addAll(TourPlaner.getAllTours());
+        ArrayList<Tour> touren = TourPlaner.getAllTours();
+        if(touren != null) {
+            tourData.addAll(touren);
+        }
         return tourData;
     }
 
@@ -488,16 +500,18 @@ public class ViewModel {
      * Entfernt eine Tour anhand der ausgewählten Tour
      */
     public void delTour(){
-        try {
+        if (this.selectedTour != null) {
             String tourname = this.selectedTour.getName();
+            try {
                 tourData.removeIf(s -> s.getName().equals(tourname));
                 tourNamen.removeIf(s -> s.equals(tourname));
                 logData.removeIf(s -> true);
-            setSelectedTour(null);
                 TourPlaner.delTour(tourname);
+                setSelectedTour(null);
             } catch (NullPointerException e) {
-            LogHelper.error(ConfigHelper.getLangIniString("keinetourselected"),
+                LogHelper.error(e);
-                    ConfigHelper.getLangIniString("deltournoselect"));
+            }
+        }else {
             AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
                     ConfigHelper.getLangIniString("keinetourselected"),
                     ConfigHelper.getLangIniString("deltournoselectmsg"));
@@ -514,7 +528,20 @@ public class ViewModel {
                     ConfigHelper.getLangIniString("suchfeldleer"),
                     ConfigHelper.getLangIniString("suchtextzuerst"));
         }
-            // TODO: 19.03.2021 Suchlogik
+         ArrayList<Tour> result = TourPlaner.sucheTour(sucheInput);
+        tourNamen.clear();
+        for (Tour tour:result) {
+            tourNamen.add(tour.getName());
+        }
+        this.sucheAktiv = true;
+    }
+
+    public boolean isSucheAktiv() {
+        return sucheAktiv;
+    }
+
+    public void setSucheAktiv(boolean sucheAktiv) {
+        this.sucheAktiv = sucheAktiv;
     }
 
     /**
@@ -587,7 +614,6 @@ public class ViewModel {
      */
     public void exportData(){
         String file = AlertHelper.fileChooser("Exportiere");
-        System.out.println("EXPORT: " + file);
         if(file != null){
             try {
                 new Exporter(file).doExport();
@@ -603,15 +629,9 @@ public class ViewModel {
      */
     public void importData() {
         String file = AlertHelper.fileChooser("Importiere");
-        System.out.println("IMPORT: " + file);
         if (file != null){
-            try {
             this.tourNamen = FXCollections.observableArrayList();
             new Exporter(file).doImport();
-            } catch (IOException e) {
-                AlertHelper.error("Error", "Import Error", "Fehler beim Importieren");
-                LogHelper.error(e);
-            }
         }
     }