Index: trunk/src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java	(revision 12794)
+++ trunk/src/org/openstreetmap/josm/data/coor/conversion/LatLonParser.java	(revision 12795)
@@ -54,4 +54,8 @@
         private double lat = Double.NaN;
         private double lon = Double.NaN;
+    }
+
+    private LatLonParser() {
+        // private constructor
     }
 
Index: trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java	(revision 12794)
+++ trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java	(revision 12795)
@@ -33,7 +33,7 @@
     public static final ProjectionCLI INSTANCE = new ProjectionCLI();
 
-    private boolean argInverse = false;
-    private boolean argSwitchInput = false;
-    private boolean argSwitchOutput = false;
+    private boolean argInverse = false;         // NOPMD
+    private boolean argSwitchInput = false;     // NOPMD
+    private boolean argSwitchOutput = false;    // NOPMD
 
     @Override
@@ -62,4 +62,6 @@
                 argSwitchOutput = true;
                 break;
+            default:
+                // ignore
             }
         }
@@ -127,6 +129,5 @@
                 "    EOF\n"+
                 "       => 1250371.1334500168 6545331.055189664\n" +
-                "          -1.3208998232319113E7 4486401.160664663\n" +
-                "";
+                "          -1.3208998232319113E7 4486401.160664663\n";
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 12794)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 12795)
@@ -978,10 +978,5 @@
         Main.toolbar = toolbar;
         ProjectionPreference.setProjection();
-        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
-                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_LOCAL,
-                NTV2Proj4DirGridShiftFileSource.getInstance());
-        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
-                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_DOWNLOAD,
-                JOSM_WEBSITE_NTV2_SOURCE);
+        setupNadGridSources();
         GuiHelper.translateJavaInternalMessages();
         preConstructorInit();
@@ -1037,4 +1032,17 @@
             RepaintManager.setCurrentManager(new CheckThreadViolationRepaintManager());
         }
+    }
+
+    /**
+     * Setup the sources for NTV2 grid shift files for projection support.
+     * @since 12795
+     */
+    public static void setupNadGridSources() {
+        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
+                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_LOCAL,
+                NTV2Proj4DirGridShiftFileSource.getInstance());
+        NTV2GridShiftFileWrapper.registerNTV2GridShiftFileSource(
+                NTV2GridShiftFileWrapper.NTV2_SOURCE_PRIORITY_DOWNLOAD,
+                JOSM_WEBSITE_NTV2_SOURCE);
     }
 
