nostr/more-speech
1
0
Fork 0
mirror of https://github.com/unclebob/more-speech.git synced 2024-09-30 10:30:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect against an exception if a node is orphaned by pruning.

Browse Source
This commit is contained in:
Robert C. Martin 2023-03-27 15:21:28 -05:00
parent 733ab3b8ba
commit 1028628684
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec/more_speech/ui/swing/tabs_spec.clj
View File

@ -10,8 +10,7 @@
[more-speech.ui.swing.util :refer :all]
[more-speech.ui.swing.util :as swing-util]
[speclj.core :refer :all])
(:use (seesaw [core] [font] [tree])
(seesaw [core] [tree]))
(:use (seesaw [core] [font] [tree]))
(:import (javax.swing.tree DefaultMutableTreeNode DefaultTreeModel)))
(declare db)

15
src/more_speech/ui/swing/article_tree.clj
View File

@ -1,10 +1,10 @@
(ns more-speech.ui.swing.article-tree
(:require
[more-speech.ui.swing.article-tree-util :refer :all]
[more-speech.nostr.events :as events]
[more-speech.mem :refer :all]
[more-speech.nostr.events :as events]
[more-speech.ui.swing.article-tree-util :refer :all]
[more-speech.ui.swing.tabs :as tabs])
(:use [seesaw core font tree color])
(:use (seesaw [color] [core] [font] [tree]))
(:import (javax.swing.tree DefaultMutableTreeNode)))
(defn add-orphaned-reference [referent id]
@ -63,7 +63,9 @@
(defn build-orphan-node [orphan-id]
(let [node-map (get-mem :node-map)
orphan-nodes (get node-map orphan-id)]
(copy-node (first orphan-nodes))))
(if (empty? orphan-nodes)
nil
(copy-node (first orphan-nodes)))))
(defn resolve-any-orphans [parent-id]
(let [parent-nodes (get-mem [:node-map parent-id])
@ -77,8 +79,9 @@
(let [orphan-id (first orphan-set)]
(doseq [parent-node parent-nodes]
(let [orphan-node (build-orphan-node orphan-id)]
(.add ^DefaultMutableTreeNode parent-node orphan-node)
(update-mem [:node-map orphan-id] conj orphan-node)))
(when (some? orphan-node)
(.add ^DefaultMutableTreeNode parent-node orphan-node)
(update-mem [:node-map orphan-id] conj orphan-node))))
(recur (rest orphan-set)))))
(set-mem [:orphaned-references parent-id] #{})))))