Changeset 12784 in josm for trunk


Ignore:
Timestamp:
2017-09-08T09:46:56+02:00 (8 years ago)
Author:
bastiK
Message:

see #15229 - minor cleanup

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFileWrapper.java

    r12783 r12784  
    5050
    5151    /**
    52      * Lists default directories where the ntv2 shift files (NAD) for the proj4
    53      * library would be located on different platforms.
    54      */
    55     public static final PlatformVisitor<List<File>> DEFAULT_PROJ4_NTV2_SHIFT_DIRS =
    56             new PlatformVisitor<List<File>>() {
    57         @Override
    58         public List<File> visitUnixoid() {
    59             return Arrays.asList(new File("/usr/local/share/proj"), new File("/usr/share/proj"));
    60         }
    61 
    62         @Override
    63         public List<File> visitWindows() {
    64             return Arrays.asList(new File("C:\\PROJ\\NAD"));
    65         }
    66 
    67         @Override
    68         public List<File> visitOsx() {
    69             return Collections.emptyList();
    70         }
    71     };
    72 
    73     /**
    7452     * Returns the actual {@link NTV2GridShiftFile} behind this wrapper.
    7553     * The grid file is only loaded once, when first accessed.
    … …  
    8765                        instance = ntv2;
    8866                        break;
    89                      }
    90                  }
    91              }
     67                    }
     68                }
     69            }
    9270        }
    9371        return instance;

  • trunk/src/org/openstreetmap/josm/tools/Platform.java

    r12781 r12784  
    3838    };
    3939
    40     private static Platform platform;
     40    private static volatile Platform platform;
    4141
    4242    /**
Note: See TracChangeset for help on using the changeset viewer.