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

Timestamp:

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

Author:

Don-vip

Message:

add Changeset.getComment()

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Changeset.java (modified) (3 diffs)
• gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetDetailPanel.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetListCellRenderer.java (modified) (1 diff)
• gui/io/ChangesetCellRenderer.java (modified) (2 diffs)
• gui/io/UploadParameterSummaryPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

@@ -10 +10 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -264 +265 @@
 
     /**
-     * Replies the number of comments for this changeset.
-     * @return the number of comments for this changeset
+     * Replies this changeset comment.
+     * @return this changeset comment (empty string if missing)
+     * @since 12494
+     */
+    public String getComment() {
+        return Optional.ofNullable(get("comment")).orElse("");
+    }
+
+    /**
+     * Replies the number of comments for this changeset discussion.
+     * @return the number of comments for this changeset discussion
      * @since 7700
      */
@@ -273 +283 @@
 
     /**
-     * Sets the number of comments for this changeset.
-     * @param commentsCount the number of comments for this changeset
+     * Sets the number of comments for this changeset discussion.
+     * @param commentsCount the number of comments for this changeset discussion
      * @since 7700
      */

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java

@@ -19 +19 @@
 
     protected void renderUploadComment(Changeset cs) {
-        String comment = cs.get("comment");
-        if (comment == null || comment.trim().isEmpty()) {
+        String comment = cs.getComment();
+        if (comment.trim().isEmpty()) {
             setText(trc("changeset.upload-comment", "empty"));
             setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

@@ -221 +221 @@
         if (cs == null) return;
         tfID.setText(Integer.toString(cs.getId()));
-        String comment = cs.get("comment");
-        taComment.setText(comment == null ? "" : comment);
+        taComment.setText(cs.getComment());
 
         if (cs.isOpen()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java

@@ -42 +42 @@
             sb.append(tr("{0} [incomplete]", cs.getId()));
         } else {
-            String comment = cs.get("comment");
+            String comment = cs.getComment();
             sb.append(cs.getId())
               .append(" - ")
               .append(cs.isOpen() ? tr("open") : tr("closed"));
-            if (comment != null) {
+            if (!comment.isEmpty()) {
                 sb.append(" - '").append(comment).append('\'');
             }

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()
             ));
         }