Curly braces on new lines

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

@ -82,17 +82,21 @@ public X509CertificatePanel(X509Certificate[] certificates)
tree.setExpandsSelectedPaths(true); tree.setExpandsSelectedPaths(true);
tree.getSelectionModel().setSelectionMode( tree.getSelectionModel().setSelectionMode(
TreeSelectionModel.SINGLE_TREE_SELECTION); TreeSelectionModel.SINGLE_TREE_SELECTION);
tree.setCellRenderer(new DefaultTreeCellRenderer() { tree.setCellRenderer(new DefaultTreeCellRenderer()
{
@Override @Override
public Component getTreeCellRendererComponent(JTree tree, public Component getTreeCellRendererComponent(JTree tree,
Object value, boolean sel, boolean expanded, boolean leaf, Object value, boolean sel, boolean expanded, boolean leaf,
int row, boolean hasFocus) { int row, boolean hasFocus)
{
JLabel component = (JLabel) super.getTreeCellRendererComponent( JLabel component = (JLabel) super.getTreeCellRendererComponent(
tree, value, sel, expanded, leaf, row, hasFocus); tree, value, sel, expanded, leaf, row, hasFocus);
if (value instanceof DefaultMutableTreeNode) { if (value instanceof DefaultMutableTreeNode)
{
Object o = ((DefaultMutableTreeNode) value).getUserObject(); Object o = ((DefaultMutableTreeNode) value).getUserObject();
if (o instanceof X509Certificate) { if (o instanceof X509Certificate)
{
component.setText( component.setText(
getSimplifiedName((X509Certificate) o)); getSimplifiedName((X509Certificate) o));
} }
@ -106,7 +110,8 @@ public Component getTreeCellRendererComponent(JTree tree,
{ {
@Override @Override
public void valueChanged(TreeSelectionEvent e) { public void valueChanged(TreeSelectionEvent e)
{
valueChangedPerformed(e); valueChangedPerformed(e);
} }
}); });
@ -398,7 +403,8 @@ private static String getThumbprint(X509Certificate cert, String algorithm)
* @param cert to read subject DN from * @param cert to read subject DN from
* @return the simplified name * @return the simplified name
*/ */
private static String getSimplifiedName(X509Certificate cert) { private static String getSimplifiedName(X509Certificate cert)
{
final HashMap<String, String> parts = new HashMap<String, String>(); final HashMap<String, String> parts = new HashMap<String, String>();
try try
{ {
@ -411,14 +417,17 @@ private static String getSimplifiedName(X509Certificate cert) {
} }
} }
} }
catch (InvalidNameException ignored) {} // NOPMD catch (InvalidNameException ignored) // NOPMD
{
}
String result = parts.get("CN"); String result = parts.get("CN");
if (result == null) if (result == null)
{ {
result = parts.get("OU"); result = parts.get("OU");
} }
if (result == null) { if (result == null)
{
result = parts.get("O"); result = parts.get("O");
} }
if (result == null) if (result == null)

Loading…
Cancel
Save