Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java	(revision 12783)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java	(revision 12784)
@@ -50,26 +50,4 @@
 
     /**
-     * Lists default directories where the ntv2 shift files (NAD) for the proj4
-     * library would be located on different platforms.
-     */
-    public static final PlatformVisitor<List<File>> DEFAULT_PROJ4_NTV2_SHIFT_DIRS =
-            new PlatformVisitor<List<File>>() {
-        @Override
-        public List<File> visitUnixoid() {
-            return Arrays.asList(new File("/usr/local/share/proj"), new File("/usr/share/proj"));
-        }
-
-        @Override
-        public List<File> visitWindows() {
-            return Arrays.asList(new File("C:\\PROJ\\NAD"));
-        }
-
-        @Override
-        public List<File> visitOsx() {
-            return Collections.emptyList();
-        }
-    };
-
-    /**
      * Returns the actual {@link NTV2GridShiftFile} behind this wrapper.
      * The grid file is only loaded once, when first accessed.
@@ -87,7 +65,7 @@
                         instance = ntv2;
                         break;
-                     }
-                 }
-             }
+                    }
+                }
+            }
         }
         return instance;
Index: trunk/src/org/openstreetmap/josm/tools/Platform.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Platform.java	(revision 12783)
+++ trunk/src/org/openstreetmap/josm/tools/Platform.java	(revision 12784)
@@ -38,5 +38,5 @@
     };
 
-    private static Platform platform;
+    private static volatile Platform platform;
 
     /**