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

Timestamp:

2017-07-22T22:41:19+02:00 (7 years ago)

Author:

Don-vip

Message:

add Changeset.getComment()

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

@@ -43 +43 @@
                     DateUtils.formatDateTime(createdDate, DateFormat.SHORT, DateFormat.SHORT)).append("<br>");
         }
-        String comment = cs.get("comment");
-        if (comment != null) {
+        String comment = cs.getComment();
+        if (!comment.isEmpty()) {
             sb.append("<strong>").append(tr("Changeset comment:")).append("</strong>")
               .append(Utils.escapeReservedCharactersHTML(comment)).append("<br>");
@@ -64 +64 @@
             setIcon(icon);
             StringBuilder sb = new StringBuilder();
-            String comment = cs.get("comment");
-            if (comment != null) {
+            String comment = cs.getComment();
+            if (!comment.isEmpty()) {
                 sb.append(cs.getId()).append(" - ").append(comment);
             } else if (cs.get("name") != null) {

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;
@@ -52 +51 @@
             msg.append(tr("Objects are uploaded to the <strong>open changeset</strong> {0} with upload comment ''{1}''.",
                     selectedChangeset.getId(),
-                    Optional.ofNullable(selectedChangeset.get("comment")).orElse("")
+                    selectedChangeset.getComment()
             ));
         }