Changeset 11087 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java

Timestamp:

2016-10-07T10:20:53+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1141 - Try-catch blocks should not be nested

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java (modified) (2 diffs)

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

@@ -171 +171 @@
                     break;
                 }
-                String msg = getLoadingMessage(pid);
-                progressMonitor.indeterminateSubTask(tr(msg, Long.toString(pid.getUniqueId())));
-                reader = null;
-                HistoryDataSet ds;
-                try {
-                    reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
-                    ds = loadHistory(reader, progressMonitor);
-                } catch (OsmTransferException e) {
-                    if (canceled)
-                        return;
-                    throw e;
-                }
-                loadedData.mergeInto(ds);
+                loadHistory(pid);
             }
         } catch (OsmTransferException e) {
@@ -189 +177 @@
             return;
         }
+    }
+
+    private void loadHistory(PrimitiveId pid) throws OsmTransferException {
+        String msg = getLoadingMessage(pid);
+        progressMonitor.indeterminateSubTask(tr(msg, Long.toString(pid.getUniqueId())));
+        reader = null;
+        HistoryDataSet ds;
+        try {
+            reader = new OsmServerHistoryReader(pid.getType(), pid.getUniqueId());
+            ds = loadHistory(reader, progressMonitor);
+        } catch (OsmTransferException e) {
+            if (canceled)
+                return;
+            throw e;
+        }
+        loadedData.mergeInto(ds);
     }