Merge pull request #498 from dlsc-software-consulting-gmbh/ubuntu-lin…

…ks-jpro-platform

Ubuntu links and jpro platform

app/pom.xml

@@ -50,15 +50,15 @@
         </dependency>
 
         <dependency>
-            <groupId>one.jpro</groupId>
+            <groupId>one.jpro.platform</groupId>
             <artifactId>jpro-routing-core</artifactId>
-            <version>${routing.version}</version>
+            <version>${jpro.platform.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>one.jpro</groupId>
+            <groupId>one.jpro.platform</groupId>
             <artifactId>jpro-routing-dev</artifactId>
-            <version>${routing.version}</version>
+            <version>${jpro.platform.version}</version>
         </dependency>
 
         <dependency>
@@ -421,6 +421,7 @@
                 <configuration>
                     <mainClassName>com.dlsc.jfxcentral2.app.JFXCentral2App</mainClassName>
                     <releaseName>jfxcentral</releaseName>
+                    <localJVMArgs>-Ddevelop=true</localJVMArgs>
                     <port>8088</port>
                 </configuration>
             </plugin>

app/src/main/java/com/dlsc/jfxcentral2/app/JFXCentral2App.java

@@ -67,13 +67,14 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Callback;
-import one.jpro.routing.Request;
-import one.jpro.routing.Response;
-import one.jpro.routing.Route;
-import one.jpro.routing.RouteNode;
-import one.jpro.routing.RouteUtils;
-import one.jpro.routing.dev.DevFilter;
-import one.jpro.routing.sessionmanager.SessionManager;
+import one.jpro.platform.routing.Request;
+import one.jpro.platform.routing.Response;
+import one.jpro.platform.routing.Route;
+import one.jpro.platform.routing.RouteNode;
+import one.jpro.platform.routing.RouteUtils;
+import one.jpro.platform.routing.dev.DevFilter;
+import one.jpro.platform.routing.dev.StatisticsFilter;
+import one.jpro.platform.routing.sessionmanager.SessionManager;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -226,6 +227,7 @@ public Route createRoute() {
 
         if (Boolean.getBoolean("develop")) {
             route = route.filter(DevFilter.create());
+            route = route.filter(StatisticsFilter.create());
         }
 
         return route;

app/src/main/java/com/dlsc/jfxcentral2/app/TrayIconManager.java

@@ -9,7 +9,7 @@
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.stage.Stage;
-import one.jpro.routing.sessionmanager.SessionManager;
+import one.jpro.platform.routing.sessionmanager.SessionManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

app/src/main/java/com/dlsc/jfxcentral2/app/pages/ErrorPage.java

@@ -6,7 +6,7 @@
 import com.dlsc.jfxcentral2.model.Size;
 import javafx.beans.property.ObjectProperty;
 import javafx.scene.Node;
-import one.jpro.routing.Request;
+import one.jpro.platform.routing.Request;
 
 public class ErrorPage extends PageBase {
 

app/src/main/java/com/dlsc/jfxcentral2/app/pages/PageBase.java

@@ -18,7 +18,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.View;
+import one.jpro.platform.routing.View;
 
 import java.util.ArrayList;
 import java.util.Collections;

app/src/main/java/com/dlsc/jfxcentral2/app/pages/RefreshPage.java

@@ -22,7 +22,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.sessionmanager.SessionManager;
+import one.jpro.platform.routing.sessionmanager.SessionManager;
 import org.eclipse.jgit.lib.ProgressMonitor;
 
 public class RefreshPage extends PageBase {
@@ -47,16 +47,10 @@ public class RefreshPage extends PageBase {
     private Node updateView;
     private Node setupView;
 
-    private SessionManager sessionManager;
-
     public RefreshPage(ObjectProperty<Size> size) {
         super(size, Mode.DARK);
     }
 
-    public SessionManager getSessionManager() {
-        return sessionManager;
-    }
-
     @Override
     public String title() {
         return "JFXCentral Refresh";
@@ -78,7 +72,6 @@ public boolean fullscreen() {
 
     @Override
     public Node content() {
-        sessionManager = sessionManager();
         Platform.runLater(() -> {
             RepositoryManager.repositoryUpdatedProperty().addListener(weakInvalidationListener);
             invalidationListener.invalidated(null);

app/src/main/java/com/dlsc/jfxcentral2/app/pages/StartPage.java

@@ -58,6 +58,6 @@ public Node content() {
         videoGallery.sizeProperty().bind(sizeProperty());
         videoGallery.getVideos().setAll(randomSubList(DataRepository2.getInstance().getVideos(), 12));
 
-        return wrapContent(homePageTopView, weekLinksLiteView, websiteChangesView, videoGallery);
+        return wrapContent(homePageTopView/*, weekLinksLiteView*/, websiteChangesView, videoGallery);
     }
 }

app/src/main/java/com/dlsc/jfxcentral2/app/stage/CustomStage.java

@@ -26,7 +26,7 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.Window;
-import one.jpro.routing.sessionmanager.SessionManager;
+import one.jpro.platform.routing.sessionmanager.SessionManager;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.kordamp.ikonli.materialdesign.MaterialDesign;
 

app/src/main/java/com/dlsc/jfxcentral2/app/stage/NavigationView.java

@@ -11,8 +11,8 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
-import one.jpro.routing.HistoryEntry;
-import one.jpro.routing.sessionmanager.SessionManager;
+import one.jpro.platform.routing.HistoryEntry;
+import one.jpro.platform.routing.sessionmanager.SessionManager;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.kordamp.ikonli.material.Material;
 import org.kordamp.ikonli.materialdesign.MaterialDesign;

app/src/main/java/module-info.java

@@ -9,8 +9,8 @@
     requires fr.brouillard.oss.cssfx;
     requires com.dlsc.jfxcentral2.components;
     requires com.dlsc.jfxcentral2.devtools;
-    requires one.jpro.routing.core;
-    requires one.jpro.routing.dev;
+    requires one.jpro.platform.routing.core;
+    requires one.jpro.platform.routing.dev;
     requires com.dlsc.gemsfx;
     requires org.apache.logging.log4j;
     requires org.apache.logging.log4j.core;

components/pom.xml

@@ -109,17 +109,17 @@
             <artifactId>model</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sandec</groupId>
-            <artifactId>mdfx</artifactId>
+            <groupId>one.jpro.platform</groupId>
+            <artifactId>jpro-mdfx</artifactId>
         </dependency>
         <dependency>
             <groupId>fr.brouillard.oss</groupId>
             <artifactId>cssfx</artifactId>
         </dependency>
         <dependency>
-            <groupId>one.jpro</groupId>
+            <groupId>one.jpro.platform</groupId>
             <artifactId>jpro-routing-core</artifactId>
-            <version>${routing.version}</version>
+            <version>${jpro.platform.version}</version>
         </dependency>
 
         <!--    ** Icon pack dependencies START **  -->

components/src/main/java/com/dlsc/jfxcentral2/components/CopyrightView.java

@@ -4,7 +4,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 
 import java.time.Year;
 

components/src/main/java/com/dlsc/jfxcentral2/components/CreditsView.java

@@ -13,7 +13,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.kordamp.ikonli.javafx.FontIcon;

components/src/main/java/com/dlsc/jfxcentral2/components/CustomMarkdownView.java

@@ -9,12 +9,12 @@
 import javafx.scene.Node;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 
 import java.util.Objects;
 import java.util.function.Consumer;
 
-public class CustomMarkdownView extends com.sandec.mdfx.MarkdownView {
+public class CustomMarkdownView extends one.jpro.platform.mdfx.MarkdownView {
 
     public CustomMarkdownView() {
         getStyleClass().add("custom-markdown-view");

components/src/main/java/com/dlsc/jfxcentral2/components/DownloadsBox.java

@@ -9,7 +9,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.TilePane;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.antdesignicons.AntDesignIconsFilled;

components/src/main/java/com/dlsc/jfxcentral2/components/FeatureView.java

@@ -5,7 +5,7 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.Skin;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 
 public class FeatureView extends ControlBase {
 

components/src/main/java/com/dlsc/jfxcentral2/components/FooterView.java

@@ -17,7 +17,7 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.RowConstraints;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 
 public class FooterView extends PaneBase {
 

components/src/main/java/com/dlsc/jfxcentral2/components/OpenJFXProjectView.java

@@ -13,7 +13,7 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 
 public class OpenJFXProjectView extends PaneBase {
 

components/src/main/java/com/dlsc/jfxcentral2/components/QuickLinkView.java

@@ -6,7 +6,7 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.apache.commons.lang3.StringUtils;
 
 public class QuickLinkView extends ControlBase {

components/src/main/java/com/dlsc/jfxcentral2/components/SearchResultCell.java

@@ -24,7 +24,7 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.kordamp.ikonli.javafx.FontIcon;
 

components/src/main/java/com/dlsc/jfxcentral2/components/SocialLinksView.java

@@ -7,7 +7,7 @@
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.layout.FlowPane;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.kordamp.ikonli.coreui.CoreUiBrands;
 import org.kordamp.ikonli.javafx.FontIcon;

components/src/main/java/com/dlsc/jfxcentral2/components/TopMenuBar.java

@@ -39,9 +39,9 @@
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.util.StringConverter;
-import one.jpro.routing.LinkUtil;
-import one.jpro.routing.View;
-import one.jpro.routing.sessionmanager.SessionManager;
+import one.jpro.platform.routing.LinkUtil;
+import one.jpro.platform.routing.View;
+import one.jpro.platform.routing.sessionmanager.SessionManager;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.kordamp.ikonli.Ikon;

components/src/main/java/com/dlsc/jfxcentral2/components/VideoGalleryView.java

@@ -14,7 +14,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 
 public class VideoGalleryView extends PaneBase {
 

components/src/main/java/com/dlsc/jfxcentral2/components/WeekLinksLiteView.java

@@ -11,7 +11,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;

components/src/main/java/com/dlsc/jfxcentral2/components/WelcomeView.java

@@ -9,7 +9,7 @@
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.kordamp.ikonli.javafx.FontIcon;
 
 public class WelcomeView extends PaneBase {

components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/BlogsDetailsBox.java

@@ -7,7 +7,7 @@
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.util.Callback;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.kordamp.ikonli.javafx.FontIcon;
 
 import java.util.List;

components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/BooksDetailsBox.java

@@ -8,7 +8,7 @@
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.util.Callback;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Collections;

components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/DetailsBoxBase.java

@@ -41,7 +41,7 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.util.Callback;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.javafx.FontIcon;

components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/DownloadsDetailsBox.java

@@ -6,7 +6,7 @@
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.layout.Region;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.kordamp.ikonli.javafx.FontIcon;
 
 import java.util.List;

components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/LibraryCoordinatesBox.java

@@ -21,7 +21,7 @@
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.CopyUtil;
+import one.jpro.platform.routing.CopyUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.kordamp.ikonli.javafx.FontIcon;
 import org.kordamp.ikonli.materialdesign.MaterialDesign;

components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/LibraryEnsembleBox.java

@@ -9,7 +9,7 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.kordamp.ikonli.materialdesign.MaterialDesign;
 
 import java.net.URLEncoder;

components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/TutorialsDetailsBox.java

@@ -7,7 +7,7 @@
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.util.Callback;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.kordamp.ikonli.javafx.FontIcon;
 
 import java.util.List;

components/src/main/java/com/dlsc/jfxcentral2/components/detailsbox/VideosDetailsBox.java

@@ -5,7 +5,7 @@
 import com.dlsc.jfxcentral2.utils.VideoViewFactory;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
-import one.jpro.routing.LinkUtil;
+import one.jpro.platform.routing.LinkUtil;
 import org.kordamp.ikonli.javafx.FontIcon;
 
 import java.util.List;

components/src/main/java/com/dlsc/jfxcentral2/components/gridview/IkonDetailView.java

@@ -18,7 +18,7 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
-import one.jpro.routing.CopyUtil;
+import one.jpro.platform.routing.CopyUtil;
 import org.apache.batik.dom.GenericDOMImplementation;
 import org.apache.batik.svggen.SVGGraphics2D;
 import org.apache.logging.log4j.LogManager;