Changeset 11608 in josm for trunk/src/org/openstreetmap/josm/gui/io
- Timestamp:
- 2017-02-25T03:14:20+01:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/io
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
r10242 r11608 40 40 DateUtils.formatDateTime(cs.getCreatedAt(), DateFormat.SHORT, DateFormat.SHORT)).append("<br>"); 41 41 } 42 if (cs.get("comment") != null) { 43 sb.append("<strong>").append(tr("Changeset comment:")).append("</strong>").append(cs.get("comment")).append("<br>"); 42 String comment = cs.get("comment"); 43 if (comment != null) { 44 sb.append("<strong>").append(tr("Changeset comment:")).append("</strong>").append(comment).append("<br>"); 44 45 } 45 46 return sb.toString(); … … 59 60 setIcon(icon); 60 61 StringBuilder sb = new StringBuilder(); 61 if (cs.get("comment") != null) { 62 sb.append(cs.getId()).append(" - ").append(cs.get("comment")); 62 String comment = cs.get("comment"); 63 if (comment != null) { 64 sb.append(cs.getId()).append(" - ").append(comment); 63 65 } else if (cs.get("name") != null) { 64 66 sb.append(cs.getId()).append(" - ").append(cs.get("name")); -
trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
r9996 r11608 8 8 import java.beans.PropertyChangeEvent; 9 9 import java.beans.PropertyChangeListener; 10 import java.util.Optional; 10 11 11 12 import javax.swing.BorderFactory; … … 45 46 msg.append(tr("Objects are uploaded to a <strong>new changeset</strong>.")); 46 47 } else { 47 String uploadComment = selectedChangeset.get("comment") == null ?48 "" : selectedChangeset.get("comment");49 48 msg.append(tr("Objects are uploaded to the <strong>open changeset</strong> {0} with upload comment ''{1}''.", 50 49 selectedChangeset.getId(), 51 uploadComment50 Optional.ofNullable(selectedChangeset.get("comment")).orElse("") 52 51 )); 53 52 }
Note:
See TracChangeset
for help on using the changeset viewer.