idk/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

register necessary event, initialize mvc group, correct name representation

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-11-04 19:05:53 +00:00
parent c672880db0
commit 149568520f
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/groovy/com/muwire/core/Core.groovy
View File

@@ -22,6 +22,7 @@ import com.muwire.core.filecert.CertificateClient
import com.muwire.core.filecert.CertificateManager import com.muwire.core.filecert.CertificateManager
import com.muwire.core.filecert.UICreateCertificateEvent import com.muwire.core.filecert.UICreateCertificateEvent
import com.muwire.core.filecert.UIFetchCertificatesEvent import com.muwire.core.filecert.UIFetchCertificatesEvent
import com.muwire.core.filecert.UIImportCertificateEvent
import com.muwire.core.files.FileDownloadedEvent import com.muwire.core.files.FileDownloadedEvent
import com.muwire.core.files.FileHashedEvent import com.muwire.core.files.FileHashedEvent
import com.muwire.core.files.FileHashingEvent import com.muwire.core.files.FileHashingEvent
@@ -217,6 +218,7 @@ public class Core {
log.info("initializing certificate manager") log.info("initializing certificate manager")
certificateManager = new CertificateManager(eventBus, home, me, spk) certificateManager = new CertificateManager(eventBus, home, me, spk)
eventBus.register(UICreateCertificateEvent.class, certificateManager) eventBus.register(UICreateCertificateEvent.class, certificateManager)
eventBus.register(UIImportCertificateEvent.class, certificateManager)
log.info("initializing trust service") log.info("initializing trust service")

19
gui/griffon-app/views/com/muwire/gui/FetchCertificatesView.groovy
View File

@@ -15,6 +15,8 @@ import com.muwire.core.filecert.Certificate
import java.awt.BorderLayout import java.awt.BorderLayout
import java.awt.event.MouseAdapter import java.awt.event.MouseAdapter
import java.awt.event.MouseEvent import java.awt.event.MouseEvent
import java.awt.event.WindowAdapter
import java.awt.event.WindowEvent
import javax.annotation.Nonnull import javax.annotation.Nonnull
@@ -50,7 +52,7 @@ class FetchCertificatesView {
certsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) { certsTable = table(autoCreateRowSorter : true, rowHeight : rowHeight) {
tableModel(list : model.certificates) { tableModel(list : model.certificates) {
closureColumn(header : "Issuer", preferredWidth : 200, type : String, read : {it.issuer.getHumanReadableName()}) 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 : { closureColumn(header : "Issued", preferredWidth : 100, type : String, read : {
def date = new Date(it.timestamp) def date = new Date(it.timestamp)
date.toString() date.toString()
@@ -111,4 +113,19 @@ class FetchCertificatesView {
rv 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()
}
} }