pre-select the current feed group in the FeedConfig dialog

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 9aaed185652bf80ea7591fdee4a435387ca0d85e..ee91abea91bd3a4be6884fc92c77ad4eade07bae 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
@@ -150,7 +150,7 @@ object Database {
                     }
 
                     if(feedId != null && feedName != null) {
-                        val feed = Feed(feedId, feedName, feedUrl)
+                        val feed = Feed(feedId, groupId, feedName, feedUrl)
                         feed.user = auth_user
                         feed.password = auth_password
                         feed.updateInterval = updateInterval
@@ -269,7 +269,7 @@ object Database {
                 }
             }
 
-            feed = Feed(feedId, name, uri)
+            feed = Feed(feedId, parent.id, name, uri)
             parent.feeds.add(feed)
         }
 
@@ -353,13 +353,14 @@ object Database {
                 stmt.executeQuery().use { rs ->
                     while(rs.next()) {
                         val id = rs.getInt("feed_id")
+                        val group = rs.getInt("group_id")
                         val name = rs.getString("name")
                         val url = rs.getString("url")
                         val maxItemAge = rs.getInt("max_item_age")
                         val authUser = rs.getString("auth_user")
                         val authPassword = rs.getString("auth_password")
                         val certPath = rs.getString("certpath")
-                        val feed = Feed(id, name, url)
+                        val feed = Feed(id, group, name, url)
                         feed.maxItemAge = maxItemAge
                         feed.user = authUser
                         feed.password = authPassword
@@ -384,13 +385,14 @@ object Database {
                 stmt.executeQuery().use { rs ->
                     while(rs.next()) {
                         val id = rs.getInt("feed_id")
+                        val group = rs.getInt("group_id")
                         val name = rs.getString("name")
                         val url = rs.getString("url")
                         val maxItemAge = rs.getInt("max_item_age")
                         val authUser = rs.getString("auth_user")
                         val authPassword = rs.getString("auth_password")
                         val certPath = rs.getString("certpath")
-                        feed = Feed(id, name, url)
+                        feed = Feed(id, group, name, url)
                         feed.maxItemAge = maxItemAge
                         feed.user = authUser
                         feed.password = authPassword
@@ -422,7 +424,7 @@ object Database {
                         val authUser = rs.getString("auth_user")
                         val authPassword = rs.getString("auth_password")
                         val certPath = rs.getString("certpath")
-                        val feed = Feed(id, name, url)
+                        val feed = Feed(id, group.id, name, url)
                         feed.user = authUser
                         feed.password = authPassword
                         feed.certpath = certPath
@@ -483,12 +485,13 @@ object Database {
                 stmt.executeQuery().use { rs ->
                     while(rs.next()) {
                         val id = rs.getInt("feed_id")
+                        val group = rs.getInt("group_id")
                         val name = rs.getString("name")
                         val url = rs.getString("url")
                         val authUser = rs.getString("auth_user")
                         val authPassword = rs.getString("auth_password")
                         val certPath = rs.getString("certpath")
-                        val feed = Feed(id, name, url)
+                        val feed = Feed(id, group, name, url)
                         feed.user = authUser
                         feed.password = authPassword
                         feed.certpath = certPath

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/Feed.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/Feed.kt
index 0162103da3e23efbfab34c46075eea66c31ecaf2..10fddfbb28f68bc07bf6794e77898b8913d336d3 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/Feed.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/Feed.kt
@@ -3,8 +3,9 @@ package de.unixwork.rssreader
 import java.time.Instant
 
 
-class Feed(id: Int, name: String, uri: String) {
+class Feed(id: Int, groupId: Int?, name: String, uri: String) {
     val id = id
+    val groupId = groupId
     var name = name
     var uri = uri
     var user: String? = null

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedConfig.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedConfig.kt
index 37865c810fba388c19087c4b265883b8dc30fb2e..d6d233823c5a2fd900b4be36dec8d5d7857861b5 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedConfig.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedConfig.kt
@@ -160,6 +160,7 @@ class FeedConfig(obj: UiObject) {
 
     private fun initUI(feed: Feed) {
         name.setString(feed.name)
+        groups.selectedIndex = groups.indexOfFirst { it.id == feed.groupId }
         readstatus.selectedIndex = feed.itemStateMode
         when(feed.maxItemAge) {
             0 -> autoDeleteOptions.selectedIndex = 0

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
index 194fe1f015fc17ff0d997a8b1fb2b037f0788637..8c727d34f41e93a863b65d48fc1a4b2d74383ebf 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/FeedList.kt
@@ -116,7 +116,7 @@ class FeedList(window: MainWindow) : Document() {
             }
         }
 
-        val collection = Feed(group.id, "", "")
+        val collection = Feed(group.id, null, "", "")
         collection.isGroup = true
 
         showFeed = collection