Ignore:
Timestamp:
2017-02-25T03:14:20+01:00 (2 years ago)
Author:
Don-vip
Message:

fix #14402 - add blacklist for leisure area values to avoid false positives - improve globally the detection of keys/tags

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  
    4040                    DateUtils.formatDateTime(cs.getCreatedAt(), DateFormat.SHORT, DateFormat.SHORT)).append("<br>");
    4141        }
    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>");
    4445        }
    4546        return sb.toString();
     
    5960            setIcon(icon);
    6061            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);
    6365            } else if (cs.get("name") != null) {
    6466                sb.append(cs.getId()).append(" - ").append(cs.get("name"));
  • trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

    r9996 r11608  
    88import java.beans.PropertyChangeEvent;
    99import java.beans.PropertyChangeListener;
     10import java.util.Optional;
    1011
    1112import javax.swing.BorderFactory;
     
    4546            msg.append(tr("Objects are uploaded to a <strong>new changeset</strong>."));
    4647        } else {
    47             String uploadComment = selectedChangeset.get("comment") == null ?
    48                     "" : selectedChangeset.get("comment");
    4948            msg.append(tr("Objects are uploaded to the <strong>open changeset</strong> {0} with upload comment ''{1}''.",
    5049                    selectedChangeset.getId(),
    51                     uploadComment
     50                    Optional.ofNullable(selectedChangeset.get("comment")).orElse("")
    5251            ));
    5352        }
Note: See TracChangeset for help on using the changeset viewer.