Changeset 6440 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-12-05T22:20:57+01:00 (10 years ago)

Author:

simon04

Message:

Load and display changeset comment in history dialog

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryLoadTask.java (modified) (3 diffs)
• VersionInfoPanel.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -21 +23 @@
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.io.ChangesetQuery;
+import org.openstreetmap.josm.io.OsmServerChangesetReader;
 import org.openstreetmap.josm.io.OsmServerHistoryReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -201 +205 @@
                     reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
                     ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
+                    // load corresponding changesets (mostly for changeset comment)
+                    for (final Changeset i : new OsmServerChangesetReader().queryChangesets(
+                            new ChangesetQuery().forChangesetIds(ds.getChangesetIds()), progressMonitor.createSubTaskMonitor(1, false))) {
+                        ds.putChangeset(i);
+                    }
                 } catch(OsmTransferException e) {
                     if (canceled)

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -16 +17 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JTextArea;
 
 import org.openstreetmap.josm.Main;
@@ -39 +41 @@
     private UrlLabel lblUser;
     private UrlLabel lblChangeset;
+    private JTextArea lblChangesetComment;
 
     protected void build() {
@@ -55 +58 @@
         pnlUserAndChangeset.add(lblChangeset);
 
+        lblChangesetComment = new JTextArea();
+        lblChangesetComment.setLineWrap(true);
+        lblChangesetComment.setEditable(false);
+        lblChangesetComment.setBackground(new Color(0, 0, 0, 0));
+
         setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
@@ -65 +73 @@
         gc.weighty = 0.0;
         add(pnlUserAndChangeset, gc);
+        gc.gridy = 2;
+        add(lblChangesetComment, gc);
     }
 
@@ -132 +142 @@
             lblChangeset.setUrl(url);
             lblChangeset.setDescription(Long.toString(getPrimitive().getChangesetId()));
+            final String comment = getPrimitive().getChangeset() != null ? getPrimitive().getChangeset().get("comment") : null;
+            lblChangesetComment.setText(comment);
+            lblChangesetComment.setToolTipText(tr("Changeset comment"));
 
             try {