Changeset 8836 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2015-10-08T00:22:36+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java
r8510 r8836 31 31 public static final String ERROR_HEADER_PATTERN = "The changeset (\\d+) was closed at (.*)"; 32 32 33 public staticenum Source {33 public enum Source { 34 34 /** 35 35 * The exception was thrown when a changeset was updated. This most likely means -
trunk/src/org/openstreetmap/josm/io/GeoJSONWriter.java
r8813 r8836 81 81 private final JsonObjectBuilder geomObj; 82 82 83 publicGeometryPrimitiveVisitor(JsonObjectBuilder geomObj) {83 GeometryPrimitiveVisitor(JsonObjectBuilder geomObj) { 84 84 this.geomObj = geomObj; 85 85 } -
trunk/src/org/openstreetmap/josm/io/NmeaReader.java
r8510 r8836 31 31 32 32 /** Handler for the different types that NMEA speaks. */ 33 public staticenum NMEA_TYPE {33 public enum NMEA_TYPE { 34 34 35 35 /** RMC = recommended minimum sentence C. */ … … 58 58 59 59 // GPVTG 60 public staticenum GPVTG {60 public enum GPVTG { 61 61 COURSE(1), COURSE_REF(2), // true course 62 62 COURSE_M(3), COURSE_M_REF(4), // magnetic course … … 73 73 74 74 // The following only applies to GPRMC 75 public staticenum GPRMC {75 public enum GPRMC { 76 76 TIME(1), 77 77 /** Warning from the receiver (A = data ok, V = warning) */ … … 97 97 98 98 // The following only applies to GPGGA 99 public staticenum GPGGA {99 public enum GPGGA { 100 100 TIME(1), LATITUDE(2), LATITUDE_NAME(3), LONGITUDE(4), LONGITUDE_NAME(5), 101 101 /** … … 116 116 } 117 117 118 public staticenum GPGSA {118 public enum GPGSA { 119 119 AUTOMATIC(1), 120 120 FIX_TYPE(2), // 1 = not fixed, 2 = 2D fixed, 3 = 3D fixed) -
trunk/src/org/openstreetmap/josm/io/OsmApi.java
r8510 r8836 168 168 private boolean fastFail; 169 169 170 publicCapabilitiesCache(ProgressMonitor monitor, boolean fastFail) {170 CapabilitiesCache(ProgressMonitor monitor, boolean fastFail) { 171 171 super(CAPABILITIES + getBaseUrl().hashCode(), CacheCustomContent.INTERVAL_WEEKLY); 172 172 this.monitor = monitor; -
trunk/src/org/openstreetmap/josm/io/OsmReader.java
r8582 r8836 544 544 private static class OsmParsingException extends XMLStreamException { 545 545 546 publicOsmParsingException(String msg, Location location) {546 OsmParsingException(String msg, Location location) { 547 547 super(msg); /* cannot use super(msg, location) because it messes with the message preventing localization */ 548 548 this.location = location; 549 549 } 550 550 551 publicOsmParsingException(String msg, Location location, Throwable th) {551 OsmParsingException(String msg, Location location, Throwable th) { 552 552 super(msg, th); 553 553 this.location = location; … … 580 580 * @param location The parser location 581 581 */ 582 publicOsmParsingCanceledException(String msg, Location location) {582 OsmParsingCanceledException(String msg, Location location) { 583 583 super(msg, location); 584 584 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
r8540 r8836 59 59 private int num; 60 60 61 publicDeleteTagMarker(int num) {61 DeleteTagMarker(int num) { 62 62 this.num = num; 63 63 } … … 76 76 private final Map<String, Integer> valueCount; 77 77 78 publicExistingValues(String tag) {78 ExistingValues(String tag) { 79 79 this.tag = tag; 80 80 this.valueCount = new HashMap<>(); … … 159 159 tm.setValueAt(tags[i][0], i, 1); 160 160 tm.setValueAt(tags[i][1].isEmpty() ? new DeleteTagMarker(count[i]) : tags[i][1], i, 2); 161 tm.setValueAt(old 161 tm.setValueAt(old, i, 3); 162 162 } 163 163 … … 226 226 } 227 227 }); 228 tablePanel.add(c 228 tablePanel.add(c, GBC.eol().insets(20, 10, 0, 0)); 229 229 } 230 230 setContent(tablePanel); -
trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
r8510 r8836 62 62 63 63 private class LayerSaveAction extends AbstractAction { 64 publicLayerSaveAction() {64 LayerSaveAction() { 65 65 putValue(SMALL_ICON, new ImageProvider("save").setWidth(16).get()); 66 66 putValue(SHORT_DESCRIPTION, layer.requiresSaveToFile() ? -
trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java
r8625 r8836 52 52 53 53 static { 54 registerSessionLayerExporter(OsmDataLayer.class 55 registerSessionLayerExporter(TMSLayer.class 56 registerSessionLayerExporter(WMSLayer.class 57 registerSessionLayerExporter(WMTSLayer.class 58 registerSessionLayerExporter(GpxLayer.class 59 registerSessionLayerExporter(GeoImageLayer.class 54 registerSessionLayerExporter(OsmDataLayer.class, OsmDataSessionExporter.class); 55 registerSessionLayerExporter(TMSLayer.class, ImagerySessionExporter.class); 56 registerSessionLayerExporter(WMSLayer.class, ImagerySessionExporter.class); 57 registerSessionLayerExporter(WMTSLayer.class, ImagerySessionExporter.class); 58 registerSessionLayerExporter(GpxLayer.class, GpxTracksSessionExporter.class); 59 registerSessionLayerExporter(GeoImageLayer.class, GeoImageSessionExporter.class); 60 60 registerSessionLayerExporter(MarkerLayer.class, MarkerSessionExporter.class); 61 61 }
Note:
See TracChangeset
for help on using the changeset viewer.