Skip to content

Commit cbc9ef6

Browse files
committed
SwingObjectWidget: fix cell renderer null support
The value might be null. Let's not crash in this case. See #76.
1 parent 5c32cba commit cbc9ef6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/org/scijava/ui/swing/widget/SwingObjectWidget.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ private class NamedObjectCellRenderer implements ListCellRenderer<Object> {
117117
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected,
118118
boolean cellHasFocus) {
119119
JLabel renderer = (JLabel) defaultRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
120-
renderer.setText(context().service(ObjectService.class).getName(value));
121-
renderer.setToolTipText(value.toString());
120+
renderer.setText(value == null ? "" : context().service(ObjectService.class).getName(value));
121+
renderer.setToolTipText(value == null ? null : value.toString());
122122
return renderer;
123123
}
124124
}

0 commit comments

Comments
 (0)