Changeset 34875 in osm for applications/editors/josm

Timestamp:

2019-01-31T16:53:52+01:00 (6 years ago)

Author:

gerdp

Message:

see #9860:

• don't change zoom for every downloaded element, only change it once when all is done
• fix more sonar issues

Location:

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete

Files:

• Undelete.java (modified) (1 diff)
• UndeleteAction.java (modified) (7 diffs)

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java

@@ -8 +8 @@
 
 /**
- * Create the undelete plugin.
+ * Undelete action allows to restore one or more deleted objects.
  */
 public class Undelete extends Plugin {
 
+    /**
+     * Create the undelete plugin.
+     * @param info plugin information
+     */
     public Undelete(PluginInformation info) {
         super(info);

applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteAction.java

@@ -89 +89 @@
                             // If the object is not deleted we get the real object
                             DownloadPrimitivesTask download = new DownloadPrimitivesTask(layer, Collections.singletonList(pid), true);
+                            download.setZoom(false);
                             download.run();
 
@@ -100 +101 @@
                                 hPrimitive2 = h.getByVersion(n - idx++);
                             }
-                            if (type.equals(OsmPrimitiveType.NODE)) {
+                            if (type == OsmPrimitiveType.NODE) {
                                 // We get version and user from the latest version,
                                 // coordinates and tags from n-1 version
@@ -111 +112 @@
 
                                 primitive = node;
-                            } else if (type.equals(OsmPrimitiveType.WAY)) {
+                            } else if (type == OsmPrimitiveType.WAY) {
                                 // We get version and user from the latest version,
                                 // nodes and tags from n-1 version
@@ -174 +175 @@
                                 restored.add(primitive);
                             } else {
-                              final String msg = OsmPrimitiveType.NODE.equals(type)
+                              final String msg = OsmPrimitiveType.NODE == type
                                   ? tr("Unable to undelete node {0}. Object has likely been redacted", id)
-                                  : OsmPrimitiveType.WAY.equals(type)
+                                  : OsmPrimitiveType.WAY == type
                                   ? tr("Unable to undelete way {0}. Object has likely been redacted", id)
-                                  : OsmPrimitiveType.RELATION.equals(type)
+                                  : OsmPrimitiveType.RELATION == type
                                   ? tr("Unable to undelete relation {0}. Object has likely been redacted", id)
                                   : null;
@@ -185 +186 @@
                             }
                         }
-                    } catch (Exception t) {
-                        Logging.error(t);
+                    } catch (Exception e) {
+                        Logging.error(e);
                     }
                 }
@@ -196 +197 @@
                 ((Way) parent).setNodes(nodes);
             }
-            if (!restored.isEmpty()) {
+            if (parent == null && !restored.isEmpty()) {
                 layer.data.setSelected(restored);
                 GuiHelper.runInEDT(() -> AutoScaleAction.autoScale(AutoScaleMode.SELECTION));
@@ -203 +204 @@
     }
 
+    /**
+     * Create undelete action.
+     */
     public UndeleteAction() {
         super(tr("Undelete object..."), "undelete", tr("Undelete object by id"),