Changeset 10436 in josm for trunk/src/org/openstreetmap/josm/gui/layer
- Timestamp:
- 2016-06-20T02:47:43+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r10395 r10436 821 821 gpxLayer.setAssociatedFile(new File(getAssociatedFile().getParentFile(), filename)); 822 822 } 823 Main. main.addLayer(gpxLayer);823 Main.getLayerManager().addLayer(gpxLayer); 824 824 if (Main.pref.getBoolean("marker.makeautomarkers", true) && !gpxData.waypoints.isEmpty()) { 825 Main. main.addLayer(new MarkerLayer(gpxData, tr("Converted from: {0}", getName()), null, gpxLayer));826 } 827 Main. main.removeLayer(OsmDataLayer.this);825 Main.getLayerManager().addLayer(new MarkerLayer(gpxData, tr("Converted from: {0}", getName()), null, gpxLayer)); 826 } 827 Main.getLayerManager().removeLayer(OsmDataLayer.this); 828 828 } 829 829 } -
trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
r10386 r10436 164 164 public void layerRemoving(LayerRemoveEvent e) { 165 165 if (e.getRemovedLayer() instanceof OsmDataLayer && Main.isDisplayingMapView() && !Main.main.hasEditLayer()) { 166 Main. main.removeLayer(this);166 Main.getLayerManager().removeLayer(this); 167 167 } else if (e.getRemovedLayer() == this) { 168 168 Main.getLayerManager().removeLayerChangeListener(this); -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
r10386 r10436 283 283 } 284 284 if (layer != null) { 285 Main. main.addLayer(layer);285 Main.getLayerManager().addLayer(layer); 286 286 287 287 if (!canceled && layer.data != null && !layer.data.isEmpty()) { -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
r9215 r10436 135 135 } 136 136 layer.setUploadDiscouraged(true); 137 Main. main.addLayer(layer);138 Main. main.removeLayer(this.layer);137 Main.getLayerManager().addLayer(layer); 138 Main.getLayerManager().removeLayer(this.layer); 139 139 } 140 140 } -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
r9243 r10436 115 115 importAudio(file, ml, firstStartTime, m); 116 116 } 117 Main. main.addLayer(ml);117 Main.getLayerManager().addLayer(ml); 118 118 Main.map.repaint(); 119 119 } -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
r8308 r10436 41 41 MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", layer.getName()), layer.getAssociatedFile(), layer); 42 42 if (!ml.data.isEmpty()) { 43 Main. main.addLayer(ml);43 Main.getLayerManager().addLayer(ml); 44 44 } 45 45 }
Note:
See TracChangeset
for help on using the changeset viewer.