Changed from List to array type for X509CertificatePanel constructor

fix-message-formatting
Markus Kilås 11 years ago
parent dfa09c310f
commit f97dccddf5

@ -242,7 +242,8 @@ private void actionShowCertificate()
Component certInfoPane = null; Component certInfoPane = null;
if (!certs.isEmpty()) if (!certs.isEmpty())
{ {
certInfoPane = new X509CertificatePanel(certs); certInfoPane = new X509CertificatePanel(
certs.toArray(new X509Certificate[0]));
} }
else else
{ {

@ -8,7 +8,7 @@
import java.awt.*; import java.awt.*;
import java.security.cert.*; import java.security.cert.*;
import java.util.Arrays; import java.util.*;
import javax.swing.*; import javax.swing.*;
import org.jitsi.service.resources.*; import org.jitsi.service.resources.*;
@ -126,7 +126,16 @@ private void init()
Component certInfoPane; Component certInfoPane;
if (certs[0] instanceof X509Certificate) if (certs[0] instanceof X509Certificate)
{ {
certInfoPane = new X509CertificatePanel(Arrays.asList((X509Certificate[])certs)); ArrayList x509s = new ArrayList<X509Certificate>();
for (Certificate c : certs)
{
if (c instanceof X509Certificate)
{
x509s.add(c);
}
}
certInfoPane = new X509CertificatePanel(
(X509Certificate[]) x509s.toArray(new X509Certificate[0]));
} }
else else
{ {

@ -46,7 +46,10 @@ public class X509CertificatePanel
*/ */
public X509CertificatePanel(X509Certificate certificate) public X509CertificatePanel(X509Certificate certificate)
{ {
this(Arrays.asList(certificate)); this(new X509Certificate[]
{
certificate
});
} }
/** /**
@ -54,7 +57,7 @@ public X509CertificatePanel(X509Certificate certificate)
* *
* @param certificates <tt>X509Certificate</tt> objects * @param certificates <tt>X509Certificate</tt> objects
*/ */
public X509CertificatePanel(java.util.List<X509Certificate> certificates) public X509CertificatePanel(X509Certificate[] certificates)
{ {
setLayout(new BorderLayout(5, 5)); setLayout(new BorderLayout(5, 5));
@ -66,10 +69,9 @@ public X509CertificatePanel(java.util.List<X509Certificate> certificates)
DefaultMutableTreeNode top = new DefaultMutableTreeNode(); DefaultMutableTreeNode top = new DefaultMutableTreeNode();
DefaultMutableTreeNode previous = top; DefaultMutableTreeNode previous = top;
ListIterator<X509Certificate> it = certificates.listIterator( for (int i = certificates.length - 1; i >= 0; i--)
certificates.size()); {
while (it.hasPrevious()) { X509Certificate cert = certificates[i];
X509Certificate cert = it.previous();
DefaultMutableTreeNode next = new DefaultMutableTreeNode(cert); DefaultMutableTreeNode next = new DefaultMutableTreeNode(cert);
previous.add(next); previous.add(next);
previous = next; previous = next;
@ -132,7 +134,7 @@ public void valueChanged(TreeSelectionEvent e) {
infoTextPane.setOpaque(false); infoTextPane.setOpaque(false);
infoTextPane.setEditable(false); infoTextPane.setEditable(false);
infoTextPane.setContentType("text/html"); infoTextPane.setContentType("text/html");
infoTextPane.setText(toString(certificates.get(0))); infoTextPane.setText(toString(certificates[0]));
final JScrollPane certScroll = new JScrollPane(infoTextPane); final JScrollPane certScroll = new JScrollPane(infoTextPane);
certScroll.setPreferredSize(new Dimension(300, 500)); certScroll.setPreferredSize(new Dimension(300, 500));

Loading…
Cancel
Save