simplify FeedSourceList and add UiSourceList update method

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
index 8f10f42a15cfb589ce2407c116e6463f18a506c8..79a0d06fe90b0ab85fb85d13c2e431a9fed34890 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
@@ -177,7 +177,6 @@ object Database {
             }
         }
         parent.feeds.add(feedCol)
-        parent.feeds.update()
         return feedCol
     }
 }

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedSourceList.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedSourceList.kt
index 1d21ba4559fc6f94e8ee4cf0c36982f727c02754..e19d2918dd266690f2f6099f130a46a002d943f1 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedSourceList.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedSourceList.kt
@@ -14,11 +14,7 @@ class FeedSourceList : Document() {
         groups.forEach {
             val sublist = SubList<FeedCollection>()
             sublist.header = it.name
-            val feedlist = list<FeedCollection>()
-            it.feeds.forEach { fc ->
-                feedlist.add(fc)
-            }
-            sublist.value = feedlist
+            sublist.value = it.feeds
             feeds.add(sublist)
         }
     }

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt
index 9686222b8483c73c18e237e730df1087277f2fdd..5a2fe388e44ce51dfc5fec305aeae1ef75e4eed2 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt
@@ -74,7 +74,7 @@ class MainWindow {
                     println("groupSel: ${groups?.selectedIndex}, feedName: $feedName, urlStr: $urlStr")
                     parent?.let {
                         val feedCol = Database.newFeeds(it, feedName, uris, user.toString(), password.toString(), cert.toString())
-                        parent.feeds.add(feedCol)
+                        parent.feeds.update()
                     }
                 }
                 ev.`object`.close()

diff --git a/ui-java/src/main/java/de/unixwork/ui/UiSourceList.java b/ui-java/src/main/java/de/unixwork/ui/UiSourceList.java
index 69218a8b6859dd482fa672b62ed5b1328b90d87b..a5cf117fcd7703146d5e7640e6008e578e632fd7 100644 (file)
--- a/ui-java/src/main/java/de/unixwork/ui/UiSourceList.java
+++ b/ui-java/src/main/java/de/unixwork/ui/UiSourceList.java
@@ -50,6 +50,15 @@ public class UiSourceList {
         }
     }
 
+    public void update() {
+        ListFuncs ui = ListFuncs.getInstance();
+        try {
+            ui.list_update_row.invoke(valuePtr, -1);
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public void remove(int index) {
         ListFuncs ui = ListFuncs.getInstance();
         try {