Changeset 32543 in osm

Timestamp:

2016-07-03T12:23:25+02:00 (9 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/buildings_tools

Files:

• .checkstyle (added)
• .project (modified) (1 diff)
• src/buildings_tools/Building.java (modified) (3 diffs)
• src/buildings_tools/DrawBuildingAction.java (modified) (1 diff)
• src/buildings_tools/MergeAddrPointsAction.java (modified) (2 diffs)

applications/editors/josm/plugins/buildings_tools/.project

@@ -17 +17 @@
                         </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>

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java

@@ -80 +80 @@
         len = 0;
 
-        for (int i = 0; i < 4; i++)
+        for (int i = 0; i < 4; i++) {
             en[i] = null;
+        }
     }
 
@@ -104 +105 @@
 
     /**
+     * @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 +115 @@
 
     /**
+     * @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) {

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java

@@ -301 +301 @@
             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);

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/MergeAddrPointsAction.java

@@ -60 +60 @@
         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 +134 @@
         }
         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)