Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java	(revision 8510)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java	(revision 8512)
@@ -16,34 +16,34 @@
      *  GPX does not place restrictions on the length of this field or the characters contained in it.
      *  It is up to the receiving application to validate the field before sending it to the GPS. */
-    public static final String GPX_NAME = "name";
+    String GPX_NAME = "name";
 
     /** GPS element comment. Sent to GPS as comment. */
-    public static final String GPX_CMT = "cmt";
+    String GPX_CMT = "cmt";
 
     /** Text description of the element. Holds additional information about the element intended for the user, not the GPS. */
-    public static final String GPX_DESC = "desc";
+    String GPX_DESC = "desc";
 
     /** Source of data. Included to give user some idea of reliability and accuracy of data. */
-    public static final String GPX_SRC = "src";
+    String GPX_SRC = "src";
 
-    public static final String META_PREFIX = "meta.";
-    public static final String META_AUTHOR_NAME = META_PREFIX + "author.name";
-    public static final String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
-    public static final String META_AUTHOR_LINK = META_PREFIX + "author.link";
-    public static final String META_COPYRIGHT_AUTHOR = META_PREFIX + "copyright.author";
-    public static final String META_COPYRIGHT_LICENSE = META_PREFIX + "copyright.license";
-    public static final String META_COPYRIGHT_YEAR = META_PREFIX + "copyright.year";
-    public static final String META_DESC = META_PREFIX + "desc";
-    public static final String META_KEYWORDS = META_PREFIX + "keywords";
-    public static final String META_LINKS = META_PREFIX + "links";
-    public static final String META_NAME = META_PREFIX + "name";
-    public static final String META_TIME = META_PREFIX + "time";
-    public static final String META_BOUNDS = META_PREFIX + "bounds";
-    public static final String META_EXTENSIONS = META_PREFIX + "extensions";
+    String META_PREFIX = "meta.";
+    String META_AUTHOR_NAME = META_PREFIX + "author.name";
+    String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
+    String META_AUTHOR_LINK = META_PREFIX + "author.link";
+    String META_COPYRIGHT_AUTHOR = META_PREFIX + "copyright.author";
+    String META_COPYRIGHT_LICENSE = META_PREFIX + "copyright.license";
+    String META_COPYRIGHT_YEAR = META_PREFIX + "copyright.year";
+    String META_DESC = META_PREFIX + "desc";
+    String META_KEYWORDS = META_PREFIX + "keywords";
+    String META_LINKS = META_PREFIX + "links";
+    String META_NAME = META_PREFIX + "name";
+    String META_TIME = META_PREFIX + "time";
+    String META_BOUNDS = META_PREFIX + "bounds";
+    String META_EXTENSIONS = META_PREFIX + "extensions";
 
-    public static final String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/gpx-extensions-1.0";
+    String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/gpx-extensions-1.0";
 
     /** Elevation (in meters) of the point. */
-    public static final String PT_ELE = "ele";
+    String PT_ELE = "ele";
 
     /** Creation/modification timestamp for the point.
@@ -51,43 +51,43 @@
      *  Conforms to ISO 8601 specification for date/time representation.
      *  Fractional seconds are allowed for millisecond timing in tracklogs. */
-    public static final String PT_TIME = "time";
+    String PT_TIME = "time";
 
     /** Magnetic variation (in degrees) at the point. 0.0 <= value < 360.0 */
-    public static final String PT_MAGVAR = "magvar";
+    String PT_MAGVAR = "magvar";
 
     /** Height, in meters, of geoid (mean sea level) above WGS-84 earth ellipsoid. (NMEA GGA message) */
-    public static final String PT_GEOIDHEIGHT = "geoidheight";
+    String PT_GEOIDHEIGHT = "geoidheight";
 
     /** Text of GPS symbol name. For interchange with other programs, use the exact spelling of the symbol on the GPS, if known. */
-    public static final String PT_SYM = "sym";
+    String PT_SYM = "sym";
 
     /** Type (textual classification) of element. */
-    public static final String PT_TYPE = "type";
+    String PT_TYPE = "type";
 
     /** Type of GPS fix. none means GPS had no fix. Value comes from list: {'none'|'2d'|'3d'|'dgps'|'pps'} */
-    public static final String PT_FIX = "fix";
+    String PT_FIX = "fix";
 
     /** Number of satellites used to calculate the GPS fix. (not number of satellites in view). */
-    public static final String PT_SAT = "sat";
+    String PT_SAT = "sat";
 
     /** Horizontal dilution of precision. */
-    public static final String PT_HDOP = "hdop";
+    String PT_HDOP = "hdop";
 
     /** Vertical dilution of precision. */
-    public static final String PT_VDOP = "vdop";
+    String PT_VDOP = "vdop";
 
     /** Position dilution of precision. */
-    public static final String PT_PDOP = "pdop";
+    String PT_PDOP = "pdop";
 
     /** Number of seconds since last DGPS update. */
-    public static final String PT_AGEOFDGPSDATA = "ageofdgpsdata";
+    String PT_AGEOFDGPSDATA = "ageofdgpsdata";
 
     /** Represents a differential GPS station. 0 <= value <= 1023 */
-    public static final String PT_DGPSID = "dgpsid";
+    String PT_DGPSID = "dgpsid";
 
     /**
      * Ordered list of all possible waypoint keys.
      */
-    public static List<String> WPT_KEYS = Arrays.asList(PT_ELE, PT_TIME, PT_MAGVAR, PT_GEOIDHEIGHT,
+    List<String> WPT_KEYS = Arrays.asList(PT_ELE, PT_TIME, PT_MAGVAR, PT_GEOIDHEIGHT,
             GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, PT_SYM, PT_TYPE,
             PT_FIX, PT_SAT, PT_HDOP, PT_VDOP, PT_PDOP, PT_AGEOFDGPSDATA, PT_DGPSID, META_EXTENSIONS);
@@ -96,5 +96,5 @@
      * Ordered list of all possible route and track keys.
      */
-    public static List<String> RTE_TRK_KEYS = Arrays.asList(
+    List<String> RTE_TRK_KEYS = Arrays.asList(
             GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, "number", PT_TYPE, META_EXTENSIONS);
 
@@ -102,4 +102,4 @@
      * Possible fix values.
      */
-    public static Collection<String> FIX_VALUES = Arrays.asList("none", "2d", "3d", "dgps", "pps");
+    Collection<String> FIX_VALUES = Arrays.asList("none", "2d", "3d", "dgps", "pps");
 }
