完善table界面

Author: ntestoc3

project.clj

@@ -15,7 +15,7 @@
                  [camel-snake-kebab "0.4.1"]
                  [org.clojure/tools.gitlibs "1.0.83"] ;; git download
                  [cheshire "5.10.0"] ;; json
-                 [ntestoc/seesaw "0.1.4"]
+                 [ntestoc/seesaw "0.1.5"]
                  [version-clj "0.1.2"]
                  [camel-snake-kebab "0.4.2"]
                  [me.raynes/fs "1.4.6"]         ;; fs utils

src/burp_clj/collaborator.clj

@@ -141,7 +141,9 @@
                                   (gui/invoke-later
                                    (table/add! tbl ia))
                                   (when callback
-                                    (callback ia))))
+                                    (try (callback ia)
+                                         (catch Exception e
+                                           (log/error "collaborator callback error:" e))))))
                               (catch Exception e
                                 (log/error "get collaborator interactions." e))))
         window-showing (atom true)

src/burp_clj/message_viewer.clj

@@ -149,7 +149,8 @@
        ^java.lang.Boolean has-focus
        ^java.lang.Integer row
        ^java.lang.Integer column]
-      (let [v (table/value-at tbl row)]
+      (let [v (->> (.convertRowIndexToModel tbl row)
+                   (table/value-at tbl))]
         ;; table中的cellrenderer是共用的同一个对象，
         ;;   因此每次都要根据不同的值来设置，否则后面会一直使用之前设置过的color
         (.setBackground this (if-some [bg (:background v)]

src/burp_clj/table_util.clj

@@ -1,7 +1,8 @@
 (ns burp-clj.table-util
   "table辅助函数"
   (:require [seesaw.table :as table]
-            [seesaw.core :as gui]))
+            [seesaw.core :as gui]
+            [taoensso.timbre :as log]))
 
 (defn- filter-table-by
   "返回[[row-index row-value]...]格式的序列"
@@ -19,32 +20,35 @@
   after 是否在查找的行之后插入，默认为false"
   ([tbl filter-pred value] (insert-by! tbl filter-pred value false))
   ([tbl filter-pred value after]
-   (->>  (filter-table-by tbl filter-pred)
-         (mapcat (fn [[idx v]]
-                   [(if after
-                      (inc idx)
-                      idx)
-                    value]))
-         (apply table/insert-at! tbl))))
+   (let [kvs (->> (filter-table-by tbl filter-pred)
+                  (mapcat (fn [[idx v]]
+                            [(if after
+                               (inc idx)
+                               idx)
+                             value])))]
+     (when-not (empty? kvs)
+       (apply table/insert-at! tbl kvs)))))
 
 (defn update-by!
   "根据条件查找并更新行
   filter-pred 过滤函数，参数为table row数据
   update-fn 更新函数，参数为table row数据
   "
   [tbl filter-pred update-fn]
-  (->> (filter-table-by tbl filter-pred)
-       (mapcat (fn [[idx v]]
-                 [idx (update-fn v)]))
-       (apply table/update-at! tbl)))
+  (let [kvs  (->> (filter-table-by tbl filter-pred)
+                  (mapcat (fn [[idx v]]
+                            [idx (update-fn v)])))]
+    (when-not (empty? kvs)
+      (apply table/update-at! tbl kvs))))
 
 (defn remove-by!
   "根据条件查找并删除行
   filter-pred 过滤函数，参数为table row数据
   "
   [tbl filter-pred]
-  (->> (filter-table-by tbl filter-pred)
-       (map first)
-       (apply table/remove-at! tbl)))
+  (let [ks  (->> (filter-table-by tbl filter-pred)
+                 (map first))]
+    (when-not (empty? ks)
+      (apply table/remove-at! tbl ks))))