Changeset 12636 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2017-08-24T22:53:50+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/GpxExporter.java
r12620 r12636 28 28 import org.openstreetmap.josm.data.gpx.GpxData; 29 29 import org.openstreetmap.josm.gui.ExtendedDialog; 30 import org.openstreetmap.josm.gui.MainApplication; 30 31 import org.openstreetmap.josm.gui.layer.GpxLayer; 31 32 import org.openstreetmap.josm.gui.layer.Layer; … … 172 173 gpxData = ((GpxLayer) layer).data; 173 174 } else { 174 gpxData = OsmDataLayer.toGpxData(Main .getLayerManager().getEditDataSet(), file);175 gpxData = OsmDataLayer.toGpxData(MainApplication.getLayerManager().getEditDataSet(), file); 175 176 } 176 177 -
trunk/src/org/openstreetmap/josm/io/GpxImporter.java
r12620 r12636 13 13 import org.openstreetmap.josm.actions.ExtensionFileFilter; 14 14 import org.openstreetmap.josm.data.gpx.GpxData; 15 import org.openstreetmap.josm.gui.MainApplication; 15 16 import org.openstreetmap.josm.gui.layer.GpxLayer; 16 17 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; … … 120 121 GuiHelper.runInEDT(() -> { 121 122 if (data.markerLayer != null) { 122 Main .getLayerManager().addLayer(data.markerLayer);123 MainApplication.getLayerManager().addLayer(data.markerLayer); 123 124 } 124 125 if (data.gpxLayer != null) { 125 Main .getLayerManager().addLayer(data.gpxLayer);126 MainApplication.getLayerManager().addLayer(data.gpxLayer); 126 127 } 127 128 data.postLayerTask.run(); -
trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
r12421 r12636 14 14 import org.openstreetmap.josm.actions.ExtensionFileFilter; 15 15 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 16 import org.openstreetmap.josm.gui.MainApplication; 16 17 import org.openstreetmap.josm.gui.Notification; 17 18 import org.openstreetmap.josm.gui.layer.GpxLayer; … … 52 53 53 54 GuiHelper.runInEDT(() -> { 54 Main .getLayerManager().addLayer(gpxLayer);55 MainApplication.getLayerManager().addLayer(gpxLayer); 55 56 if (Main.pref.getBoolean("marker.makeautomarkers", true)) { 56 57 MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), fileFinal, gpxLayer); 57 58 if (!ml.data.isEmpty()) { 58 Main .getLayerManager().addLayer(ml);59 MainApplication.getLayerManager().addLayer(ml); 59 60 } 60 61 } -
trunk/src/org/openstreetmap/josm/io/NoteImporter.java
r12630 r12636 9 9 import java.util.List; 10 10 11 import org.openstreetmap.josm.Main;12 11 import org.openstreetmap.josm.actions.ExtensionFileFilter; 13 12 import org.openstreetmap.josm.data.notes.Note; … … 39 38 try (InputStream is = Compression.getUncompressedFileInputStream(file)) { 40 39 final NoteLayer layer = loadLayer(is, file, file.getName(), progressMonitor); 41 if (!Main .getLayerManager().containsLayer(layer)) {42 Main .getLayerManager().addLayer(layer);40 if (!MainApplication.getLayerManager().containsLayer(layer)) { 41 MainApplication.getLayerManager().addLayer(layer); 43 42 } 44 43 } catch (SAXException e) { … … 65 64 List<NoteLayer> noteLayers = null; 66 65 if (MainApplication.getMap() != null) { 67 noteLayers = Main .getLayerManager().getLayersOfType(NoteLayer.class);66 noteLayers = MainApplication.getLayerManager().getLayersOfType(NoteLayer.class); 68 67 } 69 68 final NoteLayer layer; -
trunk/src/org/openstreetmap/josm/io/OsmApi.java
r12630 r12636 243 243 * been disabled! */ 244 244 if (MainApplication.isDisplayingMapView()) { 245 for (Layer l : Main .getLayerManager().getLayersOfType(ImageryLayer.class)) {245 for (Layer l : MainApplication.getLayerManager().getLayersOfType(ImageryLayer.class)) { 246 246 if (((ImageryLayer) l).getInfo().isBlacklisted()) { 247 247 Logging.info(tr("Removed layer {0} because it is not allowed by the configured API.", l.getName())); 248 Main .getLayerManager().removeLayer(l);248 MainApplication.getLayerManager().removeLayer(l); 249 249 } 250 250 } -
trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java
r12620 r12636 14 14 import org.openstreetmap.josm.actions.ExtensionFileFilter; 15 15 import org.openstreetmap.josm.data.osm.DataSet; 16 import org.openstreetmap.josm.gui.MainApplication; 16 17 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 17 18 import org.openstreetmap.josm.gui.progress.ProgressMonitor; … … 66 67 JOptionPane.INFORMATION_MESSAGE); 67 68 } 68 Main .getLayerManager().addLayer(layer);69 MainApplication.getLayerManager().addLayer(layer); 69 70 layer.onPostLoadFromFile(); 70 71 }); -
trunk/src/org/openstreetmap/josm/io/OsmImporter.java
r12620 r12636 15 15 import org.openstreetmap.josm.actions.ExtensionFileFilter; 16 16 import org.openstreetmap.josm.data.osm.DataSet; 17 import org.openstreetmap.josm.gui.MainApplication; 17 18 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 18 19 import org.openstreetmap.josm.gui.progress.ProgressMonitor; … … 99 100 GuiHelper.runInEDT(() -> { 100 101 OsmDataLayer layer = data.getLayer(); 101 Main .getLayerManager().addLayer(layer);102 MainApplication.getLayerManager().addLayer(layer); 102 103 data.getPostLayerTask().run(); 103 104 data.getLayer().onPostLoadFromFile(); -
trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java
r12630 r12636 11 11 import java.util.Map; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.actions.ExtensionFileFilter; 15 14 import org.openstreetmap.josm.data.Preferences; … … 87 86 // FIXME: remove UI stuff from IO subsystem 88 87 GuiHelper.runInEDT(() -> { 89 Main .getLayerManager().addLayer(layer);88 MainApplication.getLayerManager().addLayer(layer); 90 89 if (zoomTo != null) { 91 90 MainApplication.getMap().mapView.zoomTo(zoomTo); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java
r12542 r12636 32 32 import org.openstreetmap.josm.data.osm.OsmPrimitive; 33 33 import org.openstreetmap.josm.gui.ExtendedDialog; 34 import org.openstreetmap.josm.gui.MainApplication; 34 35 import org.openstreetmap.josm.gui.util.GuiHelper; 35 36 import org.openstreetmap.josm.gui.util.TableHelper; … … 251 252 protected void buttonAction(int buttonIndex, ActionEvent evt) { 252 253 // if layer all layers were closed, ignore all actions 253 if (buttonIndex != 2 && Main .getLayerManager().getEditDataSet() != null) {254 if (buttonIndex != 2 && MainApplication.getLayerManager().getEditDataSet() != null) { 254 255 TableModel tm = propertyTable.getModel(); 255 256 for (int i = 0; i < tm.getRowCount(); i++) { … … 309 310 public static void addTags(String[][] keyValue, String sender, Collection<? extends OsmPrimitive> primitives) { 310 311 if (trustedSenders.contains(sender)) { 311 if (Main .getLayerManager().getEditDataSet() != null) {312 if (MainApplication.getLayerManager().getEditDataSet() != null) { 312 313 for (String[] row : keyValue) { 313 314 Main.main.undoRedo.add(new ChangePropertyCommand(primitives, row[0], row[1])); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
r12630 r12636 102 102 } 103 103 104 Main .getLayerManager().getEditDataSet().setSelected(node);104 MainApplication.getLayerManager().getEditDataSet().setSelected(node); 105 105 if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) { 106 106 AutoScaleAction.autoScale("selection"); … … 120 120 throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+')', e); 121 121 } 122 if (Main .getLayerManager().getEditLayer() == null) {122 if (MainApplication.getLayerManager().getEditLayer() == null) { 123 123 throw new RequestHandlerBadRequestException(tr("There is no layer opened to add node")); 124 124 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
r12630 r12636 111 111 throw new RequestHandlerBadRequestException(tr("One node ways")); 112 112 } 113 if (Main .getLayerManager().getEditLayer() == null) {113 if (MainApplication.getLayerManager().getEditLayer() == null) { 114 114 throw new RequestHandlerBadRequestException(tr("There is no layer opened to add way")); 115 115 } … … 168 168 commands.add(new AddCommand(way)); 169 169 Main.main.undoRedo.add(new SequenceCommand(tr("Add way"), commands)); 170 Main .getLayerManager().getEditDataSet().setSelected(way);170 MainApplication.getLayerManager().getEditDataSet().setSelected(way); 171 171 if (PermissionPrefWithDefault.CHANGE_VIEWPORT.isAllowed()) { 172 172 AutoScaleAction.autoScale("selection"); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
r12630 r12636 6 6 import java.util.Arrays; 7 7 8 import org.openstreetmap.josm.Main;9 8 import org.openstreetmap.josm.data.imagery.ImageryInfo; 10 9 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; … … 97 96 final ImageryInfo imgInfo = buildImageryInfo(); 98 97 if (MainApplication.isDisplayingMapView()) { 99 for (ImageryLayer layer : Main .getLayerManager().getLayersOfType(ImageryLayer.class)) {98 for (ImageryLayer layer : MainApplication.getLayerManager().getLayersOfType(ImageryLayer.class)) { 100 99 if (layer.getInfo().equals(imgInfo)) { 101 100 Logging.info("Imagery layer already exists: "+imgInfo); … … 106 105 GuiHelper.runInEDT(() -> { 107 106 try { 108 Main .getLayerManager().addLayer(ImageryLayer.create(imgInfo));107 MainApplication.getLayerManager().addLayer(ImageryLayer.create(imgInfo)); 109 108 } catch (IllegalArgumentException e) { 110 109 Logging.log(Logging.LEVEL_ERROR, e); -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java
r12634 r12636 12 12 import java.util.concurrent.Future; 13 13 14 import org.openstreetmap.josm.Main;15 14 import org.openstreetmap.josm.actions.AutoScaleAction; 16 15 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; … … 123 122 // find out whether some data has already been downloaded 124 123 Area present = null; 125 DataSet ds = Main .getLayerManager().getEditDataSet();124 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 126 125 if (ds != null) { 127 126 present = ds.getDataSourceArea(); … … 160 159 if (args.containsKey("addtags")) { 161 160 GuiHelper.executeByMainWorkerInEDT(() -> { 162 DataSet ds = Main .getLayerManager().getEditDataSet();161 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 163 162 if (ds == null) // e.g. download failed 164 163 return; … … 173 172 GuiHelper.executeByMainWorkerInEDT(() -> { 174 173 Set<OsmPrimitive> newSel = new HashSet<>(); 175 DataSet ds = Main .getLayerManager().getEditDataSet();174 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 176 175 if (ds == null) // e.g. download failed 177 176 return; … … 197 196 final SearchCompiler.Match search = SearchCompiler.compile(args.get("search")); 198 197 MainApplication.worker.submit(() -> { 199 final DataSet ds = Main .getLayerManager().getEditDataSet();198 final DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 200 199 final Collection<OsmPrimitive> filteredPrimitives = SubclassFilteredCollection.filter(ds.allPrimitives(), search); 201 200 ds.setSelected(filteredPrimitives); … … 215 214 if (args.containsKey("changeset_comment") || args.containsKey("changeset_source")) { 216 215 MainApplication.worker.submit(() -> { 217 if (Main .getLayerManager().getEditDataSet() != null) {216 if (MainApplication.getLayerManager().getEditDataSet() != null) { 218 217 if (args.containsKey("changeset_comment")) { 219 Main .getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment"));218 MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("comment", args.get("changeset_comment")); 220 219 } 221 220 if (args.containsKey("changeset_source")) { 222 Main .getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source"));221 MainApplication.getLayerManager().getEditDataSet().addChangeSetTag("source", args.get("changeset_source")); 223 222 } 224 223 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java
r12634 r12636 9 9 import java.util.List; 10 10 11 import org.openstreetmap.josm.Main;12 11 import org.openstreetmap.josm.data.osm.DataSet; 13 12 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 72 71 MainApplication.worker.submit(() -> { 73 72 final List<PrimitiveId> downloaded = task.getDownloadedId(); 74 final DataSet ds = Main .getLayerManager().getEditDataSet();73 final DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 75 74 if (downloaded != null) { 76 75 GuiHelper.runInEDT(() -> ds.setSelected(downloaded)); -
trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java
r10364 r12636 17 17 import javax.swing.SwingConstants; 18 18 19 import org.openstreetmap.josm.Main;20 19 import org.openstreetmap.josm.data.gpx.GpxData; 20 import org.openstreetmap.josm.gui.MainApplication; 21 21 import org.openstreetmap.josm.gui.layer.Layer; 22 22 import org.openstreetmap.josm.gui.layer.markerlayer.Marker; … … 44 44 public Collection<Layer> getDependencies() { 45 45 Layer gpxLayer = layer.fromLayer; 46 if (gpxLayer != null && Main .getLayerManager().containsLayer(gpxLayer))46 if (gpxLayer != null && MainApplication.getLayerManager().containsLayer(gpxLayer)) 47 47 return Collections.singleton(gpxLayer); 48 48 return Collections.emptySet();
Note:
See TracChangeset
for help on using the changeset viewer.