Ticket #17279: 17279-v2.patch

src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java

@@ -137 +137 @@
 
         private HistoryLoaderAndListener(Map<OsmPrimitive, Date> toLoad) {
             this.toLoad = toLoad;
+            this.setChangesetDataNeeded(false);
             add(toLoad.keySet());
             // Updating process is done after all history requests have been made
             HistoryDataSet.getInstance().addHistoryDataSetListener(this);

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

@@ -26 +26 @@
 import org.openstreetmap.josm.io.OsmServerHistoryReader;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.SAXException;
 
 /**
@@ -52 +53 @@
     private final Set<PrimitiveId> toLoad = new HashSet<>();
     private HistoryDataSet loadedData;
     private OsmServerHistoryReader reader;
+    private boolean getChangesetData = true;
 
     /**
      * Constructs a new {@code HistoryLoadTask}.
@@ -163 +165 @@
     @Override
     protected void realRun() throws SAXException, IOException, OsmTransferException {
         loadedData = new HistoryDataSet();
+        int ticks = toLoad.size();
+        if (getChangesetData)
+            ticks *= 2;
         try {
-            progressMonitor.setTicksCount(2 * toLoad.size());
+            progressMonitor.setTicksCount(ticks);
             for (PrimitiveId pid: toLoad) {
                 if (canceled) {
                     break;
@@ -183 +188 @@
         HistoryDataSet ds;
         try {
             reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
-            ds = loadHistory(reader, progressMonitor);
+            if (getChangesetData) {
+                ds = loadHistory(reader, progressMonitor);
+            } else {
+                ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
+            }
         } catch (OsmTransferException e) {
             if (canceled)
                 return;
@@ -195 +204 @@
     protected static HistoryDataSet loadHistory(OsmServerHistoryReader reader, ProgressMonitor progressMonitor) throws OsmTransferException {
         HistoryDataSet ds = reader.parseHistory(progressMonitor.createSubTaskMonitor(1, false));
         if (ds != null) {
+            Logging.warn("retrieving CS data!!!");
             // load corresponding changesets (mostly for changeset comment)
             OsmServerChangesetReader changesetReader = new OsmServerChangesetReader();
             List<Long> changesetIds = new ArrayList<>(ds.getChangesetIds());
@@ -240 +250 @@
     public Exception getLastException() {
         return lastException;
     }
+
+    /**
+     * Determine if changeset information is needed. By default it is retrieved.
+     * @param b false means don't retrieve changeset data.
+     */
+    public void setChangesetDataNeeded(boolean b) {
+        getChangesetData = b;
+    }
 }

src/org/openstreetmap/josm/io/OsmServerHistoryReader.java

@@ -59 +59 @@
     public HistoryDataSet parseHistory(ProgressMonitor progressMonitor) throws OsmTransferException {
         progressMonitor.beginTask("");
         try {
-            progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
             final String urlStr = primitiveType.getAPIName() + '/' + id + "/history";
+            progressMonitor.indeterminateSubTask(tr("Contacting OSM Server for {0}", urlStr));
 
             try (InputStream in = getInputStream(urlStr, progressMonitor.createSubTaskMonitor(1, true))) {
                 if (in == null)