diff options
author | Yuuta Liang <yuutaw@student.cs.ubc.ca> | 2023-11-28 18:19:39 -0800 |
---|---|---|
committer | Yuuta Liang <yuutaw@student.cs.ubc.ca> | 2023-11-28 18:19:39 -0800 |
commit | 1073af21305360bd33903c533cdac57e9f936294 (patch) | |
tree | 2c2d9c343ffe2577286fb53e016f06f6cdc53cbf /src/main/ui | |
parent | e13adbb9a9146dd5ece890449e3cad958a502f86 (diff) | |
download | jca-1073af21305360bd33903c533cdac57e9f936294.tar jca-1073af21305360bd33903c533cdac57e9f936294.tar.gz jca-1073af21305360bd33903c533cdac57e9f936294.tar.bz2 jca-1073af21305360bd33903c533cdac57e9f936294.zip |
Move TUI and GUI into separate packages
Signed-off-by: Yuuta Liang <yuutaw@student.cs.ubc.ca>
Diffstat (limited to 'src/main/ui')
-rw-r--r-- | src/main/ui/Main.java | 2 | ||||
-rw-r--r-- | src/main/ui/gui/IssueDialog.java (renamed from src/main/ui/IssueDialog.java) | 6 | ||||
-rw-r--r-- | src/main/ui/gui/MainUI.java (renamed from src/main/ui/MainUI.java) | 7 | ||||
-rw-r--r-- | src/main/ui/gui/RevokeDialog.java (renamed from src/main/ui/RevokeDialog.java) | 8 | ||||
-rw-r--r-- | src/main/ui/gui/TemplateEditDialog.java (renamed from src/main/ui/TemplateEditDialog.java) | 6 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/CertEditDialog.java (renamed from src/main/ui/widgets/CertEditDialog.java) | 8 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/CertTableModel.java (renamed from src/main/ui/widgets/CertTableModel.java) | 2 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/GCBuilder.java (renamed from src/main/ui/widgets/GCBuilder.java) | 2 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/LogTableModel.java (renamed from src/main/ui/widgets/LogTableModel.java) | 2 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/QRPanel.java (renamed from src/main/ui/widgets/QRPanel.java) | 2 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/TemplateTableModel.java (renamed from src/main/ui/widgets/TemplateTableModel.java) | 2 | ||||
-rw-r--r-- | src/main/ui/gui/widgets/UIUtils.java (renamed from src/main/ui/widgets/UIUtils.java) | 2 | ||||
-rw-r--r-- | src/main/ui/tui/IssueScreen.java (renamed from src/main/ui/IssueScreen.java) | 3 | ||||
-rw-r--r-- | src/main/ui/tui/JCA.java (renamed from src/main/ui/JCA.java) | 3 | ||||
-rw-r--r-- | src/main/ui/tui/MainScreen.java (renamed from src/main/ui/MainScreen.java) | 3 | ||||
-rw-r--r-- | src/main/ui/tui/MgmtScreen.java (renamed from src/main/ui/MgmtScreen.java) | 3 | ||||
-rw-r--r-- | src/main/ui/tui/Screen.java (renamed from src/main/ui/Screen.java) | 2 | ||||
-rw-r--r-- | src/main/ui/tui/TemplateSetScreen.java (renamed from src/main/ui/TemplateSetScreen.java) | 2 | ||||
-rw-r--r-- | src/main/ui/tui/TemplatesScreen.java (renamed from src/main/ui/TemplatesScreen.java) | 2 | ||||
-rw-r--r-- | src/main/ui/tui/UIHandler.java (renamed from src/main/ui/UIHandler.java) | 2 |
20 files changed, 38 insertions, 31 deletions
diff --git a/src/main/ui/Main.java b/src/main/ui/Main.java index 4dbcea1..918a06c 100644 --- a/src/main/ui/Main.java +++ b/src/main/ui/Main.java @@ -2,6 +2,8 @@ package ui; import com.formdev.flatlaf.FlatIntelliJLaf; import model.EventLog; +import ui.gui.MainUI; +import ui.tui.JCA; import javax.swing.*; import java.awt.event.WindowAdapter; diff --git a/src/main/ui/IssueDialog.java b/src/main/ui/gui/IssueDialog.java index c757d8f..8dcd6a8 100644 --- a/src/main/ui/IssueDialog.java +++ b/src/main/ui/gui/IssueDialog.java @@ -1,16 +1,16 @@ -package ui; +package ui.gui; import model.asn1.exceptions.ParseException; import model.ca.Template; import model.csr.CertificationRequest; import model.x501.Name; -import ui.widgets.CertEditDialog; +import ui.gui.widgets.CertEditDialog; import javax.swing.*; import java.awt.event.ActionEvent; import java.util.List; -import static ui.widgets.UIUtils.alert; +import static ui.gui.widgets.UIUtils.alert; /** * Dialog that allows user to choose a template and edit the incoming CSR properties to get it signed. diff --git a/src/main/ui/MainUI.java b/src/main/ui/gui/MainUI.java index 34cc224..9fa65ef 100644 --- a/src/main/ui/MainUI.java +++ b/src/main/ui/gui/MainUI.java @@ -1,4 +1,4 @@ -package ui; +package ui.gui; import model.GroupObserver; import model.ObservedData; @@ -16,7 +16,8 @@ import model.pki.crl.CertificateList; import model.pki.crl.RevokedCertificate; import persistence.Decoder; import persistence.FS; -import ui.widgets.*; +import ui.Utils; +import ui.gui.widgets.*; import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -33,7 +34,7 @@ import java.security.SignatureException; import java.security.interfaces.RSAPublicKey; import static java.awt.GridBagConstraints.*; -import static ui.widgets.UIUtils.*; +import static ui.gui.widgets.UIUtils.*; /** * The main GUI. diff --git a/src/main/ui/RevokeDialog.java b/src/main/ui/gui/RevokeDialog.java index ad0d4be..9cebc74 100644 --- a/src/main/ui/RevokeDialog.java +++ b/src/main/ui/gui/RevokeDialog.java @@ -1,12 +1,12 @@ -package ui; +package ui.gui; import model.asn1.ASN1Object; import model.asn1.UtcTime; import model.pki.cert.Certificate; import model.pki.crl.Reason; import model.pki.crl.RevokedCertificate; -import ui.widgets.GCBuilder; -import ui.widgets.UIUtils; +import ui.gui.widgets.GCBuilder; +import ui.gui.widgets.UIUtils; import javax.swing.*; import java.awt.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import static java.awt.GridBagConstraints.HORIZONTAL; import static java.awt.GridBagConstraints.WEST; -import static ui.widgets.UIUtils.alert; +import static ui.gui.widgets.UIUtils.alert; /** * A dialog that presents user with cert info, revocation reason, and revocation time. diff --git a/src/main/ui/TemplateEditDialog.java b/src/main/ui/gui/TemplateEditDialog.java index a3986de..557d207 100644 --- a/src/main/ui/TemplateEditDialog.java +++ b/src/main/ui/gui/TemplateEditDialog.java @@ -1,15 +1,15 @@ -package ui; +package ui.gui; import model.asn1.exceptions.ParseException; import model.ca.Template; import model.x501.Name; -import ui.widgets.CertEditDialog; +import ui.gui.widgets.CertEditDialog; import javax.swing.*; import java.awt.event.ActionEvent; import java.util.function.Function; -import static ui.widgets.UIUtils.alert; +import static ui.gui.widgets.UIUtils.alert; /** * A dialog that allows users to input template name, subject, and validity. diff --git a/src/main/ui/widgets/CertEditDialog.java b/src/main/ui/gui/widgets/CertEditDialog.java index bad5a4f..6c440a3 100644 --- a/src/main/ui/widgets/CertEditDialog.java +++ b/src/main/ui/gui/widgets/CertEditDialog.java @@ -1,4 +1,4 @@ -package ui.widgets; +package ui.gui.widgets; import javax.swing.*; import java.awt.*; @@ -9,7 +9,7 @@ import java.awt.event.WindowEvent; import static java.awt.GridBagConstraints.HORIZONTAL; import static java.awt.GridBagConstraints.WEST; -import static ui.widgets.UIUtils.btn; +import static ui.gui.widgets.UIUtils.btn; /** * A common dialog for cert / template editing. It will close upon Esc or Cancel. @@ -33,7 +33,7 @@ public abstract class CertEditDialog<T> extends JDialog { * Root pane. */ protected JPanel contentPane = new JPanel(); - protected JButton buttonOK = btn("", this::onOK); + protected JButton buttonOK = UIUtils.btn("", this::onOK); protected JTextField textFieldSubject = new JTextField(); protected JSpinner spinnerValidity = new JSpinner(new SpinnerNumberModel(60, 1, null, 0)); @@ -46,7 +46,7 @@ public abstract class CertEditDialog<T> extends JDialog { contentPane.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8)); contentPane.add(renderForm()); - contentPane.add(UIUtils.createActionsPane(buttonOK, btn("Cancel", this::onCancel))); + contentPane.add(UIUtils.createActionsPane(buttonOK, UIUtils.btn("Cancel", this::onCancel))); setContentPane(contentPane); setModal(true); diff --git a/src/main/ui/widgets/CertTableModel.java b/src/main/ui/gui/widgets/CertTableModel.java index 0259e1b..f10d621 100644 --- a/src/main/ui/widgets/CertTableModel.java +++ b/src/main/ui/gui/widgets/CertTableModel.java @@ -1,4 +1,4 @@ -package ui.widgets; +package ui.gui.widgets; import model.ca.CertificationAuthority; import model.pki.cert.Certificate; diff --git a/src/main/ui/widgets/GCBuilder.java b/src/main/ui/gui/widgets/GCBuilder.java index 0590cc1..a571aab 100644 --- a/src/main/ui/widgets/GCBuilder.java +++ b/src/main/ui/gui/widgets/GCBuilder.java @@ -1,4 +1,4 @@ -package ui.widgets; +package ui.gui.widgets; import java.awt.*; diff --git a/src/main/ui/widgets/LogTableModel.java b/src/main/ui/gui/widgets/LogTableModel.java index dc7dcbd..a7b52ac 100644 --- a/src/main/ui/widgets/LogTableModel.java +++ b/src/main/ui/gui/widgets/LogTableModel.java @@ -1,4 +1,4 @@ -package ui.widgets; +package ui.gui.widgets; import model.ca.AuditLogEntry; import model.ca.CertificationAuthority; diff --git a/src/main/ui/widgets/QRPanel.java b/src/main/ui/gui/widgets/QRPanel.java index d72d0d0..ebd70af 100644 --- a/src/main/ui/widgets/QRPanel.java +++ b/src/main/ui/gui/widgets/QRPanel.java @@ -1,4 +1,4 @@ -package ui.widgets; +package ui.gui.widgets; import com.google.zxing.BarcodeFormat; import com.google.zxing.WriterException; diff --git a/src/main/ui/widgets/TemplateTableModel.java b/src/main/ui/gui/widgets/TemplateTableModel.java index da4557f..de23b54 100644 --- a/src/main/ui/widgets/TemplateTableModel.java +++ b/src/main/ui/gui/widgets/TemplateTableModel.java @@ -1,4 +1,4 @@ -package ui.widgets; +package ui.gui.widgets; import model.ca.CertificationAuthority; import model.ca.Template; diff --git a/src/main/ui/widgets/UIUtils.java b/src/main/ui/gui/widgets/UIUtils.java index 4442be3..bb09a72 100644 --- a/src/main/ui/widgets/UIUtils.java +++ b/src/main/ui/gui/widgets/UIUtils.java @@ -1,4 +1,4 @@ -package ui.widgets; +package ui.gui.widgets; import model.asn1.exceptions.ParseException; import ui.Utils; diff --git a/src/main/ui/IssueScreen.java b/src/main/ui/tui/IssueScreen.java index 3e70a0a..26ceb02 100644 --- a/src/main/ui/IssueScreen.java +++ b/src/main/ui/tui/IssueScreen.java @@ -1,10 +1,11 @@ -package ui; +package ui.tui; import model.asn1.exceptions.ParseException; import model.ca.Template; import model.csr.CertificationRequest; import model.pki.cert.Certificate; import model.x501.Name; +import ui.Utils; /** * The screen that accepts a CSR and template and allows user to change its properties and issue. diff --git a/src/main/ui/JCA.java b/src/main/ui/tui/JCA.java index 64cfaa3..c23d610 100644 --- a/src/main/ui/JCA.java +++ b/src/main/ui/tui/JCA.java @@ -1,10 +1,11 @@ -package ui; +package ui.tui; import model.asn1.exceptions.InvalidDBException; import model.asn1.exceptions.ParseException; import model.ca.CertificationAuthority; import persistence.Decoder; import persistence.FS; +import ui.Utils; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/main/ui/MainScreen.java b/src/main/ui/tui/MainScreen.java index 8a85881..860eff7 100644 --- a/src/main/ui/MainScreen.java +++ b/src/main/ui/tui/MainScreen.java @@ -1,4 +1,4 @@ -package ui; +package ui.tui; import model.asn1.ASN1Object; import model.asn1.UtcTime; @@ -10,6 +10,7 @@ import model.pki.cert.Certificate; import model.pki.crl.CertificateList; import model.pki.crl.Reason; import model.pki.crl.RevokedCertificate; +import ui.Utils; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/ui/MgmtScreen.java b/src/main/ui/tui/MgmtScreen.java index c630a34..007bd0e 100644 --- a/src/main/ui/MgmtScreen.java +++ b/src/main/ui/tui/MgmtScreen.java @@ -1,4 +1,4 @@ -package ui; +package ui.tui; import model.asn1.exceptions.InvalidCAException; import model.asn1.exceptions.ParseException; @@ -6,6 +6,7 @@ import model.asn1.parsing.BytesReader; import model.csr.CertificationRequest; import model.pki.cert.Certificate; import model.pki.cert.TbsCertificate; +import ui.Utils; import java.security.NoSuchAlgorithmException; import java.util.Base64; diff --git a/src/main/ui/Screen.java b/src/main/ui/tui/Screen.java index 31370e1..413fe8a 100644 --- a/src/main/ui/Screen.java +++ b/src/main/ui/tui/Screen.java @@ -1,4 +1,4 @@ -package ui; +package ui.tui; /** * The screen type diff --git a/src/main/ui/TemplateSetScreen.java b/src/main/ui/tui/TemplateSetScreen.java index 30d25b9..0f6df3a 100644 --- a/src/main/ui/TemplateSetScreen.java +++ b/src/main/ui/tui/TemplateSetScreen.java @@ -1,4 +1,4 @@ -package ui; +package ui.tui; import model.asn1.exceptions.ParseException; import model.ca.Template; diff --git a/src/main/ui/TemplatesScreen.java b/src/main/ui/tui/TemplatesScreen.java index e622709..6b7f18c 100644 --- a/src/main/ui/TemplatesScreen.java +++ b/src/main/ui/tui/TemplatesScreen.java @@ -1,4 +1,4 @@ -package ui; +package ui.tui; import model.ca.Template; import model.x501.Name; diff --git a/src/main/ui/UIHandler.java b/src/main/ui/tui/UIHandler.java index f451542..672fd50 100644 --- a/src/main/ui/UIHandler.java +++ b/src/main/ui/tui/UIHandler.java @@ -1,4 +1,4 @@ -package ui; +package ui.tui; /** * Represents a screen |