Mass edit for formatting

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>

src/main/java/org/openstreetmap/josm/plugins/rapid/RapiDPreferences.java

@@ -17,7 +17,6 @@ import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.plugins.rapid.backend.RapiDDataUtils;
 
 public class RapiDPreferences implements SubPreferenceSetting {
-
     private final JLabel rapidApiUrl = new JLabel(tr("RapiD API URL"));
     private final JComboBox<String> possibleRapidApiUrl = new JComboBox<>();
 
@@ -79,5 +78,4 @@ public class RapiDPreferences implements SubPreferenceSetting {
     public TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui) {
         return gui.getPluginPreference();
     }
-
 }

src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDAction.java

@@ -18,6 +18,8 @@ public class RapiDAction extends JosmAction {
     /** UID */
     private static final long serialVersionUID = 8886705479253246588L;
 
+    private static final Object layerLock = new Object();
+
     public RapiDAction() {
         super(RapiDPlugin.NAME, null, tr("Get data from RapiD"),
                 Shortcut.registerShortcut("data:rapid", tr("Data: {0}", tr("RapiD")), KeyEvent.VK_R, Shortcut.SHIFT),
@@ -83,7 +85,7 @@ public class RapiDAction extends JosmAction {
                 final DataSet newData = RapiDDataUtils.getData(bound.toBBox());
                 /* Microsoft buildings don't have a source, so we add one */
                 RapiDDataUtils.addSourceTags(newData, "building", "Microsoft");
-				synchronized (layer) {
+                synchronized (layerLock) {
                     layer.unlock();
                     layer.mergeFrom(newData);
                     layer.lock();

src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDAddCommand.java

@@ -235,5 +235,4 @@ public class RapiDAddCommand extends Command {
         // TODO Auto-generated method stub
 
     }
-
 }