Changeset 8342 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2015-05-09T12:49:35+02:00 (9 years ago)

Author:

Don-vip

Message:

code style - Close curly brace and the next "else", "catch" and "finally" keywords should be located on the same line

File:

• trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (modified) (4 diffs)

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

@@ -97 +97 @@
                         // new value is null and tag exists (will delete tag)
                         modified = true;
-                }
-                else if (oldVal == null || !newVal.equals(oldVal))
+                } else if (oldVal == null || !newVal.equals(oldVal))
                     // new value is not null and is different from current value
                     modified = true;
@@ -121 +120 @@
                         if (oldVal != null)
                             osm.remove(tag.getKey());
-                    }
-                    else if (oldVal == null || !newVal.equals(oldVal))
+                    } else if (oldVal == null || !newVal.equals(oldVal))
                         osm.put(tag.getKey(), newVal);
                 }
@@ -130 +128 @@
             }
             return true;
-        }
-        finally {
+        } finally {
             Main.main.getCurrentDataSet().endUpdate();
         }
@@ -171 +168 @@
                 text = trn("Set {0}={1} for {2} object", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
             }
-        }
-        else {
+        } else {
             boolean allnull = true;
             for (Map.Entry<String, String> tag : this.tags.entrySet()) {