diff options
Diffstat (limited to 'src/main/ui/gui')
-rw-r--r-- | src/main/ui/gui/IssueDialog.java | 4 | ||||
-rw-r--r-- | src/main/ui/gui/MainUI.java | 34 | ||||
-rw-r--r-- | src/main/ui/gui/RevokeDialog.java | 7 | ||||
-rw-r--r-- | src/main/ui/gui/TemplateEditDialog.java | 2 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/CertEditDialog.java | 6 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/CertTableModel.java | 3 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/LogTableModel.java | 2 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/QRPanel.java | 2 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/TemplateTableModel.java | 2 |
9 files changed, 62 insertions, 0 deletions
diff --git a/src/main/ui/gui/IssueDialog.java b/src/main/ui/gui/IssueDialog.java index 8dcd6a8..23312eb 100644 --- a/src/main/ui/gui/IssueDialog.java +++ b/src/main/ui/gui/IssueDialog.java @@ -1,5 +1,6 @@ package ui.gui; +import annotations.Assoc; import model.asn1.exceptions.ParseException; import model.ca.Template; import model.csr.CertificationRequest; @@ -19,6 +20,7 @@ public class IssueDialog extends CertEditDialog<Template> { /** * The list of templates. */ + @Assoc(lowerBond = 1) private final List<Template> templates; /** @@ -29,11 +31,13 @@ public class IssueDialog extends CertEditDialog<Template> { /** * Combo box to choose template. */ + @Assoc(partOf = true) private JComboBox<String> componentTemp; /** * The selected template, immutable. */ + @Assoc(partOf = true) private Template selectedTemplate; /** diff --git a/src/main/ui/gui/MainUI.java b/src/main/ui/gui/MainUI.java index 9fa65ef..9a7f3f2 100644 --- a/src/main/ui/gui/MainUI.java +++ b/src/main/ui/gui/MainUI.java @@ -1,5 +1,6 @@ package ui.gui; +import annotations.Assoc; import model.GroupObserver; import model.ObservedData; import model.Observer; @@ -67,75 +68,108 @@ public class MainUI extends JFrame { /** * The root panel (Box layout). */ + @Assoc(partOf = true) private final JPanel rootPanel = new JPanel(new BoxLayout(rootPane, BoxLayout.PAGE_AXIS)); /** * Common toolbar buttons */ + @Assoc(partOf = true) private final JButton buttonToolbarLoad = btn("Load", "open.png", this::onLoad); + @Assoc(partOf = true) private final JButton buttonToolbarSave = btn("Save", "saveall.png", this::onSave); /** * Toolbar that switches with the tab. */ + @Assoc(partOf = true) private final JPanel panelContextAwareToolbar = new JPanel(new CardLayout(0, 0)); /** * Tab root. */ + @Assoc(partOf = true) private final JTabbedPane tabbedPane = new JTabbedPane(); /** * CA tab */ + @Assoc(partOf = true) private final JLabel labelCACertificate = new JLabel(); + @Assoc(partOf = true) private final JLabel labelPrivateKey = new JLabel(); + @Assoc(partOf = true) private final JButton buttonGenPrivKey = btn("Generate", 'G', this::onGeneratePrivateKey); + @Assoc(partOf = true) private final JButton buttonInstallCA = btn("Install", 'I', this::onInstallCA); + @Assoc(partOf = true) private final JButton buttonGenCSR = btn("CSR", this::onSignCSR); + @Assoc(partOf = true) private final QRPanel panelQR = new QRPanel(256); + @Assoc(partOf = true) private final JToolBar toolbarCA = new JToolBar(); + @Assoc(partOf = true) private final JButton buttonCAToolbarCRL = btn("CRL", "publisher.png", this::onCRL); /** * Certs tab */ + @Assoc(partOf = true) private JPanel panelCertsTab; + @Assoc(partOf = true) private final JTable tableCerts = new JTable(); + @Assoc(partOf = true) private final CertTableModel modelCerts = new CertTableModel(); + @Assoc(partOf = true) private final JToolBar toolbarCerts = new JToolBar(); + @Assoc(partOf = true) private final JButton buttonCertsToolbarNew = btn("Sign", "new.png", this::onIssue); + @Assoc(partOf = true) private final JButton buttonCertsToolbarRevoke = btn("Revoke", "deletetest.png", this::onRevokeCert); + @Assoc(partOf = true) private final JButton buttonCertsToolbarExport = btn("Export", "export.png", this::onExportCert); /** * Templates tab */ + @Assoc(partOf = true) private JPanel panelTmpTab; + @Assoc(partOf = true) private final JTable tableTemplates = new JTable(); + @Assoc(partOf = true) private final TemplateTableModel modelTemplates = new TemplateTableModel(); + @Assoc(partOf = true) private final JToolBar toolbarTemplates = new JToolBar(); + @Assoc(partOf = true) private final JButton buttonTemplatesToolbarNew = btn("New", "new.png", this::onNewTemplate); + @Assoc(partOf = true) private final JButton buttonTemplatesToolbarEnable = btn("Enable", "enable.png", this::onEnableTemplate); + @Assoc(partOf = true) private final JButton buttonTemplatesToolbarDisable = btn("Disable", "disable.png", this::onDisableTemplate); + @Assoc(partOf = true) private final JButton buttonTemplatesToolbarDelete = btn("Delete", "deletetest.png", this::onDeleteTemplate); /** * Logs region */ + @Assoc(partOf = true) private final JPanel panelLogs; + @Assoc(partOf = true) private final JTable tableAuditLogs = new JTable(); + @Assoc(partOf = true) private final LogTableModel modelAuditLogs = new LogTableModel(); /** * Status region */ + @Assoc(partOf = true) private final JLabel labelStatus = new JLabel(); private ObservedData<Boolean> unsaved = new ObservedData<>(false, this::acceptUnsaved); /** * CA and observers */ + @Assoc(partOf = true) private CertificationAuthority ca; private final GroupObserver obs = new GroupObserver(); diff --git a/src/main/ui/gui/RevokeDialog.java b/src/main/ui/gui/RevokeDialog.java index 9cebc74..19c7f1b 100644 --- a/src/main/ui/gui/RevokeDialog.java +++ b/src/main/ui/gui/RevokeDialog.java @@ -1,5 +1,6 @@ package ui.gui; +import annotations.Assoc; import model.asn1.ASN1Object; import model.asn1.UtcTime; import model.pki.cert.Certificate; @@ -54,31 +55,37 @@ public class RevokeDialog extends JDialog { /** * Root pane */ + @Assoc(partOf = true) private JPanel contentPane; /** * OK button */ + @Assoc(partOf = true) private JButton buttonOK; /** * Cancel button */ + @Assoc(partOf = true) private JButton buttonCancel; /** * Reason */ + @Assoc(partOf = true) private JComboBox<String> comboBoxReason; /** * Subject (not editable) */ + @Assoc(partOf = true) private JTextField textFieldSubject; /** * Time */ + @Assoc(partOf = true) private JFormattedTextField formattedTextFieldTime; /** diff --git a/src/main/ui/gui/TemplateEditDialog.java b/src/main/ui/gui/TemplateEditDialog.java index 557d207..9037956 100644 --- a/src/main/ui/gui/TemplateEditDialog.java +++ b/src/main/ui/gui/TemplateEditDialog.java @@ -1,5 +1,6 @@ package ui.gui; +import annotations.Assoc; import model.asn1.exceptions.ParseException; import model.ca.Template; import model.x501.Name; @@ -23,6 +24,7 @@ public class TemplateEditDialog extends CertEditDialog<Template> { /** * Text field for name. */ + @Assoc(partOf = true) private JTextField templateComponent; /** diff --git a/src/main/ui/gui/widgets/CertEditDialog.java b/src/main/ui/gui/widgets/CertEditDialog.java index 6c440a3..a928053 100644 --- a/src/main/ui/gui/widgets/CertEditDialog.java +++ b/src/main/ui/gui/widgets/CertEditDialog.java @@ -1,5 +1,7 @@ package ui.gui.widgets; +import annotations.Assoc; + import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; @@ -32,9 +34,13 @@ public abstract class CertEditDialog<T> extends JDialog { /** * Root pane. */ + @Assoc(partOf = true) protected JPanel contentPane = new JPanel(); + @Assoc(partOf = true) protected JButton buttonOK = UIUtils.btn("", this::onOK); + @Assoc(partOf = true) protected JTextField textFieldSubject = new JTextField(); + @Assoc(partOf = true) protected JSpinner spinnerValidity = new JSpinner(new SpinnerNumberModel(60, 1, null, 0)); diff --git a/src/main/ui/gui/widgets/CertTableModel.java b/src/main/ui/gui/widgets/CertTableModel.java index f10d621..aa3f808 100644 --- a/src/main/ui/gui/widgets/CertTableModel.java +++ b/src/main/ui/gui/widgets/CertTableModel.java @@ -1,5 +1,6 @@ package ui.gui.widgets; +import annotations.Assoc; import model.ca.CertificationAuthority; import model.pki.cert.Certificate; import model.pki.crl.RevokedCertificate; @@ -39,11 +40,13 @@ public class CertTableModel extends AbstractTableModel { /** * Pointer to {@link CertificationAuthority#getSigned()} */ + @Assoc(lowerBond = 0) private List<Certificate> ptrData; /** * Pointer to {@link CertificationAuthority#getRevoked()} */ + @Assoc(lowerBond = 0) private List<RevokedCertificate> ptrRevokedData; /** diff --git a/src/main/ui/gui/widgets/LogTableModel.java b/src/main/ui/gui/widgets/LogTableModel.java index a7b52ac..2f91dd0 100644 --- a/src/main/ui/gui/widgets/LogTableModel.java +++ b/src/main/ui/gui/widgets/LogTableModel.java @@ -1,5 +1,6 @@ package ui.gui.widgets; +import annotations.Assoc; import model.ca.AuditLogEntry; import model.ca.CertificationAuthority; @@ -23,6 +24,7 @@ public class LogTableModel extends AbstractTableModel { /** * Pointer to the {@link CertificationAuthority#getLogs()}. */ + @Assoc(lowerBond = 0) private List<AuditLogEntry> ptrData; /** diff --git a/src/main/ui/gui/widgets/QRPanel.java b/src/main/ui/gui/widgets/QRPanel.java index ebd70af..334f921 100644 --- a/src/main/ui/gui/widgets/QRPanel.java +++ b/src/main/ui/gui/widgets/QRPanel.java @@ -1,5 +1,6 @@ package ui.gui.widgets; +import annotations.Assoc; import com.google.zxing.BarcodeFormat; import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; @@ -18,6 +19,7 @@ import static com.google.zxing.qrcode.decoder.ErrorCorrectionLevel.L; public class QRPanel extends JPanel { private final int size; + @Assoc(partOf = true, lowerBond = 0) private BitMatrix data; /** diff --git a/src/main/ui/gui/widgets/TemplateTableModel.java b/src/main/ui/gui/widgets/TemplateTableModel.java index de23b54..93e9bcf 100644 --- a/src/main/ui/gui/widgets/TemplateTableModel.java +++ b/src/main/ui/gui/widgets/TemplateTableModel.java @@ -1,5 +1,6 @@ package ui.gui.widgets; +import annotations.Assoc; import model.ca.CertificationAuthority; import model.ca.Template; @@ -36,6 +37,7 @@ public class TemplateTableModel extends AbstractTableModel { /** * Pointer to the {@link CertificationAuthority#getTemplates()}. */ + @Assoc(lowerBond = 0) private List<Template> ptrData; /** |