Merge branch 'live' into feature/#380

dlsc-software-consulting-gmbh · Nov 20, 2024 · c918394 · c918394
2 parents db2db34 + 66d3777
commit c918394
Show file tree

Hide file tree

Showing 7 changed files with 306 additions and 1,473 deletions.
diff --git a/src/main/java/com/dlsc/jfxcentral/data/DataRepository.java b/src/main/java/com/dlsc/jfxcentral/data/DataRepository.java
diff --git a/src/main/java/com/dlsc/jfxcentral/data/DataRepository2.java b/src/main/java/com/dlsc/jfxcentral/data/DataRepository2.java
diff --git a/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java b/src/main/java/com/dlsc/jfxcentral/data/ImageManager.java
@@ -321,7 +321,7 @@ private ObjectProperty<Image> remoteImageProperty(String imageUrl, String append
 
                 connection.connect();
 
-                Image image = new Image(url.toExternalForm(), !DataRepository.testing);
+                Image image = new Image(url.toExternalForm(), !DataRepository.isTesting());
                 image.progressProperty().addListener(it -> {
                     // exception = 404 -> no image found for given URL
                     if (image.getProgress() == 1 && image.getException() == null) {
@@ -332,7 +332,7 @@ private ObjectProperty<Image> remoteImageProperty(String imageUrl, String append
                 image.exceptionProperty().addListener(it -> image.getException().printStackTrace());
 
                 // when running unit tests we set the loaded image immediately
-                if (DataRepository.testing) {
+                if (DataRepository.isTesting()) {
                     property.set(image);
                 }
             } catch (Exception e) {

diff --git a/src/main/java/com/dlsc/jfxcentral/data/RSSManager.java b/src/main/java/com/dlsc/jfxcentral/data/RSSManager.java
@@ -23,7 +23,7 @@ public class RSSManager {
     private static final Logger LOG = Logger.getLogger(RSSManager.class.getName());
 
     public static String createRSS() {
-        DataRepository2 repository = DataRepository2.getInstance();
+        DataRepository repository = DataRepository.getInstance();
         List<LinksOfTheWeek> links = repository.getLinksOfTheWeek();
 
         // Based on the example provided on
@@ -62,7 +62,7 @@ public static String createRSS() {
         return "";
     }
 
-    private static String getLinksOfTheWeekAsHtml(DataRepository2 repository, LinksOfTheWeek linksOfTheWeek) {
+    private static String getLinksOfTheWeekAsHtml(DataRepository repository, LinksOfTheWeek linksOfTheWeek) {
         StringProperty markdownContent = new SimpleStringProperty();
         repository.loadLinksOfTheWeekText(linksOfTheWeek, markdownContent);