Changeset 11608 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2017-02-25T03:14:20+01:00 (7 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:

• ChangesetCellRenderer.java (modified) (2 diffs)
• UploadParameterSummaryPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java

@@ -40 +40 @@
                     DateUtils.formatDateTime(cs.getCreatedAt(), DateFormat.SHORT, DateFormat.SHORT)).append("<br>");
         }
-        if (cs.get("comment") != null) {
-            sb.append("<strong>").append(tr("Changeset comment:")).append("</strong>").append(cs.get("comment")).append("<br>");
+        String comment = cs.get("comment");
+        if (comment != null) {
+            sb.append("<strong>").append(tr("Changeset comment:")).append("</strong>").append(comment).append("<br>");
         }
         return sb.toString();
@@ -59 +60 @@
             setIcon(icon);
             StringBuilder sb = new StringBuilder();
-            if (cs.get("comment") != null) {
-                sb.append(cs.getId()).append(" - ").append(cs.get("comment"));
+            String comment = cs.get("comment");
+            if (comment != null) {
+                sb.append(cs.getId()).append(" - ").append(comment);
             } else if (cs.get("name") != null) {
                 sb.append(cs.getId()).append(" - ").append(cs.get("name"));

trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

@@ -8 +8 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Optional;
 
 import javax.swing.BorderFactory;
@@ -45 +46 @@
             msg.append(tr("Objects are uploaded to a <strong>new changeset</strong>."));
         } else {
-            String uploadComment = selectedChangeset.get("comment") == null ?
-                    "" : selectedChangeset.get("comment");
             msg.append(tr("Objects are uploaded to the <strong>open changeset</strong> {0} with upload comment ''{1}''.",
                     selectedChangeset.getId(),
-                    uploadComment
+                    Optional.ofNullable(selectedChangeset.get("comment")).orElse("")
             ));
         }