Changeset 6365 in josm for trunk/src/org/openstreetmap/josm/command/ChangeCommand.java

Timestamp:

2013-11-05T01:53:15+01:00 (10 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - fix of recent violations

File:

• trunk/src/org/openstreetmap/josm/command/ChangeCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/ChangeCommand.java

@@ -18 +18 @@
 
 /**
- * Command that basically replaces one OSM primitive by another of the
- * same type.
+ * Command that basically replaces one OSM primitive by another of the same type.
  *
- * @author Imi
+ * @since 93
  */
 public class ChangeCommand extends Command {
@@ -45 +44 @@
         CheckParameterUtil.ensureParameterNotNull(osm, "osm");
         CheckParameterUtil.ensureParameterNotNull(newOsm, "newOsm");
-        if (newOsm instanceof Way) {
+        if (newOsm instanceof Way && ((Way)newOsm).getNodesCount() == 0) {
             // Do not allow to create empty ways (see #7465)
-            if (((Way)newOsm).getNodesCount() == 0) {
-                throw new IllegalArgumentException(tr("New way {0} has 0 nodes", newOsm));
-            }
+            throw new IllegalArgumentException(tr("New way {0} has 0 nodes", newOsm));
         }
     }
 
-    @Override public boolean executeCommand() {
+    @Override
+    public boolean executeCommand() {
         super.executeCommand();
         osm.cloneFrom(newOsm);
@@ -60 +58 @@
     }
 
-    @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+    @Override
+    public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
         modified.add(osm);
     }