Changeset 4869 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

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

Author:

jttt

Message:

Use final were appropriate

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ExtensionFileFilter.java (modified) (3 diffs)
• SimplifyWayAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -26 +26 @@
      * list of supported formats
      */
-    public static ArrayList<FileImporter> importers;
-
-    public static ArrayList<FileExporter> exporters;
+    public static final ArrayList<FileImporter> importers;
+
+    public static final ArrayList<FileExporter> exporters;
 
     // add some file types only if the relevant classes are there;
@@ -88 +88 @@
                     }
                 }
-        );
+                );
     }
 
@@ -198 +198 @@
             if (name.endsWith("."+ext))
                 return true;
-        return false;
+                return false;
     }
 

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -51 +51 @@
                 JOptionPane.WARNING_MESSAGE,
                 HelpUtil.ht("/Action/SimplifyWay#SelectAWayToSimplify")
-        );
+                );
     }
 
@@ -61 +61 @@
                         tr("Simplify all selected ways"),
                         null
-                ),
-                new ButtonSpec(
-                        tr("Cancel"),
-                        ImageProvider.get("cancel"),
-                        tr("Cancel operation"),
-                        null
-                )
+                        ),
+                        new ButtonSpec(
+                                tr("Cancel"),
+                                ImageProvider.get("cancel"),
+                                tr("Cancel operation"),
+                                null
+                                )
         };
         int ret = HelpAwareOptionPane.showOptionDialog(
@@ -74 +74 @@
                         "The selection contains {0} ways. Are you sure you want to simplify them all?",
                         numWays
-                ),
-                tr("Simplify ways?"),
-                JOptionPane.WARNING_MESSAGE,
-                null, // no special icon
-                options,
-                options[0],
-                HelpUtil.ht("/Action/SimplifyWay#ConfirmSimplifyAll")
-        );
+                        ),
+                        tr("Simplify ways?"),
+                        JOptionPane.WARNING_MESSAGE,
+                        null, // no special icon
+                        options,
+                        options[0],
+                        HelpUtil.ht("/Action/SimplifyWay#ConfirmSimplifyAll")
+                );
         return ret == 0;
     }
@@ -94 +94 @@
                 alertSelectAtLeastOneWay();
                 return;
-            } else if (!confirmWayWithNodesOutsideBoundingBox(ways)) {
+            } else if (!confirmWayWithNodesOutsideBoundingBox(ways))
                 return;
-            }
-             else if (ways.size() > 10) {
+            else if (ways.size() > 10) {
                 if (!confirmSimplifyManyWays(ways.size()))
                     return;
@@ -114 +113 @@
                     trn("Simplify {0} way", "Simplify {0} ways", allCommands.size(), allCommands.size()),
                     allCommands
-            );
+                    );
             Main.main.undoRedo.add(rootCommand);
         } finally {
@@ -235 +234 @@
     }
 
-    public static double EARTH_RAD = 6378137.0;
+    public static final double EARTH_RAD = 6378137.0;
 
     /* From Aviaton Formulary v1.3