From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/authority/CertificatesTableModel.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/CertificatesTableModel.java b/src/main/java/com/gitblit/authority/CertificatesTableModel.java
index 44d80e3..bd99b24 100644
--- a/src/main/java/com/gitblit/authority/CertificatesTableModel.java
+++ b/src/main/java/com/gitblit/authority/CertificatesTableModel.java
@@ -28,16 +28,16 @@
/**
* Table model of a list of user certificate models.
- *
+ *
* @author James Moger
- *
+ *
*/
public class CertificatesTableModel extends AbstractTableModel {
private static final long serialVersionUID = 1L;
UserCertificateModel ucm;
-
+
enum Columns {
SerialNumber, Status, Reason, Issued, Expires;
@@ -80,11 +80,12 @@
/**
* Returns <code>Object.class</code> regardless of <code>columnIndex</code>.
- *
+ *
* @param columnIndex
* the column being queried
* @return the Object.class
*/
+ @Override
public Class<?> getColumnClass(int columnIndex) {
Columns col = Columns.values()[columnIndex];
switch (col) {
@@ -127,7 +128,7 @@
if (ucm.getStatus(cert).equals(CertificateStatus.revoked)) {
RevocationReason r = ucm.getRevocationReason(cert.getSerialNumber());
return Translation.get("gb." + r.name());
- }
+ }
}
return null;
}
@@ -135,9 +136,12 @@
public X509Certificate get(int modelRow) {
return ucm.certs.get(modelRow);
}
-
+
public void setUserCertificateModel(UserCertificateModel ucm) {
this.ucm = ucm;
+ if (ucm == null) {
+ return;
+ }
Collections.sort(ucm.certs, new Comparator<X509Certificate>() {
@Override
public int compare(X509Certificate o1, X509Certificate o2) {
--
Gitblit v1.9.1