From 149568520fabde723e7e9c058107e9d99d048def Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Mon, 4 Nov 2019 19:05:53 +0000
Subject: [PATCH] register necessary event, initialize mvc group, correct name
 representation

---
 .../main/groovy/com/muwire/core/Core.groovy   |  2 ++
 .../muwire/gui/FetchCertificatesView.groovy   | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/core/src/main/groovy/com/muwire/core/Core.groovy b/core/src/main/groovy/com/muwire/core/Core.groovy
index 5cbfc1e6..dee33cf7 100644
--- a/core/src/main/groovy/com/muwire/core/Core.groovy
+++ b/core/src/main/groovy/com/muwire/core/Core.groovy
@@ -22,6 +22,7 @@ import com.muwire.core.filecert.CertificateClient
 import com.muwire.core.filecert.CertificateManager
 import com.muwire.core.filecert.UICreateCertificateEvent
 import com.muwire.core.filecert.UIFetchCertificatesEvent
+import com.muwire.core.filecert.UIImportCertificateEvent
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHashedEvent
 import com.muwire.core.files.FileHashingEvent
@@ -217,6 +218,7 @@ public class Core {
         log.info("initializing certificate manager")
         certificateManager = new CertificateManager(eventBus, home, me, spk)
         eventBus.register(UICreateCertificateEvent.class, certificateManager)
+        eventBus.register(UIImportCertificateEvent.class, certificateManager)
         
         
         log.info("initializing trust service")
diff --git a/gui/griffon-app/views/com/muwire/gui/FetchCertificatesView.groovy b/gui/griffon-app/views/com/muwire/gui/FetchCertificatesView.groovy
index 848423b9..be661081 100644
--- a/gui/griffon-app/views/com/muwire/gui/FetchCertificatesView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/FetchCertificatesView.groovy
@@ -15,6 +15,8 @@ import com.muwire.core.filecert.Certificate
 import java.awt.BorderLayout
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
+import java.awt.event.WindowAdapter
+import java.awt.event.WindowEvent
 
 import javax.annotation.Nonnull
 
@@ -50,7 +52,7 @@ class FetchCertificatesView {
                 certsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
                     tableModel(list : model.certificates) {
                         closureColumn(header : "Issuer", preferredWidth : 200, type : String, read : {it.issuer.getHumanReadableName()})
-                        closureColumn(header : "Name", preferredWidth : 200, type: String, read : {it.name.toString()})
+                        closureColumn(header : "Name", preferredWidth : 200, type: String, read : {it.name.name.toString()})
                         closureColumn(header : "Issued", preferredWidth : 100, type : String, read : {
                             def date = new Date(it.timestamp)
                             date.toString()
@@ -111,4 +113,19 @@ class FetchCertificatesView {
         rv
     }
     
+    void mvcGroupInit(Map<String,String> args) {
+        controller.register()
+        
+        dialog.getContentPane().add(p)
+        dialog.setSize(700, 400)
+        dialog.setLocationRelativeTo(mainFrame)
+        dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE)
+        dialog.addWindowListener( new WindowAdapter() {
+            public void windowClosed(WindowEvent e) {
+                mvcGroup.destroy()
+            }
+        })
+        dialog.show()
+    }
+    
 }
\ No newline at end of file