From 06fa257080ab8de7986ad5debbf317eddf5608e7 Mon Sep 17 00:00:00 2001
From: Alex Lewis <alex.lewis001@gmail.com>
Date: Tue, 10 Dec 2013 11:41:36 -0500
Subject: [PATCH] issue-350: Fixes issue when an apostrophe is present in a User's name
---
src/main/java/com/gitblit/authority/X509CertificateViewer.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/X509CertificateViewer.java b/src/main/java/com/gitblit/authority/X509CertificateViewer.java
index 797b9a8..4711003 100644
--- a/src/main/java/com/gitblit/authority/X509CertificateViewer.java
+++ b/src/main/java/com/gitblit/authority/X509CertificateViewer.java
@@ -41,24 +41,24 @@
public class X509CertificateViewer extends JDialog {
private static final long serialVersionUID = 1L;
-
+
public X509CertificateViewer(Frame owner, X509Certificate cert) {
super(owner);
-
+
setTitle(Translation.get("gb.viewCertificate"));
-
- JPanel content = new JPanel(new BorderLayout(Utils.MARGIN, Utils.MARGIN)) {
+
+ JPanel content = new JPanel(new BorderLayout(Utils.MARGIN, Utils.MARGIN)) {
private static final long serialVersionUID = 1L;
@Override
public Insets getInsets() {
-
+
return Utils.INSETS;
}
};
-
+
DateFormat df = DateFormat.getDateTimeInstance();
-
+
int l1 = 15;
int l2 = 25;
int l3 = 45;
@@ -82,26 +82,27 @@
}
content.add(panel, BorderLayout.CENTER);
-
+
JButton ok = new JButton(Translation.get("gb.ok"));
ok.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
setVisible(false);
}
});
-
+
JPanel controls = new JPanel();
controls.add(ok);
-
+
content.add(controls, BorderLayout.SOUTH);
-
+
getContentPane().add(new HeaderPanel(Translation.get("gb.certificate"), "rosette_16x16.png"), BorderLayout.NORTH);
getContentPane().add(content, BorderLayout.CENTER);
pack();
-
+
setLocationRelativeTo(owner);
}
-
+
private JPanel newField(String label, String value, int cols) {
JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT, 2*Utils.MARGIN, 0));
JLabel lbl = new JLabel(label);
@@ -114,7 +115,7 @@
panel.add(tf);
return panel;
}
-
+
private String fingerprint(String value) {
value = value.toUpperCase();
StringBuilder sb = new StringBuilder();
--
Gitblit v1.9.1