diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..562b66d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea/ +out/ \ No newline at end of file diff --git a/doxygendoc/docbook/_tour_8java.xml b/doxygendoc/docbook/_tour_8java.xml index 561826f..8143feb 100644 --- a/doxygendoc/docbook/_tour_8java.xml +++ b/doxygendoc/docbook/_tour_8java.xml @@ -5,14 +5,14 @@ Classes - class tourplaner.model.Tour + class tourplaner.object.Tour Packages - package tourplaner.model + package tourplaner.object diff --git a/doxygendoc/docbook/annotated.xml b/doxygendoc/docbook/annotated.xml index cfb23e2..dfeaede 100644 --- a/doxygendoc/docbook/annotated.xml +++ b/doxygendoc/docbook/annotated.xml @@ -1,4 +1,4 @@
Class List -Here are the classes, structs, unions and interfaces with brief descriptions:tourplaner.data.DbConnecttourplaner.business.LogHelpertourplaner.Maintourplaner.ui.PresenterMaintourplaner.model.Tourtourplaner.business.TourPlaner
+Here are the classes, structs, unions and interfaces with brief descriptions:tourplaner.data.DbConnecttourplaner.business.LogHelpertourplaner.Maintourplaner.ui.PresenterMaintourplaner.object.Tourtourplaner.business.TourPlaner diff --git a/doxygendoc/docbook/classtourplaner_1_1model_1_1_tour.xml b/doxygendoc/docbook/classtourplaner_1_1model_1_1_tour.xml index 340063c..1fdc724 100644 --- a/doxygendoc/docbook/classtourplaner_1_1model_1_1_tour.xml +++ b/doxygendoc/docbook/classtourplaner_1_1model_1_1_tour.xml @@ -1,7 +1,7 @@
-tourplaner.model.Tour Class Reference -tourplaner.model.Tour +tourplaner.object.Tour Class Reference +tourplaner.object.Tour
Detailed Description diff --git a/doxygendoc/docbook/namespacetourplaner_1_1model.xml b/doxygendoc/docbook/namespacetourplaner_1_1model.xml index 0d12b74..fed48a1 100644 --- a/doxygendoc/docbook/namespacetourplaner_1_1model.xml +++ b/doxygendoc/docbook/namespacetourplaner_1_1model.xml @@ -1,7 +1,7 @@
-Package tourplaner.model -tourplaner.model +Package tourplaner.object +tourplaner.object Classes diff --git a/doxygendoc/html/_tour_8java.html b/doxygendoc/html/_tour_8java.html index 3951535..7fecd10 100644 --- a/doxygendoc/html/_tour_8java.html +++ b/doxygendoc/html/_tour_8java.html @@ -93,12 +93,12 @@ $(document).ready(function(){initNavTree('_tour_8java.html',''); initResizable() - +

Classes

class  tourplaner.model.Tour
class  tourplaner.object.Tour
 
- +

Packages

package  tourplaner.model
package  tourplaner.object
 
diff --git a/doxygendoc/html/classes.html b/doxygendoc/html/classes.html index 19b6962..d127856 100644 --- a/doxygendoc/html/classes.html +++ b/doxygendoc/html/classes.html @@ -103,7 +103,7 @@ $(document).ready(function(){initNavTree('classes.html',''); initResizable(); })
PresenterMain (tourplaner.ui)
T
-
Tour (tourplaner.model)
TourPlaner (tourplaner.business)
+
Tour (tourplaner.object)
TourPlaner (tourplaner.business)
diff --git a/doxygendoc/html/classtourplaner_1_1business_1_1_log_helper.html b/doxygendoc/html/classtourplaner_1_1business_1_1_log_helper.html index 2c41b01..cb2c2a3 100644 --- a/doxygendoc/html/classtourplaner_1_1business_1_1_log_helper.html +++ b/doxygendoc/html/classtourplaner_1_1business_1_1_log_helper.html @@ -109,7 +109,7 @@ Static Public Member Functions - + diff --git a/doxygendoc/html/classtourplaner_1_1business_1_1_tour_planer.html b/doxygendoc/html/classtourplaner_1_1business_1_1_tour_planer.html index 60b1690..c3bc067 100644 --- a/doxygendoc/html/classtourplaner_1_1business_1_1_tour_planer.html +++ b/doxygendoc/html/classtourplaner_1_1business_1_1_tour_planer.html @@ -106,7 +106,7 @@ Public Member Functions
static Logger tourplaner.business.LogHelper.getLogger static Logger tourplaner.business.LogHelper.getLogger ( )
- + diff --git a/doxygendoc/html/classtourplaner_1_1model_1_1_tour.html b/doxygendoc/html/classtourplaner_1_1model_1_1_tour.html index 7e4d7bf..3ccb594 100644 --- a/doxygendoc/html/classtourplaner_1_1model_1_1_tour.html +++ b/doxygendoc/html/classtourplaner_1_1model_1_1_tour.html @@ -5,7 +5,7 @@ -Tourplaner: tourplaner.model.Tour Class Reference +Tourplaner: tourplaner.object.Tour Class Reference @@ -84,7 +84,7 @@ $(document).ready(function(){initNavTree('classtourplaner_1_1model_1_1_tour.html
-
tourplaner.model.Tour Class Reference
+
tourplaner.object.Tour Class Reference

Detailed Description

diff --git a/doxygendoc/html/hierarchy.html b/doxygendoc/html/hierarchy.html index 351e84c..8243d9a 100644 --- a/doxygendoc/html/hierarchy.html +++ b/doxygendoc/html/hierarchy.html @@ -92,7 +92,7 @@ $(document).ready(function(){initNavTree('hierarchy.html',''); initResizable();
- + diff --git a/doxygendoc/html/namespacetourplaner_1_1model.html b/doxygendoc/html/namespacetourplaner_1_1model.html index e84a04f..dffe13c 100644 --- a/doxygendoc/html/namespacetourplaner_1_1model.html +++ b/doxygendoc/html/namespacetourplaner_1_1model.html @@ -5,7 +5,7 @@ -Tourplaner: Package tourplaner.model +Tourplaner: Package tourplaner.object @@ -86,7 +86,7 @@ $(document).ready(function(){initNavTree('namespacetourplaner_1_1model.html','')
Classes
-
Package tourplaner.model
+
Package tourplaner.object
tourplaner.business.TourPlaner.TourPlaner tourplaner.business.TourPlaner.TourPlaner ( Stage  primaryStage)
 Ctourplaner.data.DbConnect
 Ctourplaner.business.LogHelper
 Ctourplaner.ui.PresenterMain
 Ctourplaner.model.Tour
 Ctourplaner.object.Tour
 Ctourplaner.business.TourPlaner
 ▼CApplication
 Ctourplaner.Main
diff --git a/doxygendoc/latex/classtourplaner_1_1model_1_1_tour.tex b/doxygendoc/latex/classtourplaner_1_1model_1_1_tour.tex index 15b99f2..1eac647 100644 --- a/doxygendoc/latex/classtourplaner_1_1model_1_1_tour.tex +++ b/doxygendoc/latex/classtourplaner_1_1model_1_1_tour.tex @@ -1,5 +1,5 @@ \hypertarget{classtourplaner_1_1model_1_1_tour}{}\doxysection{tourplaner.\+model.\+Tour Class Reference} -\label{classtourplaner_1_1model_1_1_tour}\index{tourplaner.model.Tour@{tourplaner.model.Tour}} +\label{classtourplaner_1_1model_1_1_tour}\index{tourplaner.object.Tour@{tourplaner.object.Tour}} \doxysubsection{Detailed Description} diff --git a/doxygendoc/latex/namespacetourplaner_1_1model.tex b/doxygendoc/latex/namespacetourplaner_1_1model.tex index 562fba5..d1b5af5 100644 --- a/doxygendoc/latex/namespacetourplaner_1_1model.tex +++ b/doxygendoc/latex/namespacetourplaner_1_1model.tex @@ -1,5 +1,5 @@ \hypertarget{namespacetourplaner_1_1model}{}\doxysection{Package tourplaner.\+model} -\label{namespacetourplaner_1_1model}\index{tourplaner.model@{tourplaner.model}} +\label{namespacetourplaner_1_1model}\index{tourplaner.object@{tourplaner.object}} \doxysubsection*{Classes} \begin{DoxyCompactItemize} \item diff --git a/doxygendoc/man/man3/tourplaner_model.3 b/doxygendoc/man/man3/tourplaner_model.3 index 010f8a7..634f3e7 100644 --- a/doxygendoc/man/man3/tourplaner_model.3 +++ b/doxygendoc/man/man3/tourplaner_model.3 @@ -1,8 +1,8 @@ -.TH "tourplaner.model" 3 "Thu Feb 25 2021" "Version 0.0.2" "Tourplaner" \" -*- nroff -*- +.TH "tourplaner.object" 3 "Thu Feb 25 2021" "Version 0.0.2" "Tourplaner" \" -*- nroff -*- .ad l .nh .SH NAME -tourplaner.model +tourplaner.object .SH SYNOPSIS .br .PP diff --git a/doxygendoc/man/man3/tourplaner_model_Tour.3 b/doxygendoc/man/man3/tourplaner_model_Tour.3 index 8ae5b9b..d180aca 100644 --- a/doxygendoc/man/man3/tourplaner_model_Tour.3 +++ b/doxygendoc/man/man3/tourplaner_model_Tour.3 @@ -1,8 +1,8 @@ -.TH "tourplaner.model.Tour" 3 "Thu Feb 25 2021" "Version 0.0.2" "Tourplaner" \" -*- nroff -*- +.TH "tourplaner.object.Tour" 3 "Thu Feb 25 2021" "Version 0.0.2" "Tourplaner" \" -*- nroff -*- .ad l .nh .SH NAME -tourplaner.model.Tour +tourplaner.object.Tour .SH SYNOPSIS .br .PP diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html index bb354d8..8bb6ea9 100644 --- a/javadoc/allclasses-index.html +++ b/javadoc/allclasses-index.html @@ -127,7 +127,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); - + diff --git a/javadoc/allclasses.html b/javadoc/allclasses.html index f25b148..99f644a 100644 --- a/javadoc/allclasses.html +++ b/javadoc/allclasses.html @@ -25,7 +25,7 @@
  • LogHelper
  • Main
  • PresenterMain
    • -
  • Tour
    • +
  • Tour
  • TourPlaner
    • diff --git a/javadoc/allpackages-index.html b/javadoc/allpackages-index.html index c4a2d98..d2fe410 100644 --- a/javadoc/allpackages-index.html +++ b/javadoc/allpackages-index.html @@ -118,7 +118,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); - + diff --git a/javadoc/element-list b/javadoc/element-list index e8df92a..ec6cae2 100644 --- a/javadoc/element-list +++ b/javadoc/element-list @@ -1,5 +1,5 @@ tourplaner tourplaner.business tourplaner.data -tourplaner.model +tourplaner.object tourplaner.ui diff --git a/javadoc/index-files/index-7.html b/javadoc/index-files/index-7.html index b97888d..a67d4b9 100644 --- a/javadoc/index-files/index-7.html +++ b/javadoc/index-files/index-7.html @@ -97,11 +97,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));

    T

    -
    Tour - Class in tourplaner.model
    +
    Tour - Class in tourplaner.object
    Model einer Tour
    -
    Tour() - Constructor for class tourplaner.model.Tour
    +
    Tour() - Constructor for class tourplaner.object.Tour
     
    tourplaner - package tourplaner
     
    @@ -117,7 +117,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
     
    tourplaner.data - package tourplaner.data
     
    -
    tourplaner.model - package tourplaner.model
    +
    tourplaner.object - package tourplaner.object
     
    tourplaner.ui - package tourplaner.ui
     
    diff --git a/javadoc/index.html b/javadoc/index.html index 64f54c7..2e9d488 100644 --- a/javadoc/index.html +++ b/javadoc/index.html @@ -113,7 +113,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    - + diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html index b718fff..5c0976c 100644 --- a/javadoc/overview-tree.html +++ b/javadoc/overview-tree.html @@ -99,7 +99,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  • tourplaner,
  • tourplaner.business,
  • tourplaner.data,
    • -
  • tourplaner.model,
    • +
  • tourplaner.object,
  • tourplaner.ui
    • @@ -117,7 +117,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  • tourplaner.data.DbConnect
  • tourplaner.business.LogHelper
  • tourplaner.ui.PresenterMain
    • -
  • tourplaner.model.Tour
    • +
  • tourplaner.object.Tour
  • tourplaner.business.TourPlaner
    • diff --git a/javadoc/tourplaner/model/Tour.html b/javadoc/tourplaner/model/Tour.html index 17c5b9a..c285d2d 100644 --- a/javadoc/tourplaner/model/Tour.html +++ b/javadoc/tourplaner/model/Tour.html @@ -109,7 +109,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -
    Package tourplaner.model
    +
    Package tourplaner.object

    Class Tour

    @@ -117,7 +117,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  • java.lang.Object
    • -
    • tourplaner.model.Tour
      • +
    • tourplaner.object.Tour
    • diff --git a/javadoc/tourplaner/model/package-summary.html b/javadoc/tourplaner/model/package-summary.html index a0823ad..3b2468e 100644 --- a/javadoc/tourplaner/model/package-summary.html +++ b/javadoc/tourplaner/model/package-summary.html @@ -3,7 +3,7 @@ -tourplaner.model +tourplaner.object @@ -93,7 +93,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -

    Package tourplaner.model

    +

    Package tourplaner.object

      @@ -106,7 +106,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    - + diff --git a/javadoc/tourplaner/model/package-tree.html b/javadoc/tourplaner/model/package-tree.html index a3ac851..34a520b 100644 --- a/javadoc/tourplaner/model/package-tree.html +++ b/javadoc/tourplaner/model/package-tree.html @@ -3,7 +3,7 @@ -tourplaner.model Class Hierarchy +tourplaner.object Class Hierarchy @@ -93,7 +93,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -

    Hierarchy For Package tourplaner.model

    +

    Hierarchy For Package tourplaner.object

    Package Hierarchies:
    • All Packages
      • @@ -105,7 +105,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
      • java.lang.Object
          -
        • tourplaner.model.Tour
          • +
        • tourplaner.object.Tour
      diff --git a/src/tourplaner/Main.java b/src/tourplaner/Main.java index 282f4f2..279598a 100644 --- a/src/tourplaner/Main.java +++ b/src/tourplaner/Main.java @@ -1,19 +1,27 @@ package tourplaner; import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; import javafx.stage.Stage; -import tourplaner.business.TourPlaner; +import tourplaner.business.LogHelper; + +import java.io.IOException; public class Main extends Application { - public static void main(String[] args) throws Exception { + public static void main(String[] args){ launch(args); } @Override - public void start(Stage primaryStage) throws Exception{ - TourPlaner tourplaner = new TourPlaner(primaryStage); + public void start(Stage primaryStage) throws IOException { + Parent root = FXMLLoader.load(Main.class.getResource("tourplaner.fxml")); + primaryStage.setTitle("DerGeorg Touren Planer"); + primaryStage.setScene(new Scene(root, 600, 600)); + primaryStage.show(); } } diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java index 05337ea..744534f 100644 --- a/src/tourplaner/business/TourPlaner.java +++ b/src/tourplaner/business/TourPlaner.java @@ -3,9 +3,6 @@ package tourplaner.business; import javafx.stage.Stage; import org.apache.log4j.Logger; import tourplaner.data.DbConnect; -import tourplaner.ui.PresenterMain; - -import java.io.IOException; /** * Haupt Logik des Tourplaners @@ -20,7 +17,6 @@ public class TourPlaner{ public TourPlaner(Stage primaryStage){ String startText = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message"); LogHelper.info(startText, "TourPlaner"); - PresenterMain presenterMain = new PresenterMain(primaryStage); // Start Presenter/GUI new DbConnect().init(); } diff --git a/src/tourplaner/model/Tour.java b/src/tourplaner/model/Tour.java deleted file mode 100644 index 5d7e5cd..0000000 --- a/src/tourplaner/model/Tour.java +++ /dev/null @@ -1,7 +0,0 @@ -package tourplaner.model; - -/** - * Model einer Tour - */ -public class Tour { -} diff --git a/src/tourplaner/object/Tour.java b/src/tourplaner/object/Tour.java new file mode 100644 index 0000000..503e27a --- /dev/null +++ b/src/tourplaner/object/Tour.java @@ -0,0 +1,50 @@ +package tourplaner.object; + +/** + * Model einer Tour + */ +public class Tour { + private String dauer; + private String mapJson; + private double distanz; + private String name; + + public Tour(String name, String dauer, String mapJson, double distanz) { + this.dauer = dauer; + this.mapJson = mapJson; + this.distanz = distanz; + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDauer() { + return dauer; + } + + public void setDauer(String dauer) { + this.dauer = dauer; + } + + public String getMapJson() { + return mapJson; + } + + public void setMapJson(String mapJson) { + this.mapJson = mapJson; + } + + public double getDistanz() { + return distanz; + } + + public void setDistanz(double distanz) { + this.distanz = distanz; + } +} diff --git a/src/tourplaner/ui/tourplaner.fxml b/src/tourplaner/tourplaner.fxml similarity index 87% rename from src/tourplaner/ui/tourplaner.fxml rename to src/tourplaner/tourplaner.fxml index 28f62aa..08e8e24 100644 --- a/src/tourplaner/ui/tourplaner.fxml +++ b/src/tourplaner/tourplaner.fxml @@ -32,35 +32,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - - - - - - - - - - - - - - - - - - - - + + + + + + - + - + - - + + @@ -73,7 +59,7 @@ - + @@ -87,7 +73,7 @@ - + @@ -101,7 +87,7 @@ - + @@ -112,12 +98,12 @@ -
    TourTour
    Model einer Tour
    		  
    tourplaner.modeltourplaner.object  
     
    tourplaner.modeltourplaner.object  
    TourTour
    Model einer Tour