Skip to content

Commit c46e3e4

Browse files
committed
1 parent d6ec95c commit c46e3e4

File tree

1 file changed

+28
-26
lines changed

1 file changed

+28
-26
lines changed

src/org/openstreetmap/josm/plugins/changeset/util/CellRenderer.java

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,34 @@ public class CellRenderer implements ListCellRenderer<ChangesetBeen> {
2323
@Override
2424
public Component getListCellRendererComponent(JList<? extends ChangesetBeen> list, ChangesetBeen changesetBeen, int index, boolean isSelected, boolean cellHasFocus) {
2525
JPanel jPanelChangeset = new JPanel(new GridLayout(2, 1, 8, 8));
26-
JPanel jPanelRow = new JPanel(new GridLayout(1, 3, 10, 10));
27-
JPanel jPanelNumChanges = new JPanel(new GridLayout(1, 2, 10, 10));
28-
jPanelNumChanges.setBackground(Color.BLACK);
29-
JLabel jLabelDate = new JLabel(changesetBeen.getDate(), SwingConstants.CENTER);
30-
jLabelDate.setForeground(new Color(0, 174, 255));
31-
// JLabel jLabelChangesetId = new JLabel(String.valueOf(changesetBeen.getChangesetId()));
32-
jPanelChangeset.setBorder(BorderFactory.createTitledBorder("Changeset :" + String.valueOf(changesetBeen.getChangesetId())));
33-
JLabel jLabelUser = new JLabel(changesetBeen.getUser(), SwingConstants.CENTER);
34-
JLabel jLabelCreate = new JLabel(String.valueOf(changesetBeen.getCreate()), SwingConstants.CENTER);
35-
jLabelCreate.setForeground(new Color(50, 214, 184));
36-
jLabelCreate.setFont(new Font("Serif", Font.BOLD, 12));
37-
JLabel jLabelModify = new JLabel(String.valueOf(changesetBeen.getModify()), SwingConstants.CENTER);
38-
jLabelModify.setForeground(new Color(229, 228, 61));
39-
jLabelModify.setFont(new Font("Serif", Font.BOLD, 12));
40-
JLabel jLabelDelete = new JLabel(String.valueOf(changesetBeen.getDelete()), SwingConstants.CENTER);
41-
jLabelDelete.setForeground(new Color(197, 38, 63));
42-
jLabelDelete.setFont(new Font("Serif", Font.BOLD, 12));
43-
// jPanelRow.add(jLabelChangesetId);
44-
jPanelRow.add(jLabelUser);
45-
jPanelNumChanges.add(jLabelCreate);
46-
jPanelNumChanges.add(jLabelModify);
47-
jPanelNumChanges.add(jLabelDelete);
48-
jPanelRow.add(jPanelNumChanges);
49-
//last
50-
jPanelChangeset.add(jLabelDate);
51-
jPanelChangeset.add(jPanelRow);
26+
if (changesetBeen != null) {
27+
JPanel jPanelRow = new JPanel(new GridLayout(1, 3, 10, 10));
28+
JPanel jPanelNumChanges = new JPanel(new GridLayout(1, 2, 10, 10));
29+
jPanelNumChanges.setBackground(Color.BLACK);
30+
JLabel jLabelDate = new JLabel(changesetBeen.getDate(), SwingConstants.CENTER);
31+
jLabelDate.setForeground(new Color(0, 174, 255));
32+
// JLabel jLabelChangesetId = new JLabel(String.valueOf(changesetBeen.getChangesetId()));
33+
jPanelChangeset.setBorder(BorderFactory.createTitledBorder("Changeset :" + String.valueOf(changesetBeen.getChangesetId())));
34+
JLabel jLabelUser = new JLabel(changesetBeen.getUser(), SwingConstants.CENTER);
35+
JLabel jLabelCreate = new JLabel(String.valueOf(changesetBeen.getCreate()), SwingConstants.CENTER);
36+
jLabelCreate.setForeground(new Color(50, 214, 184));
37+
jLabelCreate.setFont(new Font("Serif", Font.BOLD, 12));
38+
JLabel jLabelModify = new JLabel(String.valueOf(changesetBeen.getModify()), SwingConstants.CENTER);
39+
jLabelModify.setForeground(new Color(229, 228, 61));
40+
jLabelModify.setFont(new Font("Serif", Font.BOLD, 12));
41+
JLabel jLabelDelete = new JLabel(String.valueOf(changesetBeen.getDelete()), SwingConstants.CENTER);
42+
jLabelDelete.setForeground(new Color(197, 38, 63));
43+
jLabelDelete.setFont(new Font("Serif", Font.BOLD, 12));
44+
// jPanelRow.add(jLabelChangesetId);
45+
jPanelRow.add(jLabelUser);
46+
jPanelNumChanges.add(jLabelCreate);
47+
jPanelNumChanges.add(jLabelModify);
48+
jPanelNumChanges.add(jLabelDelete);
49+
jPanelRow.add(jPanelNumChanges);
50+
//last
51+
jPanelChangeset.add(jLabelDate);
52+
jPanelChangeset.add(jPanelRow);
53+
}
5254
return jPanelChangeset;
5355
}
5456
}

0 commit comments

Comments
 (0)