Merge remote-tracking branch 'origin/develop' into develop

dlsc-software-consulting-gmbh · Oct 28, 2024 · a6a8a47 · a6a8a47
2 parents 0cfb461 + 91c85b7
commit a6a8a47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -18,7 +18,9 @@
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <gluonfx.plugin.version>1.0.22</gluonfx.plugin.version>
         <javafx.plugin.version>0.0.8</javafx.plugin.version>
-        <mainClassName>com.dlsc.jfxcentral2.app.JFXCentral2MobileApp</mainClassName>
+        <mainClassName>com.dlsc.jfxcentral2.app.JFXCentral2App</mainClassName>
+        <mainClassName.jpro>com.dlsc.jfxcentral2.app.JFXCentral2App</mainClassName.jpro>
+        <mainClassName.mobile>com.dlsc.jfxcentral2.app.JFXCentral2MobileApp</mainClassName.mobile>
         <app.description>JFXCentral for anything JavaFX</app.description>
         <package.type/>
         <mac.app.store/>
@@ -455,7 +457,7 @@
                         <list>browser</list>
                         <list>video</list>
                     </attachList>
-                    <mainClass>${mainClassName}</mainClass>
+                    <mainClass>${mainClassName.mobile}</mainClass>
                     <releaseConfiguration>
                         <vendor>Gluon</vendor>
                         <description>${app.description}</description>
@@ -486,7 +488,7 @@
                 <artifactId>jpro-maven-plugin</artifactId>
                 <version>${jpro.version}</version>
                 <configuration>
-                    <mainClassName>${mainClassName}</mainClassName>
+                    <mainClassName>${mainClassName.jpro}</mainClassName>
                     <releaseName>jfxcentral</releaseName>
                     <localJVMArgs>-Ddevelop=false</localJVMArgs>
                     <port>8088</port>

diff --git a/components/src/main/java/com/dlsc/jfxcentral2/utils/QuickLinksGenerator.java b/components/src/main/java/com/dlsc/jfxcentral2/utils/QuickLinksGenerator.java
@@ -43,7 +43,7 @@ public static List<QuickLink> generateQuickLinks(Size size) {
     private static List<QuickLink> createQuickLinks(int count) {
         List<QuickLink> list = new ArrayList<>();
         List<ModelObject> dataList = createShuffledSublist(count);
-        for (int i = 0; i < count; i++) {
+        for (int i = 0; i < dataList.size(); i++) {
             ModelObject mo = dataList.get(i);
             list.add(new NormalQuickLink(getCategoryName(mo), mo.getName(), IkonUtil.getModelIkon(mo), PageUtil.getLink(mo)));
         }
@@ -174,7 +174,7 @@ private static List<ModelObject> createShuffledSublist(int size) {
 
         Collections.shuffle(allModelObjects);
 
-        return allModelObjects.subList(0, size);
+        return allModelObjects.subList(0, Math.min(allModelObjects.size(), size));
     }
 
     public static List<QuickLink> generateWebsiteChangesQuickLinks(ObjectProperty<Size> sizeProperty) {