Changeset 6440 in josm for trunk/src/org/openstreetmap/josm/gui/history
- Timestamp:
- 2013-12-05T22:20:57+01:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/history
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
r6316 r6440 10 10 import java.util.Collection; 11 11 import java.util.HashSet; 12 import java.util.List; 12 13 import java.util.Set; 13 14 15 import org.openstreetmap.josm.data.osm.Changeset; 14 16 import org.openstreetmap.josm.data.osm.OsmPrimitive; 15 17 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; … … 21 23 import org.openstreetmap.josm.gui.ExceptionDialogUtil; 22 24 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 25 import org.openstreetmap.josm.io.ChangesetQuery; 26 import org.openstreetmap.josm.io.OsmServerChangesetReader; 23 27 import org.openstreetmap.josm.io.OsmServerHistoryReader; 24 28 import org.openstreetmap.josm.io.OsmTransferException; … … 201 205 reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId()); 202 206 ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false)); 207 // load corresponding changesets (mostly for changeset comment) 208 for (final Changeset i : new OsmServerChangesetReader().queryChangesets( 209 new ChangesetQuery().forChangesetIds(ds.getChangesetIds()), progressMonitor.createSubTaskMonitor(1, false))) { 210 ds.putChangeset(i); 211 } 203 212 } catch(OsmTransferException e) { 204 213 if (canceled) -
trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
r6340 r6440 5 5 6 6 import java.awt.BorderLayout; 7 import java.awt.Color; 7 8 import java.awt.GridBagConstraints; 8 9 import java.awt.GridBagLayout; … … 16 17 import javax.swing.JLabel; 17 18 import javax.swing.JPanel; 19 import javax.swing.JTextArea; 18 20 19 21 import org.openstreetmap.josm.Main; … … 39 41 private UrlLabel lblUser; 40 42 private UrlLabel lblChangeset; 43 private JTextArea lblChangesetComment; 41 44 42 45 protected void build() { … … 55 58 pnlUserAndChangeset.add(lblChangeset); 56 59 60 lblChangesetComment = new JTextArea(); 61 lblChangesetComment.setLineWrap(true); 62 lblChangesetComment.setEditable(false); 63 lblChangesetComment.setBackground(new Color(0, 0, 0, 0)); 64 57 65 setLayout(new GridBagLayout()); 58 66 GridBagConstraints gc = new GridBagConstraints(); … … 65 73 gc.weighty = 0.0; 66 74 add(pnlUserAndChangeset, gc); 75 gc.gridy = 2; 76 add(lblChangesetComment, gc); 67 77 } 68 78 … … 132 142 lblChangeset.setUrl(url); 133 143 lblChangeset.setDescription(Long.toString(getPrimitive().getChangesetId())); 144 final String comment = getPrimitive().getChangeset() != null ? getPrimitive().getChangeset().get("comment") : null; 145 lblChangesetComment.setText(comment); 146 lblChangesetComment.setToolTipText(tr("Changeset comment")); 134 147 135 148 try {
Note:
See TracChangeset
for help on using the changeset viewer.