diff --git a/src/tourplaner/business/ConfigHelper.java b/src/tourplaner/business/ConfigHelper.java index ff8e327..ad30041 100644 --- a/src/tourplaner/business/ConfigHelper.java +++ b/src/tourplaner/business/ConfigHelper.java @@ -10,7 +10,7 @@ import java.io.IOException; */ public class ConfigHelper { - public static String standartConfig = "conf.ini"; // Config.ini befindet sich im Root Verzeichnis + public static final String standartConfig = "conf.ini"; // Config.ini befindet sich im Root Verzeichnis /** * Liest einen Int aus der Config aus diff --git a/src/tourplaner/business/DirectionMap.java b/src/tourplaner/business/DirectionMap.java index 1035dde..6ac6ebf 100644 --- a/src/tourplaner/business/DirectionMap.java +++ b/src/tourplaner/business/DirectionMap.java @@ -9,8 +9,6 @@ import java.io.IOException; */ public class DirectionMap { private double dauer, strecke; - private String start, end, tourname, file, filepdf; - private Image map, mappdf; /** * Holt die Map als image und alle Daten zur berechneten Route @@ -21,15 +19,12 @@ public class DirectionMap { * @throws IOException Fehler beim Image der Map */ public DirectionMap (String start, String ende, String tourname) throws IOException { - this.map = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size")); - this.mappdf = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "sizePdf")); - this.start = start; - this.end = ende; - this.tourname = tourname; - this.file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + ".jpg"; - this.filepdf = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + "_pdf.jpg"; - FileHelper.saveImage(this.map, "jpg", new File(this.file)); - FileHelper.saveImage(this.mappdf, "jpg", new File(this.filepdf)); + Image map = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size")); + Image mappdf = getMap(start, ende, 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); diff --git a/src/tourplaner/business/Exporter.java b/src/tourplaner/business/Exporter.java index 0c52ef8..08cfa20 100644 --- a/src/tourplaner/business/Exporter.java +++ b/src/tourplaner/business/Exporter.java @@ -3,10 +3,8 @@ 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; @@ -15,8 +13,7 @@ import java.util.ArrayList; */ public class Exporter { - private ArrayList touren; - private String path; + private final String path; /** * Erstellt den Exporter mit dem gegebenen Path @@ -51,12 +48,12 @@ public class Exporter { public void doImport() { ProgressBar progressBar = new ProgressBar("Import..."); try { - this.touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(this.path))); + ArrayList touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(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) { + int size = progressBar.getProgressSize(touren.size() * 3, 100); + for (Tour tour: touren) { new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName()); progressBar.addProgress(size); dbConnect.addTour(tour); diff --git a/src/tourplaner/business/JsonHelper.java b/src/tourplaner/business/JsonHelper.java index c12132b..fbcb349 100644 --- a/src/tourplaner/business/JsonHelper.java +++ b/src/tourplaner/business/JsonHelper.java @@ -34,15 +34,6 @@ public class JsonHelper { return getJObj(json).get("route").getAsJsonObject().get(gets).getAsDouble(); } - /** - * Erzeugt ein Json aus einem Object - * @param obj Das Objekt - * @return Json des Objektes - */ - public static String getJsonFromObj(Object obj){ - return new Gson().toJson(obj); - } - /** * Erzeugt ein Json aus einem Object * @param obj Das Objekt diff --git a/src/tourplaner/business/LogHelper.java b/src/tourplaner/business/LogHelper.java index f7e3f4a..51f5309 100644 --- a/src/tourplaner/business/LogHelper.java +++ b/src/tourplaner/business/LogHelper.java @@ -15,15 +15,6 @@ public class LogHelper{ getLog(name).info(msg); } - /** - * Log info in file und Console - * @param msg Nachricht in dem Log - * @param name Name des Log Eintrags - */ - public static void warn(String msg, String name){ - getLog(name).warn(msg); - } - /** * Log info in file und Console * @param msg Nachricht in dem Log @@ -41,15 +32,6 @@ public class LogHelper{ getLog(e.getClass().getName()).error(e.getMessage()); } - /** - * Log info in file und Console - * @param msg Nachricht in dem Log - * @param name Name des Log Eintrags - */ - public static void fatal(String msg, String name){ - getLog(name).fatal(msg); - } - /** * Instanziert den Logger * @param name Name des Loggers diff --git a/src/tourplaner/business/Reporter.java b/src/tourplaner/business/Reporter.java index 8091604..5d40306 100644 --- a/src/tourplaner/business/Reporter.java +++ b/src/tourplaner/business/Reporter.java @@ -25,13 +25,9 @@ import java.util.Date; */ public class Reporter { - private static Font catFont = new Font(Font.TIMES_ROMAN, 18, + private static final Font catFont = new Font(Font.TIMES_ROMAN, 18, Font.BOLD); - private static Font redFont = new Font(Font.TIMES_ROMAN, 12, - Font.NORMAL, Color.RED); - private static Font subFont = new Font(Font.TIMES_ROMAN, 16, - Font.BOLD); - private static Font smallBold = new Font(Font.TIMES_ROMAN, 12, + private static final Font subFont = new Font(Font.TIMES_ROMAN, 16, Font.BOLD); /** @@ -192,53 +188,4 @@ public class Reporter { paragraph.add(new Paragraph(" ")); } } -// private static void createTable(Section subCatPart) -// throws BadElementException { -// PdfPTable table = new PdfPTable(5); -// -// // t.setBorderColor(BaseColor.GRAY); -// // t.setPadding(4); -// // t.setSpacing(4); -// // t.setBorderWidth(1); -// -// PdfPCell c1 = new PdfPCell(new Phrase("NR")); -// c1.setHorizontalAlignment(Element.ALIGN_CENTER); -// table.addCell(c1); -// -// c1 = new PdfPCell(new Phrase("Datum")); -// c1.setHorizontalAlignment(Element.ALIGN_CENTER); -// table.addCell(c1); -// -// c1 = new PdfPCell(new Phrase("Entfernung")); -// c1.setHorizontalAlignment(Element.ALIGN_CENTER); -// table.addCell(c1); -// -// c1 = new PdfPCell(new Phrase("Höhenmeter")); -// c1.setHorizontalAlignment(Element.ALIGN_CENTER); -// table.addCell(c1); -// -// c1 = new PdfPCell(new Phrase("AVG Geschwindigkeit")); -// c1.setHorizontalAlignment(Element.ALIGN_CENTER); -// table.addCell(c1); -// -// -// table.setHeaderRows(1); -// -// table.addCell("1.0"); -// table.addCell("1.1"); -// table.addCell("1.2"); -// table.addCell("1.3"); -// table.addCell("1.4"); -// table.addCell("1.5"); -// -// table.addCell("2.0"); -// table.addCell("2.1"); -// table.addCell("2.2"); -// table.addCell("2.3"); -// table.addCell("2.4"); -// table.addCell("2.5"); -// -// subCatPart.add(table); -// -// } } diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java index a9a8aff..78293c6 100644 --- a/src/tourplaner/business/TourPlaner.java +++ b/src/tourplaner/business/TourPlaner.java @@ -8,7 +8,6 @@ import tourplaner.ui.ProgressBar; import java.awt.*; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; @@ -16,7 +15,6 @@ import java.util.ArrayList; * Haupt Logik des Tourplaners */ public class TourPlaner{ - private Logger logger; /** * Erstellt alle DB Tabellen falls nötig @@ -90,16 +88,6 @@ public class TourPlaner{ } /** - * Holt das Gui Bild - * @param tourname Name der Tour - * @return Das Bild - * @throws IOException Error beim Bild holen - */ - public static Image getImage(String tourname) throws IOException { - return FileHelper.getImage(new File(getImagePath(tourname))); - } - - /** * Path zu dem Bild für die GUI * @param tourname Name der Tour * @return Path zu dem Bild für die GUI @@ -117,16 +105,6 @@ public class TourPlaner{ return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + "_pdf.jpg"; } - /** - * Öffnet ein Bild einer Tour - * @param tourname Tourname - */ - public static void openImage(String tourname){ - if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) { - FileHelper.openDefault(getImagePath(tourname)); - } - } - /** * Holt alle Logs einer Tour diff --git a/src/tourplaner/data/DbConnect.java b/src/tourplaner/data/DbConnect.java index aa0a861..4f5db77 100644 --- a/src/tourplaner/data/DbConnect.java +++ b/src/tourplaner/data/DbConnect.java @@ -1,14 +1,11 @@ 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.*; -import java.time.LocalDate; import java.util.ArrayList; /** @@ -54,9 +51,7 @@ public class DbConnect { ArrayList logs = getLogs(oldname); result.add(delLogs(oldname)); result.add(PostgresHelper.executeUpdate("UPDATE public.tour SET tourname = '"+tour.getName()+"', dauer = 1, mapjson = '"+tour.getMapJson()+"', start = '"+tour.getStart()+"', ziel = '"+tour.getZiel()+"', strecke = "+tour.getStrecke()+" WHERE tourname ='" + oldname + "';")); - logs.forEach(log -> { - result.add(addLog(tourname, log)); - }); + logs.forEach(log -> result.add(addLog(tourname, log))); return !result.contains(false); } diff --git a/src/tourplaner/data/PostgresHelper.java b/src/tourplaner/data/PostgresHelper.java index f90dcac..94eae49 100644 --- a/src/tourplaner/data/PostgresHelper.java +++ b/src/tourplaner/data/PostgresHelper.java @@ -3,20 +3,15 @@ package tourplaner.data; import tourplaner.business.ConfigHelper; import tourplaner.business.LogHelper; -import tourplaner.object.Tour; import java.sql.Connection; import java.sql.DriverManager; -import java.sql.ResultSet; import java.sql.Statement; -import java.util.ArrayList; /** * Hilfsfunktionen für die verwendung der Postgres DB */ public class PostgresHelper { - private Connection c; - private Statement stmt; /** * Verbindet mit der Datenbank * @return Das Connection Objekt diff --git a/src/tourplaner/object/Log.java b/src/tourplaner/object/Log.java index 16b67dd..a88dcce 100644 --- a/src/tourplaner/object/Log.java +++ b/src/tourplaner/object/Log.java @@ -1,9 +1,6 @@ package tourplaner.object; -import jdk.jshell.spi.ExecutionControl; - import java.time.LocalDate; -import java.util.Date; public class Log { private String id, bemerkung, rating; @@ -30,18 +27,10 @@ public class Log { return rating; } - public void setRating(String rating) { - this.rating = rating; - } - public String getBemerkung() { return bemerkung; } - public void setBemerkung(String bemerkung) { - this.bemerkung = bemerkung; - } - public double getAvgspeed() { return avgspeed; } @@ -54,55 +43,28 @@ public class Log { return hightmeter; } - public void setHightmeter(double hightmeter) { - this.hightmeter = hightmeter; - } - public double getPause() { return pause; } - public void setPause(double pause) { - this.pause = pause; - } - public double getGegangen() { return gegangen; } - public void setGegangen(double gegangen) { - this.gegangen = gegangen; - } - public String getId() { return id; } - public void setId(String id) { - this.id = id; - } - public double getDauer() { return dauer; } - public void setDauer(double dauer) { - this.dauer = dauer; - } - public LocalDate getDatum() { return datum; } - public void setDatum(LocalDate datum) { - this.datum = datum; - } - public double getStrecke() { return strecke; } - public void setStrecke(double strecke) { - this.strecke = strecke; - } } diff --git a/src/tourplaner/object/Tour.java b/src/tourplaner/object/Tour.java index 39a7764..84d5ae7 100644 --- a/src/tourplaner/object/Tour.java +++ b/src/tourplaner/object/Tour.java @@ -7,7 +7,11 @@ import java.util.concurrent.atomic.AtomicReference; * Model einer Tour */ public class Tour { - private String dauer, mapJson, name, start, ziel, rating; + private String dauer; + private String mapJson; + private String name; + private String start; + private String ziel; private double strecke; private ArrayList log; @@ -31,16 +35,6 @@ public class Tour { this.log = logs; } - public void setTour(Tour tour){ - this.dauer = tour.getDauer(); - this.mapJson = tour.getMapJson(); - this.strecke = tour.getStrecke(); - this.name = tour.getName(); - this.start = tour.getStart(); - this.ziel = tour.getZiel(); - this.log = tour.getLogs(); - } - public void setLog(ArrayList log) { this.log = log; } @@ -96,10 +90,6 @@ public class Tour { return mapJson; } - public void setMapJson(String mapJson) { - this.mapJson = mapJson; - } - public double getStrecke() { return strecke; } @@ -112,23 +102,12 @@ public class Tour { return name; } - public void setName(String name) { - this.name = name; - } - public String getStart() { return start; } - public void setStart(String start) { - this.start = start; - } - public String getZiel() { return ziel; } - public void setZiel(String ziel) { - this.ziel = ziel; - } } diff --git a/src/tourplaner/tests/EinheitenAdderTest.java b/src/tourplaner/tests/EinheitenAdderTest.java index 2b79992..aee0bb9 100644 --- a/src/tourplaner/tests/EinheitenAdderTest.java +++ b/src/tourplaner/tests/EinheitenAdderTest.java @@ -9,10 +9,6 @@ import static org.junit.jupiter.api.Assertions.*; class EinheitenAdderTest { - @BeforeEach - void setUp() { - } - @Test void addMeter() { assertEquals(EinheitenAdder.addMeter("1"), "1"+ " " + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "meter")); diff --git a/src/tourplaner/tests/TourTest.java b/src/tourplaner/tests/TourTest.java index 500c7c5..5b996b1 100644 --- a/src/tourplaner/tests/TourTest.java +++ b/src/tourplaner/tests/TourTest.java @@ -19,9 +19,9 @@ class TourTest { @BeforeEach void setUp() { this.tour = new Tour("String name", "String dauer", "String mapJson", 2, "String start", "String ziel"); - this.log1 = new Log("1", 2, this.date, 3, "4", 5, 6, "7");; - this.log2 = new Log("2", 2, this.date, 3, "4", 5, 6, "7");; - this.log3 = new Log("3", 2, this.date, 3, "4", 5, 6, "7");; + this.log1 = new Log("1", 2, this.date, 3, "4", 5, 6, "7"); + this.log2 = new Log("2", 2, this.date, 3, "4", 5, 6, "7"); + this.log3 = new Log("3", 2, this.date, 3, "4", 5, 6, "7"); } @Test diff --git a/src/tourplaner/tourplaner.fxml b/src/tourplaner/tourplaner.fxml index 6c100b2..ae99a23 100644 --- a/src/tourplaner/tourplaner.fxml +++ b/src/tourplaner/tourplaner.fxml @@ -39,192 +39,185 @@ - - + - - - - - - + + + - - - - + + - - - - - - - - - - - + + + + + + - - - - - - - + + + + + - - - - - + + - -