Copy Tour & Log + Progressbar Verbessert

Doxyfile

@@ -38,27 +38,27 @@ PROJECT_NAME           = Tourplaner
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.0.2
+PROJECT_NUMBER         = 1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = DGTP
+PROJECT_BRIEF          = tpl
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           =
+PROJECT_LOGO           = D:/FH_OFFLINE/tourplaner/logo_sm.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = C:\Users\georg\OneDrive\FH\Swe\Tourplaner\doxygendoc
+OUTPUT_DIRECTORY       = D:\FH_OFFLINE\tourplaner\doxygendoc
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -864,7 +864,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = C:\Users\georg\OneDrive\FH\Swe\Tourplaner\src\tourplaner
+INPUT                  = D:\FH_OFFLINE\tourplaner\src
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1304,7 +1304,7 @@ HTML_EXTRA_FILES       =
 # Minimum value: 0, maximum value: 359, default value: 220.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_HUE    = 359
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use grayscales only. A
@@ -1312,7 +1312,7 @@ HTML_COLORSTYLE_HUE    = 220
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_SAT    = 0
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
 # luminance component of the colors in the HTML output. Values below 100
@@ -1323,7 +1323,7 @@ HTML_COLORSTYLE_SAT    = 100
 # Minimum value: 40, maximum value: 240, default value: 80.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_GAMMA  = 80
+HTML_COLORSTYLE_GAMMA  = 240
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting this
@@ -1582,7 +1582,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
@@ -1790,7 +1790,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2050,7 +2050,7 @@ RTF_SOURCE_CODE        = NO
 # classes and files.
 # The default value is: NO.
 
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2128,7 +2128,7 @@ XML_NS_MEMB_FILE_SCOPE = NO
 # that can be used to generate PDF.
 # The default value is: NO.
 
-GENERATE_DOCBOOK       = YES
+GENERATE_DOCBOOK       = NO
 
 # The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
@@ -2336,7 +2336,7 @@ EXTERNAL_PAGES         = YES
 # powerful graphs.
 # The default value is: YES.
 
-CLASS_DIAGRAMS         = YES
+CLASS_DIAGRAMS         = NO
 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
@@ -2358,7 +2358,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of

README.md

@@ -1,8 +1,16 @@
 # Tourplaner
+* JavaDoc: https://dergeorg.at/javadoc
+* DoxygenDoc: https://dergeorg.at/doxygendoc/html
 
 # Config
-* DB informationen müssen in das config.ini.sample unter [db] eingetragen werden
+* 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
+* ```langde.ini``` beinhaltet alle Deutschen Texte der Gui
-* [start] beinhaltet den Title und infos die beim start verabeitet werden
+* ```langen.ini``` beinhaltet alle Englischen Texte der Gui
-* [hilfe] beinhaltet die Links zu den Hilfeseiten
+* Bei ```[map] -> key``` muss ein API Key zu Mapquest eingegeben werden
+* Bei ```[report] -> path``` kann der Path eingestellt werden, wo die Reports gespeichert werden
+* Bei ```[map] -> path``` kann der Path eingestellt werden, wo die Maps gespeichert werden
+
+# UML
+```[UML.svg]``` (https://git.dergeorg.at/dergeorg/tourplaner/src/branch/master/uml.svg)
+![UML.svg](uml.svg)

langde.ini

@@ -107,3 +107,6 @@ bewertung = Bewertung
 bewertungmsg = Bitte die Bewertung zwischen 0 und 5 eingeben
 bewertungeror = Bitte nur Bewertungen von 0 und 5 eingeben
 bewertungerror2 = Bitte nur Zahlen zum Bewerten
+
+copybtn = Kopieren
+rating = Bewertung

langen.ini

@@ -108,3 +108,6 @@ bewertung = Rating
 bewertungmsg = Please enter a rating from 0 to 5
 bewertungeror = Please enter only a rating from 0 to 5
 bewertungerror2 = Please only enter numbers for rating
+
+copybtn = Copy
+rating = Rating

src/tourplaner/business/DirectionMap.java

@@ -9,6 +9,7 @@ import java.io.IOException;
  */
 public class DirectionMap {
     private double dauer, strecke;
+    private String sessionId;
 
     /**
      * Holt die Map als image und alle Daten zur berechneten Route
@@ -19,13 +20,13 @@ public class DirectionMap {
      * @throws IOException Fehler beim Image der Map
      */
     public DirectionMap (String start, String ende, String tourname) throws IOException {
-        Image map = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size"));
+        getDirections(start, ende);
-        Image mappdf = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "sizePdf"));
+        Image map = getMap(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size"));
+        Image mappdf = getMap(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "sizePdf"));
         String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
         String filepdf = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + "_pdf.jpg";
         FileHelper.saveImage(map, "jpg", new File(file));
         FileHelper.saveImage(mappdf, "jpg", new File(filepdf));
-        getDirections(start, ende);
         if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
             FileHelper.openDefault(file);
         }
@@ -54,8 +55,8 @@ public class DirectionMap {
      * @return Image von der Map
      * @throws IOException Fehler beim Get der Map
      */
-    private Image getMap(String start, String ende, String size) throws IOException {
+    private Image getMap(String size) throws IOException {
-        return HttpHelper.httpGetImage("https://www.mapquestapi.com/staticmap/v5/map?start="+start+"&end="+ende+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
+        return HttpHelper.httpGetImage("https://www.mapquestapi.com/staticmap/v5/map?session="+this.sessionId+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
     }
 
     /**
@@ -65,12 +66,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"));
+        this.sessionId = JsonHelper.getStingFromJson(json, "sessionId");
     }
 
     /**

src/tourplaner/business/Exporter.java

@@ -29,9 +29,9 @@ public class Exporter {
      */
     public void doExport() throws IOException {
         ProgressBar progressBar = new ProgressBar("Export...");
-        int step = progressBar.getProgressSize(4, 100);
-        ArrayList<Tour> data = new DbConnect().getAllTouren();
 
+        ArrayList<Tour> data = new DbConnect().getAllTouren(progressBar, 15);
+        int step = progressBar.getProgressSize(4, 100);
         progressBar.addProgress(step);
         FileWriter fileWriter = new FileWriter(EinheitenAdder.addJson(this.path));
         progressBar.addProgress(step);
@@ -45,29 +45,33 @@ public class Exporter {
     /**
      * Führt den Imput aus: File holen, Daten in db erstellen
      */
-    public void doImport() {
+    public void doImport(ProgressBar progressBar, int progressMax) {
-        ProgressBar progressBar = new ProgressBar("Import...");
         try {
             ArrayList<Tour> touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(this.path)));
             DbConnect dbConnect = new DbConnect();
-            dbConnect.delAllData();
+            ArrayList<Tour> allTours = dbConnect.getAllTouren(progressBar, 15);
-            progressBar.addProgress(5);
+            int size = progressBar.getProgressSize(allTours.size(), 35);
-            int size = progressBar.getProgressSize(touren.size() * 3, 100);
+            allTours.forEach(t -> {
+                TourPlaner.delTour(t.getName());
+                progressBar.addProgress(size);
+            });
+
+            int finalSize = progressBar.getProgressSize(touren.size() * 3, progressMax);
             for (Tour tour: touren) {
                     new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
-                progressBar.addProgress(size);
+                progressBar.addProgress(finalSize);
                 dbConnect.addTour(tour);
-                progressBar.addProgress(size);
+                progressBar.addProgress(finalSize);
                 ArrayList<Log> logs = tour.getLogs();
                 for (Log log:logs) {
                     dbConnect.addLog(tour.getName(), log);
                 }
-                progressBar.addProgress(size);
+                progressBar.addProgress(finalSize);
             }
         } catch (IOException e) {
             LogHelper.error(e);
-            progressBar.setProgress(100);
+            progressBar.setProgress(progressMax);
         }
-        progressBar.setProgress(100);
+        progressBar.setProgress(progressMax);
     }
 }

src/tourplaner/business/Reporter.java

@@ -7,6 +7,7 @@ import tourplaner.object.Log;
 import tourplaner.object.Tour;
 
 import com.itextpdf.text.pdf.PdfWriter;
+import tourplaner.ui.ProgressBar;
 
 import java.awt.*;
 import java.io.FileNotFoundException;
@@ -33,13 +34,14 @@ public class Reporter {
     /**
      * Erstellt den Summary Report
      */
-    public static void sumReport(){
+    public static void sumReport(ProgressBar progressBar, int maxLevel){
-        ArrayList<Tour> tours = TourPlaner.getAllTours();
+        ArrayList<Tour> tours = TourPlaner.getAllTours(progressBar, maxLevel);
         String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "summary.pdf";
         try {
             Document document = new Document();
             PdfWriter.getInstance(document, new FileOutputStream(file));
             document.open();
+            addMetaData(document, new Tour("Summary", "String dauer", "String mapJson", 1, "String start", "String ziel"));
             addSumRepo(document, tours);
 
             document.close();
@@ -173,6 +175,7 @@ public class Reporter {
             subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("logstrecke") + " " + log.getStrecke())));
             subCatPart.add(new Paragraph(EinheitenAdder.addMeter(ConfigHelper.getLangIniString("loghight") + " " + log.getHightmeter())));
             subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logbemerkung") + " " + log.getBemerkung()));
+            subCatPart.add(new Paragraph( "Rating " + log.getRating()));
         }
         // now add all this to the document
         document.add(catPart);

src/tourplaner/business/TourPlaner.java

@@ -1,5 +1,6 @@
 package tourplaner.business;
 
+import javafx.collections.ObservableList;
 import org.apache.log4j.Logger;
 import tourplaner.data.DbConnect;
 import tourplaner.object.Log;
@@ -10,6 +11,9 @@ import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Haupt Logik des Tourplaners
@@ -27,8 +31,8 @@ public class TourPlaner{
      * Holt alle touren aus der DB 
      * @return Alle touren als ArrayList
      */
-    public static ArrayList<Tour> getAllTours(){
+    public static ArrayList<Tour> getAllTours(ProgressBar progressBar, int maxLevel){
-        return new DbConnect().getAllTouren();
+        return new DbConnect().getAllTouren(progressBar, maxLevel);
     }
 
     /**
@@ -59,16 +63,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)));
-        progressBar.addProgress(step);
         boolean ret = new DbConnect().delTour(tourname);
-        progressBar.setProgress(100);
         return ret;
     }
+    /**
+     * Fügt eine Tour hinzu
+     * @param newTour Neue Tour
+     * @param progressBar Aktuelle Progressbar
+     * @param progressMax Maximale anzeige der Progress bar
+     * @return false bei error
+     * @throws IOException Fehler beim hinzufügen der Tour
+     */
+    public static boolean addTourMax(Tour newTour, ProgressBar progressBar, int progressMax) throws IOException {
+        int step = progressBar.getProgressSize(2, progressMax);
+        DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
+        progressBar.addProgress(step);
+        newTour.setDauer(directionMap.getDauer()+"");
+        newTour.setStrecke(directionMap.getStrecke());
+        boolean ret = new DbConnect().addTour(newTour);
+        progressBar.setProgress(progressMax);
+        return ret;
+    }
+
     /**
      * Fügt eine Tour hinzu
      * @param newTour Neue Tour
@@ -77,14 +95,7 @@ public class TourPlaner{
      * @throws IOException Fehler beim hinzufügen der Tour
      */
     public static boolean addTour(Tour newTour, ProgressBar progressBar) throws IOException {
-        int step = progressBar.getProgressSize(2, 100);
+        return addTourMax(newTour, progressBar, 100);
-        DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
-        progressBar.addProgress(step);
-        newTour.setDauer(directionMap.getDauer()+"");
-        newTour.setStrecke(directionMap.getStrecke());
-        boolean ret = new DbConnect().addTour(newTour);
-        progressBar.setProgress(100);
-        return ret;
     }
 
     /**
@@ -169,14 +180,42 @@ public class TourPlaner{
      * @param tourname Name der zu suchen ist
      * @return Alle touren die auf den Suchterm passen
      */
-    public static ArrayList<Tour> sucheTour(String tourname){
+    public static ArrayList<Tour> sucheTour(String tourname, ProgressBar progressBar, int maxProgress){
         ArrayList<Tour> touren = new ArrayList<>();
-        getAllTours().forEach(t ->{
+        getAllTours(progressBar, maxProgress).forEach(t ->{
-            if(t.getName().contains(tourname)){
+            ArrayList<Log> logs = t.getLogs();
+            ArrayList<String> bemerkungen = new ArrayList<>();
+            for (Log l:logs) {
+                bemerkungen.add(l.getBemerkung().toLowerCase(Locale.ROOT));
+            }
+            bemerkungen.forEach(b -> {
+                if(b.contains(tourname.toLowerCase(Locale.ROOT))){
                     touren.add(t);
                 }
             });
+            if(bemerkungen.contains(tourname.toLowerCase()) || t.getZiel().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) || t.getName().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase()) || t.getStart().toLowerCase(Locale.ROOT).contains(tourname.toLowerCase())){
+                if(!touren.contains(t)) {
+                    touren.add(t);
+                }
+            }
+        });
         return touren;
     }
 
+    /**
+     * Erzeugt eine Neue Log id
+     * @param logData Alle log daten
+     * @return Neue log id
+     */
+    public static String newLogId(ObservableList<Log> logData){
+        AtomicReference<String> newId = new AtomicReference<>();
+        newId.set(UUID.randomUUID().toString());
+        logData.forEach(ss -> {
+            if (ss.getId().equals(newId.get())) {
+                newId.set(UUID.randomUUID().toString());
+            }
+        });
+        return newId.get();
+    }
 }
+

src/tourplaner/data/DbConnect.java

@@ -27,15 +27,12 @@ public class DbConnect {
 
     /**
      * Erstellt alle Tabellen die für den Betrieb der Software bennötigt werden
-     * @return True bei erfolg, sonst error
      */
-    public boolean init() {
+    public void init() {
-        ArrayList<Boolean> errors = new ArrayList<>();
+        PostgresHelper.executeUpdateNoLog("create table tour ( tourname varchar not null, dauer decimal, mapjson varchar, start varchar, ziel varchar, strecke decimal);");
-        errors.add(PostgresHelper.executeUpdateMessage("create table tour ( tourname varchar not null, dauer decimal, mapjson varchar, start varchar, ziel varchar, strecke decimal);", "Tour Table created"));
+        PostgresHelper.executeUpdateNoLog("create unique index tour_tourname_uindex on tour (tourname);");
-        errors.add(PostgresHelper.executeUpdateMessage("create unique index tour_tourname_uindex on tour (tourname);", "Tour Table unique created"));
+        PostgresHelper.executeUpdateNoLog("alter table tour add constraint tour_pk primary key (tourname);");
-        errors.add(PostgresHelper.executeUpdateMessage("alter table tour add constraint tour_pk primary key (tourname);", "Tour Table primary created"));
+        PostgresHelper.executeUpdateNoLog("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal,rating varchar);");
-        errors.add(PostgresHelper.executeUpdateMessage("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal,rating varchar);", "Log Table created"));
-        return !errors.contains(false);
     }
 
 
@@ -125,7 +122,7 @@ public class DbConnect {
             this.c.close();
             return logs;
         } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            LogHelper.error(e);
             return null;
         }
     }
@@ -139,15 +136,13 @@ public class DbConnect {
      */
     public boolean addLog(String tourname, Log log){
         if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
-        System.out.println("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
-                +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')");
         return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
                 +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')");
     }
 
     public boolean editLog(String tourname, Log log){
         return PostgresHelper.executeUpdate("UPDATE public.log SET bemerkung = '"+log.getBemerkung()+"', datum = '"+log.getDatum()+"', strecke = "+log.getStrecke()+", avg = "+log.getAvgspeed()+", hightmeter = "+
-                log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+" WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"', rating = '"+log.getRating()+"'");
+                log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+", rating = '"+log.getRating()+"' WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"'");
     }
 
     public boolean delLog(String tourname, String id){
@@ -172,17 +167,18 @@ public class DbConnect {
 
     /**
      * Holt alle Touren aus der Datenbank
+     * @param progressBar Aktuelle Progress bar
+     * @param maxLevel Maximales level der progress bar
      * @return Null bei fehler, sonst eine List aus den IDs
      */
-    public ArrayList<Tour> getAllTouren() {
+    public ArrayList<Tour> getAllTouren(ProgressBar progressBar, int maxLevel) {
         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);
+            int step =  progressBar.getProgressSize(tourSize, maxLevel);
             stmt = this.c.createStatement();
             ResultSet rs = stmt.executeQuery("select * from tour;");
             while (rs.next()) {
@@ -196,18 +192,18 @@ public class DbConnect {
                     touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel, getLogs(tourname)));
                     progressBar.addProgress(step);
                 }else {
-                    progressBar.setProgress(100);
+                    progressBar.setProgress(maxLevel);
                     return null;
                 }
             }
-            progressBar.setProgress(100);
+            progressBar.setProgress(maxLevel);
             rs.close();
             stmt.close();
             this.c.close();
             return touren;
         } catch (Exception e) {
             LogHelper.error(e);
-            progressBar.setProgress(100);
+            progressBar.setProgress(maxLevel);
             return null;
         }
     }
@@ -244,7 +240,7 @@ public class DbConnect {
             this.c.close();
             return touren;
         } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            LogHelper.error(e);
             return null;
         }
     }

src/tourplaner/data/PostgresHelper.java

@@ -6,6 +6,7 @@ import tourplaner.business.LogHelper;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.sql.Statement;
 
 /**
@@ -20,8 +21,6 @@ public class PostgresHelper {
         Connection c = null;
         try {
             Class.forName("org.postgresql.Driver");
-            System.out.println("jdbc:postgresql://" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "url") + ":" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "port") + "/" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "dbname")+
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "user")+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "pw"));
             c = DriverManager
                     .getConnection("jdbc:postgresql://" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "url") + ":" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "port") + "/" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "dbname"),
                             ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "user"), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "pw"));
@@ -48,17 +47,38 @@ public class PostgresHelper {
      * @return True bei erfolg, sonst false
      */
     public static boolean executeUpdate(String sql){
-        Connection c = con();
-        Statement stmt;
         try {
-            stmt = c.createStatement();
+            exUpdate(sql);
-            stmt.executeUpdate(sql);
+        } catch (SQLException e) {
-            stmt.close();
-            c.close();
-        } catch (Exception e) {
             LogHelper.error(e.getMessage(), e.getClass().getName());
             return false;
         }
         return true;
     }
+
+    /**
+     * Führt ein Sql statement ohne rückgabe aus
+     * @param sql Sql command
+     * @return True bei erfolg, sonst false
+     * @throws SQLException Fehler beim ausführen
+     */
+    private static boolean exUpdate(String sql) throws SQLException {
+        Connection c = con();
+        Statement stmt;
+        stmt = c.createStatement();
+        stmt.executeUpdate(sql);
+        stmt.close();
+        c.close();
+        return true;
+    }
+
+
+    public static boolean executeUpdateNoLog(String sql){
+        try {
+            exUpdate(sql);
+            return true;
+        }catch (Exception e){
+            return false;
+        }
+    }
 }

src/tourplaner/object/Log.java

@@ -23,6 +23,10 @@ public class Log {
         }
     }
 
+    public void setId(String id){
+        this.id = id;
+    }
+
     public String getRating() {
         return rating;
     }

src/tourplaner/tourplaner.fxml

@@ -39,101 +39,100 @@
 <?import javafx.scene.paint.*?>
 <?import javafx.scene.text.*?>
 
-<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1"
+<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="tourplaner.ui.TourplanerController">
-      fx:controller="tourplaner.ui.TourplanerController">
     <MenuBar VBox.vgrow="NEVER">
         <Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
-            <MenuItem fx:id="reportsummary" mnemonicParsing="false" onAction="#reportSum" text="Report Summary"/>
+            <MenuItem fx:id="reportsummary" mnemonicParsing="false" onAction="#reportSum" text="Report Summary" />
-            <MenuItem fx:id="tourreport" mnemonicParsing="false" onAction="#tourReport" text="Tour Report"/>
+            <MenuItem fx:id="tourreport" mnemonicParsing="false" onAction="#tourReport" text="Tour Report" />
-            <MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden"/>
+            <MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden" />
         </Menu>
         <Menu fx:id="menuebearbeiten" mnemonicParsing="false" text="Bearbeiten">
-            <MenuItem fx:id="menueimport" mnemonicParsing="false" onAction="#importBtn" text="Import"/>
+            <MenuItem fx:id="menueimport" mnemonicParsing="false" onAction="#importBtn" text="Import" />
-            <MenuItem fx:id="menueexport" mnemonicParsing="false" onAction="#exportBtn" text="Export"/>
+            <MenuItem fx:id="menueexport" mnemonicParsing="false" onAction="#exportBtn" text="Export" />
         </Menu>
         <Menu fx:id="menueoptionen" mnemonicParsing="false" text="Optionen">
-            <CheckMenuItem fx:id="openmap" mnemonicParsing="false" onAction="#openmapaction"
+            <CheckMenuItem fx:id="openmap" mnemonicParsing="false" onAction="#openmapaction" text="Map automatisch öffnen" />
-                           text="Map automatisch öffnen"/>
+            <CheckMenuItem fx:id="openpdf" mnemonicParsing="false" onAction="#openpdfaction" text="Report automatisch öffnen" />
-            <CheckMenuItem fx:id="openpdf" mnemonicParsing="false" onAction="#openpdfaction"
-                           text="Report automatisch öffnen"/>
             <Menu fx:id="menuesprachen" mnemonicParsing="false" text="Sprache">
-                <RadioMenuItem fx:id="langdeutsch" mnemonicParsing="false" onAction="#onlangdeutsch"
+                <RadioMenuItem fx:id="langdeutsch" mnemonicParsing="false" onAction="#onlangdeutsch" text="Deutsch" />
-                               text="Deutsch"/>
+                <RadioMenuItem fx:id="langenglisch" mnemonicParsing="false" onAction="#onlangenglisch" text="Englisch" />
-                <RadioMenuItem fx:id="langenglisch" mnemonicParsing="false" onAction="#onlangenglisch"
-                               text="Englisch"/>
             </Menu>
         </Menu>
         <Menu fx:id="menuehilfe" mnemonicParsing="false" text="Hilfe">
-            <MenuItem mnemonicParsing="false" onAction="#gitWebBrowser" text="Git Repo"/>
+            <MenuItem mnemonicParsing="false" onAction="#gitWebBrowser" text="Git Repo" />
-            <MenuItem mnemonicParsing="false" onAction="#javaDocBrowser" text="JavaDoc"/>
+            <MenuItem mnemonicParsing="false" onAction="#javaDocBrowser" text="JavaDoc" />
-            <MenuItem mnemonicParsing="false" onAction="#doxygenDocBrowser" text="Doxygen Doc"/>
+            <MenuItem mnemonicParsing="false" onAction="#doxygenDocBrowser" text="Doxygen Doc" />
         </Menu>
     </MenuBar>
     <HBox id="HBox" alignment="CENTER_LEFT" layoutX="10.0" layoutY="588.0" spacing="5.0">
         <padding>
-            <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
+            <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
         </padding>
-        <AnchorPane HBox.hgrow="ALWAYS">
+      <HBox>
-            <Button fx:id="tourAdd" layoutX="58.0" mnemonicParsing="false" onAction="#addTour" text="+"/>
+         <children>
-            <Label layoutX="14.0" layoutY="4.0" text="Tours"/>
+               <Label text="Tours:">
-            <Button fx:id="tourDel" layoutX="89.0" mnemonicParsing="false" onAction="#delTour" text="-"/>
+               <HBox.margin>
-            <Button fx:id="editTourBtn" layoutX="117.0" mnemonicParsing="false" onAction="#editTourBtn"
+                  <Insets bottom="10.0" left="10.0" right="6.0" top="10.0" />
-                    text="Edit"/>
+               </HBox.margin>
-        </AnchorPane>
+            </Label>
-        <TextField fx:id="sucheInput" promptText="Suche..."/>
+               <Button fx:id="tourAdd" mnemonicParsing="false" onAction="#addTour" text="+">
-        <Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen"/>
+               <HBox.margin>
+                  <Insets bottom="6.0" right="6.0" top="6.0" />
+               </HBox.margin>
+            </Button>
+               <Button fx:id="tourDel" mnemonicParsing="false" onAction="#delTour" text="-">
+               <HBox.margin>
+                  <Insets bottom="6.0" right="6.0" top="6.0" />
+               </HBox.margin>
+            </Button>
+               <Button fx:id="editTourBtn" mnemonicParsing="false" onAction="#editTourBtn" text="Edit">
+               <HBox.margin>
+                  <Insets bottom="6.0" right="6.0" top="6.0" />
+               </HBox.margin>
+            </Button>
+            <Button fx:id="copyTourBtn" mnemonicParsing="false" onAction="#copyTour" text="Copy">
+               <HBox.margin>
+                  <Insets bottom="6.0" right="6.0" top="6.0" />
+               </HBox.margin>
+            </Button>
+         </children>
       </HBox>
-    <SplitPane dividerPositions="0.060133630289532294" focusTraversable="true" prefHeight="522.0" prefWidth="300.0"
+        <AnchorPane HBox.hgrow="ALWAYS" />
-               VBox.vgrow="ALWAYS">
+        <TextField fx:id="sucheInput" onKeyPressed="#sucheEnter" promptText="Suche..." />
+        <Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen" />
+    </HBox>
+    <SplitPane dividerPositions="0.060133630289532294" focusTraversable="true" prefHeight="522.0" prefWidth="300.0" VBox.vgrow="ALWAYS">
         <AnchorPane prefWidth="239.0">
-            <ListView fx:id="TourListView" layoutX="-1.0" onMouseClicked="#tourListSelectedItem" prefHeight="520.0"
+            <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" />
-                      prefWidth="190.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                      AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
         </AnchorPane>
         <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="496.0" prefWidth="620.0">
             <VBox prefWidth="100.0">
                 <AnchorPane prefWidth="676.0">
-                    <HBox id="HBox" alignment="CENTER_LEFT" prefHeight="7.0" prefWidth="44.0" spacing="5.0"
+                    <HBox id="HBox" alignment="CENTER_LEFT" prefHeight="7.0" prefWidth="44.0" spacing="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                          AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                         <Label text="Title:">
                             <HBox.margin>
-                                <Insets left="10.0"/>
+                                <Insets left="10.0" />
                             </HBox.margin>
                         </Label>
-                        <TextField fx:id="titleTextView" editable="false"/>
+                        <TextField fx:id="titleTextView" editable="false" />
                     </HBox>
                 </AnchorPane>
                 <AnchorPane prefWidth="200.0">
-                    <TabPane fx:id="viewTabPane" layoutX="1.0" layoutY="69.0" prefWidth="702.0"
+                    <TabPane fx:id="viewTabPane" layoutX="1.0" layoutY="69.0" prefWidth="702.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0">
-                             tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0"
-                             AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0"
-                             AnchorPane.topAnchor="0.0">
                         <Tab fx:id="kartenTab" text="Karte">
                             <AnchorPane>
-                                <ImageView fx:id="mapImageView" pickOnBounds="true" preserveRatio="true"
+                                <ImageView fx:id="mapImageView" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                                           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
                             </AnchorPane>
                         </Tab>
                         <Tab fx:id="beschreibungTab" text="Beschreibung">
                             <AnchorPane>
-                                <TableView fx:id="beschreibungTableView"
+                                <TableView fx:id="beschreibungTableView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                           maxHeight="1.7976931348623157E308"
-                                           maxWidth="1.7976931348623157E308"
-                                           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                                           AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                     <columns>
-                                        <TableColumn fx:id="nameCol" minWidth="100.0" prefWidth="-1.0"
+                                        <TableColumn fx:id="nameCol" minWidth="100.0" prefWidth="-1.0" text="Tourname" />
-                                                     text="Tourname"/>
+                                        <TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Dauer" />
-                                        <TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308"
+                                        <TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Strecke" />
-                                                     minWidth="100.0" prefWidth="-1.0" text="Dauer"/>
+                                        <TableColumn fx:id="startCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Startpunk" />
-                                        <TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308"
+                                        <TableColumn fx:id="zielCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Zielpunkt" />
-                                                     minWidth="100.0" prefWidth="-1.0" text="Strecke"/>
-                                        <TableColumn fx:id="startCol" maxWidth="1.7976931348623157E308"
-                                                     minWidth="100.0" prefWidth="-1.0" text="Startpunk"/>
-                                        <TableColumn fx:id="zielCol" maxWidth="1.7976931348623157E308"
-                                                     minWidth="100.0" prefWidth="-1.0" text="Zielpunkt"/>
                                     </columns>
                                 </TableView>
                             </AnchorPane>
@@ -142,62 +141,52 @@
                 </AnchorPane>
             </VBox>
             <AnchorPane prefWidth="200.0">
-                <VBox prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+                <VBox prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                      AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <AnchorPane>
-                        <HBox id="HBox" alignment="CENTER_LEFT" layoutY="2.0" prefWidth="702.0"
+                        <HBox id="HBox" alignment="CENTER_LEFT" layoutY="2.0" prefWidth="702.0" spacing="5.0" AnchorPane.bottomAnchor="-2.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="2.0">
-                              spacing="5.0" AnchorPane.bottomAnchor="-2.0" AnchorPane.leftAnchor="0.0"
-                              AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="2.0">
                             <padding>
-                                <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
+                                <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
                             </padding>
                             <Label text="Logs:">
                                 <HBox.margin>
-                                    <Insets left="10.0"/>
+                                    <Insets bottom="10.0" left="10.0" right="6.0" top="10.0" />
                                 </HBox.margin>
                             </Label>
-                            <Button mnemonicParsing="false" onAction="#addLog" text="+"
+                            <Button mnemonicParsing="false" onAction="#addLog" text="+" textAlignment="CENTER">
-                                    textAlignment="CENTER">
                                 <HBox.margin>
-                                    <Insets/>
+                                    <Insets bottom="6.0" right="6.0" top="6.0" />
                                 </HBox.margin>
                             </Button>
-                            <Button fx:id="logDel" mnemonicParsing="false" onAction="#delLog"
+                            <Button fx:id="logDel" mnemonicParsing="false" onAction="#delLog" text="-" textAlignment="CENTER">
-                                    prefWidth="21.0" text="-" textAlignment="CENTER">
                                 <HBox.margin>
-                                    <Insets/>
+                                    <Insets bottom="6.0" right="6.0" top="6.0" />
                                 </HBox.margin>
                             </Button>
-                            <Button fx:id="editBtn" mnemonicParsing="false" onAction="#editLogBtn"
+                            <Button fx:id="editBtn" mnemonicParsing="false" onAction="#editLogBtn" text="Edit">
-                                    text="Edit"/>
+                        <HBox.margin>
+                           <Insets bottom="6.0" right="6.0" top="6.0" />
+                        </HBox.margin></Button>
+                     <Button fx:id="copyBtn" layoutX="112.0" layoutY="13.0" mnemonicParsing="false" onAction="#copyLogBtn" text="Copy">
+                        <HBox.margin>
+                           <Insets bottom="6.0" right="6.0" top="6.0" />
+                        </HBox.margin></Button>
                         </HBox>
                     </AnchorPane>
                     <AnchorPane>
-                        <TableView fx:id="logTableView" onMouseClicked="#logItemSelected"
+                        <TableView fx:id="logTableView" onMouseClicked="#logItemSelected" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                   AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                                   AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <columns>
-                                <TableColumn fx:id="logDatumCol" minWidth="-1.0" prefWidth="-1.0"
+                                <TableColumn fx:id="logDatumCol" minWidth="-1.0" prefWidth="-1.0" text="Datum" />
-                                             text="Datum"/>
+                                <TableColumn fx:id="logDauerCol" minWidth="-1.0" prefWidth="-1.0" text="Dauer" />
-                                <TableColumn fx:id="logDauerCol" minWidth="-1.0" prefWidth="-1.0"
+                                <TableColumn fx:id="logStreckeCol" minWidth="-1.0" prefWidth="-1.0" text="Entfernung" />
-                                             text="Dauer"/>
+                                <TableColumn fx:id="logAvgCol" minWidth="-1.0" prefWidth="-1.0" text="AVG Geschwindigkeit" />
-                                <TableColumn fx:id="logStreckeCol" minWidth="-1.0" prefWidth="-1.0"
+                                <TableColumn fx:id="logHightCol" minWidth="-1.0" prefWidth="75.0" text="Höhenmeter" />
-                                             text="Entfernung"/>
+                                <TableColumn fx:id="logPauseCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Pause" />
-                                <TableColumn fx:id="logAvgCol" minWidth="-1.0" prefWidth="-1.0"
+                                <TableColumn fx:id="logGegangenCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Unterwegs" />
-                                             text="AVG Geschwindigkeit"/>
+                                <TableColumn fx:id="logBemerkungCol" minWidth="-1.0" prefWidth="-1.0" text="Bemerkung" />
-                                <TableColumn fx:id="logHightCol" minWidth="-1.0" prefWidth="75.0"
+                                <TableColumn fx:id="logRatingCol1" minWidth="-1.0" prefWidth="-1.0" text="Rating" />
-                                             text="Höhenmeter"/>
-                                <TableColumn fx:id="logPauseCol" minWidth="-1.0" prefWidth="-1.0"
-                                             text="Davon Pause"/>
-                                <TableColumn fx:id="logGegangenCol" minWidth="-1.0" prefWidth="-1.0"
-                                             text="Davon Unterwegs"/>
-                                <TableColumn fx:id="logBemerkungCol" minWidth="-1.0" prefWidth="-1.0"
-                                             text="Bemerkung"/>
-                                <TableColumn fx:id="logRatingCol1" minWidth="-1.0" prefWidth="-1.0"
-                                             text="Rating"/>
                             </columns>
                             <columnResizePolicy>
-                                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+                                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
                             </columnResizePolicy>
                         </TableView>
                     </AnchorPane>
@@ -207,17 +196,17 @@
     </SplitPane>
     <HBox id="HBox" alignment="CENTER_LEFT" spacing="5.0" VBox.vgrow="NEVER">
         <padding>
-            <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
+            <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
         </padding>
         <Label maxHeight="1.7976931348623157E308" text="Tourplaner" HBox.hgrow="ALWAYS">
             <font>
-                <Font size="11.0" fx:id="x3"/>
+                <Font size="11.0" fx:id="x3" />
             </font>
             <textFill>
-                <Color red="0.625" green="0.625" blue="0.625" fx:id="x4"/>
+                <Color red="0.625" green="0.625" blue="0.625" fx:id="x4" />
             </textFill>
         </Label>
-        <AnchorPane HBox.hgrow="ALWAYS"/>
+        <AnchorPane HBox.hgrow="ALWAYS" />
-        <Label font="$x3" text="Georg Reisinger" textFill="$x4" HBox.hgrow="NEVER"/>
+        <Label font="$x3" text="Georg Reisinger" textFill="$x4" HBox.hgrow="NEVER" />
     </HBox>
 </VBox>

src/tourplaner/ui/AlertHelper.java

@@ -209,7 +209,6 @@ public class AlertHelper {
 
         datePicker.setOnAction(event -> {
             LocalDate date = datePicker.getValue();
-            System.out.println("Selected date: " + date);
             selectedDate.set(date);
             stage.close();
         });

src/tourplaner/ui/ProgressBar.java

@@ -28,6 +28,7 @@ public class ProgressBar {
         Container content = this.frame.getContentPane();
         this.progressBar = new JProgressBar();
         this.progressBar.setValue(0);
+        this.progressBar.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         this.progressBar.setStringPainted(true);
         TitledBorder border = BorderFactory.createTitledBorder("Laden....");
         this.progressBar.setBorder(border);

src/tourplaner/ui/TourplanerController.java

@@ -6,6 +6,8 @@ import javafx.geometry.Orientation;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import tourplaner.business.ConfigHelper;
 import tourplaner.business.LogHelper;
@@ -16,6 +18,7 @@ import tourplaner.viewmodels.ViewModel;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class TourplanerController implements Initializable {
     //VM
@@ -38,7 +41,21 @@ public class TourplanerController implements Initializable {
     public Menu menueFile, menuebearbeiten, menueoptionen, menuesprachen, menuehilfe;
     public MenuItem reportsummary, tourreport, beendenButton;
     //Elemente
-    public Button sucheButton, editBtn, editTourBtn;
+    public Button sucheButton, editBtn, editTourBtn, copyTourBtn, copyBtn;
+
+    @FXML
+    private void copyTour(){
+        ProgressBar progressBar = new ProgressBar("Copy");
+        this.viewModel.copyTour(progressBar, 80);
+        syncTourNamen(progressBar, 90);
+        tourFocusOnSelected(progressBar, 100);
+    }
+
+    @FXML
+    private void copyLogBtn(){
+        this.viewModel.copyLog();
+        syncLogs();
+    }
 
     @FXML
     private void onlangenglisch(){
@@ -106,9 +123,9 @@ public class TourplanerController implements Initializable {
         mapImageView.setImage(this.viewModel.getImage(selectedItem));
     }
 
-    private void syncTourNamen(){
+    private void syncTourNamen(ProgressBar progressBar, int maxLevel){
         TourListView.getItems().clear();
-        TourListView.setItems(this.viewModel.getTourNamen());
+        TourListView.setItems(this.viewModel.getTourNamen(progressBar, maxLevel));
     }
 
     private void syncLogs(){
@@ -123,13 +140,15 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void tourListSelectedItem(MouseEvent mouseEvent){
+        //Beschreibung
         ProgressBar progressBar = new ProgressBar("Tour auswählen...");
+        int steps = progressBar.getProgressSize(7, 100);
         String selectedItem = TourListView.getSelectionModel().getSelectedItem();
         this.viewModel.selectTour(selectedItem);
         titleTextView.setText(selectedItem);
-        progressBar.addProgress(10);
+        progressBar.addProgress(steps);
         syncTour(selectedItem);
-        progressBar.addProgress(10);
+        progressBar.addProgress(steps);
         startCol.setCellValueFactory(new PropertyValueFactory<>("start"));
         zielCol.setCellValueFactory(new PropertyValueFactory<>("ziel"));
         dauerCol.setCellValueFactory(new PropertyValueFactory<>("dauer"));
@@ -139,9 +158,9 @@ public class TourplanerController implements Initializable {
         //Log anzeigen
         logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
         logTableView.getItems().clear();
-        progressBar.addProgress(10);
+        progressBar.addProgress(steps);
         logTableView.setItems(this.viewModel.getLogData());
-        progressBar.addProgress(10);
+        progressBar.addProgress(steps);
         logDauerCol.setCellValueFactory(new PropertyValueFactory<>("dauer"));
         logStreckeCol.setCellValueFactory(new PropertyValueFactory<>("strecke"));
         logDatumCol.setCellValueFactory(new PropertyValueFactory<>("datum"));
@@ -151,18 +170,33 @@ public class TourplanerController implements Initializable {
         logGegangenCol.setCellValueFactory(new PropertyValueFactory<>("gegangen"));
         logBemerkungCol.setCellValueFactory(new PropertyValueFactory<>("bemerkung"));
         logRatingCol1.setCellValueFactory(new PropertyValueFactory<>("rating"));
-        progressBar.addProgress(10);
+        progressBar.addProgress(steps);
         mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
         if(this.viewModel.isSucheAktiv()){
             this.viewModel.setSucheAktiv(false);
-            progressBar.addProgress(10);
+            syncTourNamen(progressBar, 100 - steps);
-            syncTourNamen();
-            progressBar.setProgress(100);
             this.sucheInput.setText("");
+            tourFocusOnSelected(progressBar, 100);
         }
         progressBar.setProgress(100);
     }
 
+    /**
+     * Setzt den Focus auf die ausgewählte Tour
+     */
+    private void tourFocusOnSelected(ProgressBar progressBar, int maxLevel){
+        //Tour namen select focus
+        AtomicInteger index = new AtomicInteger();
+        AtomicInteger indexF = new AtomicInteger();
+        this.viewModel.getTourNamen(progressBar, maxLevel).forEach(tn -> {
+            index.getAndIncrement();
+            if(tn.equals(this.viewModel.getSelectedTour().getName())){
+                indexF.set(index.get());
+            }
+        });
+        TourListView.getFocusModel().focus(indexF.intValue() - 1);
+    }
+
     /**
      * Beendet die App
      * Verbunden mit dem Menu -> Datei -> Beenden
@@ -201,11 +235,17 @@ public class TourplanerController implements Initializable {
     @FXML
     private void suche(){
         ProgressBar progressBar = new ProgressBar("Suche");
-        this.viewModel.suche(this.sucheInput.getText());
+        this.viewModel.suche(this.sucheInput.getText(), progressBar, 100);
-        progressBar.addProgress(100);
         progressBar.closeProgress();
     }
 
+    @FXML
+    private void sucheEnter(KeyEvent event){
+        if(event.getCode().equals(KeyCode.ENTER)) {
+            suche();
+        }
+    }
+
     /**
      * Fügt einen Log eintrag zu einer Tour hinzu.
      * Ist keine Tour ausgewählt, dann kommt eine Warnung an den User!
@@ -241,7 +281,7 @@ public class TourplanerController implements Initializable {
         //Tour list -> links
         TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         TourListView.setOrientation(Orientation.VERTICAL);
-        syncTourNamen();
+        syncTourNamen(new ProgressBar("Start"), 100);
         deselectAll();
         if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1){
             this.openpdf.setSelected(true);
@@ -267,6 +307,9 @@ public class TourplanerController implements Initializable {
         langToFxml();
     }
 
+    /**
+     * Setzt jedem Element den Text der gewählten Sprache
+     */
     private void langToFxml(){
         this.kartenTab.setText(ConfigHelper.getLangIniString("fkarte"));
         this.beschreibungTab.setText(ConfigHelper.getLangIniString("fbeschreibung"));
@@ -285,7 +328,6 @@ public class TourplanerController implements Initializable {
         this.logHightCol.setText(ConfigHelper.getLangIniString("fhight"));
         this.logPauseCol.setText(ConfigHelper.getLangIniString("fpause"));
         this.logStreckeCol.setText(ConfigHelper.getLangIniString("fstrecke"));
-
         this.sucheButton.setText(ConfigHelper.getLangIniString("fsuche"));
         this.openmap.setText(ConfigHelper.getLangIniString("fopenmapsetting"));
         this.openpdf.setText(ConfigHelper.getLangIniString("fopenpdfsetting"));
@@ -299,9 +341,11 @@ public class TourplanerController implements Initializable {
         this.reportsummary.setText(ConfigHelper.getLangIniString("freposum"));
         this.tourreport.setText(ConfigHelper.getLangIniString("frepotour"));
         this.beendenButton.setText(ConfigHelper.getLangIniString("fbeenden"));
-        this.sucheInput.setPromptText(ConfigHelper.getLangIniString("fsuche")+ConfigHelper.getLangIniString("fpunkte"));
+        this.sucheInput.setPromptText(ConfigHelper.getLangIniString("fsuche") + ConfigHelper.getLangIniString("fpunkte"));
+        this.logRatingCol1.setText(ConfigHelper.getLangIniString("rating"));
 
-        this.logRatingCol1.setText("Rating");
+        this.copyBtn.setText(ConfigHelper.getLangIniString("copybtn"));
+        this.copyTourBtn.setText(ConfigHelper.getLangIniString("copybtn"));
     }
 
     @FXML
@@ -333,9 +377,10 @@ public class TourplanerController implements Initializable {
 
     @FXML
     private void importBtn(){
+        ProgressBar progressBar = new ProgressBar("Import");
         deselectAll();
-        this.viewModel.importData();
+        this.viewModel.importData(progressBar, 90);
-        syncTourNamen();
+        syncTourNamen(progressBar, 100);
     }
 
     @FXML

src/tourplaner/viewmodels/ViewModel.java

@@ -98,7 +98,6 @@ public class ViewModel {
             this.neueTourName = AlertHelper.inputText(ConfigHelper.getLangIniString("tournametitle"),
                     ConfigHelper.getLangIniString("tournameheader"),
                     ConfigHelper.getLangIniString("tournamemsg"), content);
-            System.out.println(this.neueTourName);
             if(this.neueTourName.isEmpty()){
                 return false;
             }
@@ -197,7 +196,6 @@ public class ViewModel {
      * Bearbeitet einen gewählten Log eintrag
      */
     public void editLog(){
-        System.out.println(this.selectedLog);
         if(this.selectedTour != null) {
             if(this.selectedLog != null) {
                 AtomicReference<Tour> tourAkt = new AtomicReference<>();
@@ -299,7 +297,7 @@ public class ViewModel {
                     ConfigHelper.getLangIniString("bewertungmsg"),
                     ConfigHelper.getLangIniString("bewertung") +
                             ConfigHelper.getLangIniString("doppelpunkt"), realcontent);
-            if(input < 0 && input > 5){
+            if(input < 0 || input > 5){
                 input = -1;
                 AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("bewertungeror"), ConfigHelper.getLangIniString("bewertungeror2"));
             }
@@ -314,7 +312,6 @@ public class ViewModel {
     private LocalDate dateInput(LocalDate date){
         LocalDate neuesDatum = null;
         neuesDatum = AlertHelper.datePicker(date);
-        System.out.println(neuesDatum);
         return neuesDatum;
     }
 
@@ -359,12 +356,7 @@ public class ViewModel {
             this.tourData.forEach(s -> {
                 if (s.getName().equals(this.selectedTour.getName())) {
                     AtomicReference<String> newId = new AtomicReference<>();
-                    newId.set(UUID.randomUUID().toString());
+                    newId.set(TourPlaner.newLogId(this.logData));
-                    this.logData.forEach(ss -> {
-                        if (ss.getId().equals(newId.get())) {
-                            newId.set(UUID.randomUUID().toString());
-                        }
-                    });
                     double dauer = dauerInput(-1.0);
                     double strecke, pause, hightmeter;
                     boolean bemerkung = false;
@@ -479,17 +471,17 @@ public class ViewModel {
         return selectedTour;
     }
 
-    public ObservableList<String> getTourNamen() {
+    public ObservableList<String> getTourNamen(ProgressBar progressBar, int maxLevel) {
         ArrayList<String> namen = new ArrayList<>();
-        getTourData().forEach(s -> namen.add(s.getName()));
+        getTourData(progressBar, maxLevel).forEach(s -> namen.add(s.getName()));
         tourNamen.clear();
         tourNamen.addAll(namen);
         return tourNamen;
     }
 
-    public ObservableList<Tour> getTourData() {
+    public ObservableList<Tour> getTourData(ProgressBar progressBar, int maxLevel) {
         tourData.clear();
-        ArrayList<Tour> touren = TourPlaner.getAllTours();
+        ArrayList<Tour> touren = TourPlaner.getAllTours(progressBar, maxLevel);
         if(touren != null) {
             tourData.addAll(touren);
         }
@@ -506,8 +498,10 @@ public class ViewModel {
                 tourData.removeIf(s -> s.getName().equals(tourname));
                 tourNamen.removeIf(s -> s.equals(tourname));
                 logData.removeIf(s -> true);
+                ProgressBar progressBar = new ProgressBar("");
                 TourPlaner.delTour(tourname);
                 setSelectedTour(null);
+                progressBar.setProgress(100);
             } catch (NullPointerException e) {
                 LogHelper.error(e);
             }
@@ -522,18 +516,21 @@ public class ViewModel {
      * Sucht eine Tour
      * @param sucheInput Text nach dem gesucht werden soll
      */
-    public void suche(String sucheInput){
+    public void suche(String sucheInput, ProgressBar progressBar, int maxProgress){
         if(sucheInput.isEmpty()){
             AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
                     ConfigHelper.getLangIniString("suchfeldleer"),
                     ConfigHelper.getLangIniString("suchtextzuerst"));
         }
-         ArrayList<Tour> result = TourPlaner.sucheTour(sucheInput);
+         ArrayList<Tour> result = TourPlaner.sucheTour(sucheInput, progressBar, maxProgress/2);
+        int steps = progressBar.getProgressSize(result.size(), maxProgress);
         tourNamen.clear();
         for (Tour tour:result) {
             tourNamen.add(tour.getName());
+            progressBar.addProgress(steps);
         }
         this.sucheAktiv = true;
+        progressBar.setProgress(maxProgress);
     }
 
     public boolean isSucheAktiv() {
@@ -627,11 +624,11 @@ public class ViewModel {
     /**
      * Importiert alle daten von einem File das hier gewählt wird
      */
-    public void importData() {
+    public void importData(ProgressBar progressBar, int maxProgress) {
         String file = AlertHelper.fileChooser("Importiere");
         if (file != null){
             this.tourNamen = FXCollections.observableArrayList();
-            new Exporter(file).doImport();
+            new Exporter(file).doImport(progressBar, maxProgress);
         }
     }
 
@@ -639,6 +636,64 @@ public class ViewModel {
      * Erstellt einen Summary Report
      */
     public void sumReport(){
-        Reporter.sumReport();
+        Reporter.sumReport(new ProgressBar("Report"), 100);
+    }
+
+    /**
+     * Gibt das Selected Log zurück
+     * @return Null wenn nichts selected ist
+     */
+    public Log getSelectedLog() {
+        return selectedLog;
+    }
+
+    /**
+     * Kopiert einen Log eintrag und erstellt dafür eine neue Id für das kopierte log
+     */
+    public void copyLog() {
+        Log selectedLog = getSelectedLog();
+        Tour selectedTour = getSelectedTour();
+        if(selectedLog == null && selectedTour == null){
+            //TODO kein log & keine tour selected error alert
+        }else {
+            selectedLog.setId(TourPlaner.newLogId(this.logData));
+            TourPlaner.addLog(selectedTour.getName(), selectedLog);
+        }
+    }
+
+    /**
+     * Kopiert eie Tour und hängt dafür am ende des namens ein _copy an
+     * @return Der neue Tour name, bei error ""
+     */
+    public String copyTour(ProgressBar progressBar, int maxLevel) {
+       Tour selectedTour = getSelectedTour();
+        String newName = "";
+       if (selectedTour == null){
+           //TODO keine tour selected
+           return "";
+       }else {
+           newName = selectedTour.getName() + "_copy";
+           try {
+               ArrayList<Log> logs = TourPlaner.getLogs(selectedTour.getName());
+
+               progressBar.addProgress(10);
+               TourPlaner.addTourMax(new Tour(newName, selectedTour.getDauer(), selectedTour.getMapJson(), selectedTour.getStrecke(), selectedTour.getStart(), selectedTour.getZiel(), logs), progressBar, 70);
+               String finalNewName = newName;
+               int steps = progressBar.getProgressSize(logs.size(), maxLevel-10);
+               logs.forEach(l -> {
+                   TourPlaner.addLog(finalNewName, l);
+                   progressBar.addProgress(steps);
+               });
+               getTourData(progressBar, maxLevel);
+//               getLogData();
+               selectTour(newName);
+               progressBar.setProgress(maxLevel);
+               return newName;
+           } catch (IOException e) {
+                LogHelper.error(e);
+                progressBar.setProgress(maxLevel);
+                return "";
+           }
+       }
     }
 }