mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-11-01 16:40:26 +00:00
Code Issues Projects Releases Wiki Activity

Cosmetic changes.

Browse Source
This commit is contained in:
Alameyo 2017-06-15 00:29:10 +02:00
parent 46ec407ca6
commit a9496c7071
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/src/main/java/org/jivesoftware/spark/ui/login/CertificateDialog.java
View File

@ -2,11 +2,15 @@ package org.jivesoftware.spark.ui.login;
import static java.awt.GridBagConstraints.HORIZONTAL;
import static java.awt.GridBagConstraints.WEST;
import static java.awt.GridBagConstraints.BOTH;
import static java.awt.GridBagConstraints.NONE;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.ButtonGroup;
import javax.swing.JButton;
import javax.swing.JDialog;
@ -30,7 +34,7 @@ import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
*
* @author Pawel Scibiorski
*/
public class CertificateDialog extends JDialog {
public class CertificateDialog extends JDialog implements ActionListener {
private final static Insets DEFAULT_INSETS = new Insets(5, 5, 5, 5);
private final LocalPreferences localPreferences;
@ -69,6 +73,7 @@ public class CertificateDialog extends JDialog {
private JRadioButton trust = new JRadioButton();
private JRadioButton distrust = new JRadioButton();
private JButton checkValidity = new JButton();
private JButton okButton = new JButton();
public CertificateDialog(LocalPreferences localPreferences, CertificateModel cert) {
if (localPreferences == null || cert == null) {
@ -106,6 +111,8 @@ public class CertificateDialog extends JDialog {
radioGroup.add(distrust);
radioGroup.add(trust);
okButton.addActionListener(this);
ResourceUtils.resLabel(versionLabel, versionField, Res.getString("label.certificate.version"));
ResourceUtils.resLabel(serialNumberLabel, serialNumberField, Res.getString("label.certificate.serial.number"));
ResourceUtils.resLabel(signatureValueLabel, signatureValueField,
@ -126,6 +133,7 @@ public class CertificateDialog extends JDialog {
ResourceUtils.resButton(trust, Res.getString("radio.certificate.trust"));
ResourceUtils.resButton(distrust, Res.getString("radio.certificate.distrust"));
ResourceUtils.resButton(checkValidity, Res.getString("button.check.validity"));
ResourceUtils.resButton(okButton, Res.getString("ok"));
panel.setLayout(new GridBagLayout());
buttonPanel.setLayout(new GridBagLayout());
@ -151,7 +159,7 @@ public class CertificateDialog extends JDialog {
panel.add(versionField,
new GridBagConstraints(2, 0, 12, 1, 0.0, 0.0, WEST, HORIZONTAL, DEFAULT_INSETS, 240, 0));
new GridBagConstraints(2, 0, 12, 1, 0.0, 0.0, WEST, HORIZONTAL, DEFAULT_INSETS, 0, 0));
panel.add(serialNumberField,
new GridBagConstraints(2, 1, 6, 1, 0.0, 0.0, WEST, HORIZONTAL, DEFAULT_INSETS, 0, 0));
panel.add(signatureValueField,
@ -172,19 +180,29 @@ public class CertificateDialog extends JDialog {
buttonPanel.add(trust, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, WEST, HORIZONTAL, DEFAULT_INSETS, 0, 0));
buttonPanel.add(distrust, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0, WEST, HORIZONTAL, DEFAULT_INSETS, 0, 0));
buttonPanel.add(checkValidity,
new GridBagConstraints(0, 1, 2, 1, 0.0, 0.0, WEST, HORIZONTAL, new Insets(5, 5, 5, 300), 0, 0));
buttonPanel.add(checkValidity, new GridBagConstraints(0, 1, 2, 1, 0.0, 0.0, WEST, NONE, DEFAULT_INSETS, 0, 0));
buttonPanel.add(okButton, new GridBagConstraints(2, 2, 2, 1, 0.0, 0.0, WEST, NONE, new Insets(5, 5, 5, 200), 60, 0));
scrollPane = new JScrollPane(panel);
scrollPane.setMinimumSize(new Dimension(380, 300));
scrollPane.setMinimumSize(new Dimension(250, 500));
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
add(scrollPane, new GridBagConstraints(0, 0, 4, 1, 1.0, 1.0, WEST, HORIZONTAL, DEFAULT_INSETS, 0, 0));
add(scrollPane, new GridBagConstraints(0, 0, 4, 1, 1.0, 1.0, WEST, BOTH, DEFAULT_INSETS, 0, 0));
add(buttonPanel, new GridBagConstraints(0, 1, 1, 1, 1.0, 0.0, WEST, HORIZONTAL, DEFAULT_INSETS, 0, 0));
scrollPane.setVisible(true);
setVisible(true);
scrollPane.getVerticalScrollBar().setValue(0);
scrollPane.repaint();
repaint();
}
@Override
public void actionPerformed(ActionEvent e) {
if(e.getSource() == okButton){
this.dispose();
}
}
}

1
core/src/main/java/org/jivesoftware/spark/ui/login/CertificatesManagerSettingsPanel.java
View File

@ -61,6 +61,7 @@ public class CertificatesManagerSettingsPanel extends JPanel implements ActionLi
certTable.setModel(certControll.getTableModel());
scrollPane = new JScrollPane(certTable);
certTable.setFillsViewportHeight(true);
certTable.setAutoCreateRowSorter(true);
ResourceUtils.resButton(acceptAll, Res.getString("checkbox.accept.all"));
ResourceUtils.resButton(acceptExpired, Res.getString("checkbox.accept.expired"));

3
core/src/main/java/org/jivesoftware/sparkimpl/certificates/CertificateModel.java
View File

@ -1,6 +1,7 @@
package org.jivesoftware.sparkimpl.certificates;
import java.security.cert.X509Certificate;
import java.util.Base64;
import java.util.List;
import org.jivesoftware.spark.util.log.Log;
@ -78,7 +79,7 @@ public class CertificateModel {
public CertificateModel(X509Certificate certificate) {
this.version = certificate.getVersion();
this.serialNumber = certificate.getSerialNumber().toString();
this.signatureValue = certificate.getSignature().toString();
this.signatureValue = Base64.getEncoder().encodeToString(certificate.getSignature());
this.signatureAlgorithm = certificate.getSigAlgName();
this.issuer = certificate.getIssuerX500Principal().toString();
this.subject = certificate.getSubjectX500Principal().getName().toString();