Changeset 4869 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

Timestamp:

2012-01-24T21:52:43+01:00 (12 years ago)

Author:

jttt

Message:

Use final were appropriate

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (modified) (17 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.GridBagLayout;
-import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16 +14 @@
 import java.util.Map;
 import java.util.Set;
-
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 
 import org.openstreetmap.josm.Main;
@@ -35 +29 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -54 +47 @@
                     Math.round(o.getCoor().lat() / precision) * precision,
                     Math.round(o.getCoor().lon() / precision) * precision
-            );
+                    );
         }
 
@@ -82 +75 @@
     }
 
-    protected static int DUPLICATE_NODE = 1;
-    protected static int DUPLICATE_NODE_MIXED = 2;
-    protected static int DUPLICATE_NODE_OTHER = 3;
-    protected static int DUPLICATE_NODE_UNCLOSED = 4;
-    protected static int DUPLICATE_NODE_BUILDING = 10;
-    protected static int DUPLICATE_NODE_BOUNDARY = 11;
-    protected static int DUPLICATE_NODE_HIGHWAY = 12;
-    protected static int DUPLICATE_NODE_LANDUSE = 13;
-    protected static int DUPLICATE_NODE_NATURAL = 14;
-    protected static int DUPLICATE_NODE_POWER = 15;
-    protected static int DUPLICATE_NODE_RAILWAY = 16;
-    protected static int DUPLICATE_NODE_WATERWAY = 17;
+    protected final static int DUPLICATE_NODE = 1;
+    protected final static int DUPLICATE_NODE_MIXED = 2;
+    protected final static int DUPLICATE_NODE_OTHER = 3;
+    protected final static int DUPLICATE_NODE_UNCLOSED = 4;
+    protected final static int DUPLICATE_NODE_BUILDING = 10;
+    protected final static int DUPLICATE_NODE_BOUNDARY = 11;
+    protected final static int DUPLICATE_NODE_HIGHWAY = 12;
+    protected final static int DUPLICATE_NODE_LANDUSE = 13;
+    protected final static int DUPLICATE_NODE_NATURAL = 14;
+    protected final static int DUPLICATE_NODE_POWER = 15;
+    protected final static int DUPLICATE_NODE_RAILWAY = 16;
+    protected final static int DUPLICATE_NODE_WATERWAY = 17;
 
     /** The map of potential duplicates.
@@ -204 +197 @@
                             DUPLICATE_NODE_UNCLOSED,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (nbType>1) {
                     String msg = marktr("Mixed type duplicated nodes");
@@ -215 +208 @@
                             DUPLICATE_NODE_MIXED,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (typeMap.get("highway")) {
                     String msg = marktr("Highway duplicated nodes");
@@ -226 +219 @@
                             DUPLICATE_NODE_HIGHWAY,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (typeMap.get("railway")) {
                     String msg = marktr("Railway duplicated nodes");
@@ -237 +230 @@
                             DUPLICATE_NODE_RAILWAY,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (typeMap.get("waterway")) {
                     String msg = marktr("Waterway duplicated nodes");
@@ -248 +241 @@
                             DUPLICATE_NODE_WATERWAY,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (typeMap.get("boundary")) {
                     String msg = marktr("Boundary duplicated nodes");
@@ -259 +252 @@
                             DUPLICATE_NODE_BOUNDARY,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (typeMap.get("power")) {
                     String msg = marktr("Power duplicated nodes");
@@ -270 +263 @@
                             DUPLICATE_NODE_POWER,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (typeMap.get("natural")) {
                     String msg = marktr("Natural duplicated nodes");
@@ -281 +274 @@
                             DUPLICATE_NODE_NATURAL,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (typeMap.get("building")) {
                     String msg = marktr("Building duplicated nodes");
@@ -292 +285 @@
                             DUPLICATE_NODE_BUILDING,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else if (typeMap.get("landuse")) {
                     String msg = marktr("Landuse duplicated nodes");
@@ -303 +296 @@
                             DUPLICATE_NODE_LANDUSE,
                             mm.get(tagSet)
-                    ));
+                            ));
                 } else {
                     String msg = marktr("Other duplicated nodes");
@@ -314 +307 @@
                             DUPLICATE_NODE_OTHER,
                             mm.get(tagSet)
-                    ));
+                            ));
 
                 }
@@ -336 +329 @@
                         DUPLICATE_NODE,
                         duplicates
-                ));
+                        ));
             }
         }