Index: applications/editors/josm/plugins/buildings_tools/.checkstyle
===================================================================
--- applications/editors/josm/plugins/buildings_tools/.checkstyle	(revision 32543)
+++ applications/editors/josm/plugins/buildings_tools/.checkstyle	(revision 32543)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="JOSM" location="/JOSM/tools/checkstyle/josm_checks.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="JOSM" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="DerivedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="data"/>
+    <filter-data value="images"/>
+    <filter-data value="styles"/>
+    <filter-data value="resources"/>
+    <filter-data value="scripts"/>
+  </filter>
+</fileset-config>
Index: applications/editors/josm/plugins/buildings_tools/.project
===================================================================
--- applications/editors/josm/plugins/buildings_tools/.project	(revision 32542)
+++ applications/editors/josm/plugins/buildings_tools/.project	(revision 32543)
@@ -17,7 +17,13 @@
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>
Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java	(revision 32542)
+++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java	(revision 32543)
@@ -80,6 +80,7 @@
         len = 0;
 
-        for (int i = 0; i < 4; i++)
+        for (int i = 0; i < 4; i++) {
             en[i] = null;
+        }
     }
 
@@ -104,6 +105,7 @@
 
     /**
+     * @param p
+     *            The point to project
      * @return Projection of the point to the heading vector in metres
-     * @param p The point to project
      */
     private double projection1(EastNorth p) {
@@ -113,7 +115,8 @@
 
     /**
+     * @param p
+     *            The point to project
      * @return Projection of the point to the perpendicular of the heading
-     *          vector in metres
-     * @param p The point to project
+     *         vector in metres
      */
     private double projection2(EastNorth p) {
Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java	(revision 32542)
+++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java	(revision 32543)
@@ -301,6 +301,7 @@
             if (w != null) {
                 if (!alt || ToolSettings.isUsingAddr())
-                    for (Entry<String, String> kv : ToolSettings.getTags().entrySet())
+                    for (Entry<String, String> kv : ToolSettings.getTags().entrySet()) {
                         w.put(kv.getKey(), kv.getValue());
+                    }
                 if (ToolSettings.isUsingAddr())
                     showAddrDialog(w);
Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/MergeAddrPointsAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/MergeAddrPointsAction.java	(revision 32542)
+++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/MergeAddrPointsAction.java	(revision 32543)
@@ -60,14 +60,16 @@
         for (OsmPrimitive p : selection) {
             if (p.getType() == OsmPrimitiveType.NODE) {
-                for (OsmPrimitive r : p.getReferrers())
+                for (OsmPrimitive r : p.getReferrers()) {
                     if (r.getType() == OsmPrimitiveType.WAY)
                        continue scanSelection; // Don't use nodes if they're referenced by ways
-                for (String key : p.getKeys().keySet())
+                }
+                for (String key : p.getKeys().keySet()) {
                     if (key.startsWith("addr:")) {
-                        addrNodes.add((Node)p); // Found address node
+                        addrNodes.add((Node) p); // Found address node
                         break;
                     }
+                }
             } else if (p.getType() == OsmPrimitiveType.WAY && p.getKeys().containsKey("building"))
-                buildings.add((Way)p);
+                buildings.add((Way) p);
         }
         if (addrNodes.isEmpty()) {
@@ -132,8 +134,10 @@
         }
         if (multi != 0)
-            new Notification(trn("There is {0} building with multiple address nodes inside", "There are {0} buildings with multiple address nodes inside", multi, multi))
+            new Notification(trn("There is {0} building with multiple address nodes inside",
+                    "There are {0} buildings with multiple address nodes inside", multi, multi))
                     .setIcon(JOptionPane.WARNING_MESSAGE).show();
         if (conflicts != 0)
-            new Notification(trn("There is {0} building with address conflicts", "There are {0} buildings with address conflicts", conflicts, conflicts))
+            new Notification(trn("There is {0} building with address conflicts",
+                            "There are {0} buildings with address conflicts", conflicts, conflicts))
                     .setIcon(JOptionPane.WARNING_MESSAGE).show();
         if (cmds.isEmpty() && multi == 0 && conflicts == 0)