Index: applications/editors/josm/plugins/CommandLine/src/CommandLine/OsmToCmd.java =================================================================== --- applications/editors/josm/plugins/CommandLine/src/CommandLine/OsmToCmd.java (revision 30144) +++ applications/editors/josm/plugins/CommandLine/src/CommandLine/OsmToCmd.java (revision 30145) @@ -250,5 +250,5 @@ else if (currentPrimitive.isModified()) { //System.out.println(String.valueOf(currentPrimitive.getUniqueId()) + " IS MODIFIED BY SCRIPT"); - cmds.add(new ChangeCommand(Main.map.mapView.getEditLayer(), targetDataSet.getPrimitiveById(currentPrimitive.getPrimitiveId()), currentPrimitive)); + cmds.add(new ChangeCommand(Main.main.getEditLayer(), targetDataSet.getPrimitiveById(currentPrimitive.getPrimitiveId()), currentPrimitive)); } else if (currentPrimitive.isNew()) { @@ -262,5 +262,5 @@ } else if (currentPrimitive.isModified()) { - cmds.add(new ChangeCommand(Main.map.mapView.getEditLayer(), targetDataSet.getPrimitiveById(currentPrimitive.getPrimitiveId()), currentPrimitive)); + cmds.add(new ChangeCommand(Main.main.getEditLayer(), targetDataSet.getPrimitiveById(currentPrimitive.getPrimitiveId()), currentPrimitive)); } else if (currentPrimitive.isNew()) { @@ -274,5 +274,5 @@ } else if (currentPrimitive.isModified()) { - cmds.add(new ChangeCommand(Main.map.mapView.getEditLayer(), targetDataSet.getPrimitiveById(currentPrimitive.getPrimitiveId()), currentPrimitive)); + cmds.add(new ChangeCommand(Main.main.getEditLayer(), targetDataSet.getPrimitiveById(currentPrimitive.getPrimitiveId()), currentPrimitive)); } else if (currentPrimitive.isNew()) { Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java =================================================================== --- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java (revision 30144) +++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java (revision 30145) @@ -250,5 +250,5 @@ if (oldLayer == graphViewLayer) { graphViewLayer = null; - } else if (oldLayer == Main.map.mapView.getEditLayer()) { //data layer removed + } else if (oldLayer == Main.main.getEditLayer()) { //data layer removed if (graphViewLayer != null) { Main.main.removeLayer(graphViewLayer); Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (revision 30144) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java (revision 30145) @@ -243,5 +243,5 @@ Relation relation = (Relation)relationsData.getValueAt(row, 0); if( e.getClickCount() > 1 ) { - Main.map.mapView.getEditLayer().data.setSelected(relation); + Main.main.getEditLayer().data.setSelected(relation); } } @@ -487,6 +487,6 @@ public void mouseClicked( MouseEvent e ) { if( e.isControlDown() || !(e.getComponent() instanceof JComboBox ) ) // do not use left click handler on combo box - if( SwingUtilities.isLeftMouseButton(e) && chosenRelation.get() != null && Main.map.mapView.getEditLayer() != null ) { - Main.map.mapView.getEditLayer().data.setSelected(chosenRelation.get()); + if( SwingUtilities.isLeftMouseButton(e) && chosenRelation.get() != null && Main.main.getEditLayer() != null ) { + Main.main.getEditLayer().data.setSelected(chosenRelation.get()); } } Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java (revision 30144) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadChosenRelationAction.java (revision 30145) @@ -62,5 +62,5 @@ protected void downloadMembers( Relation rel ) { if( !rel.isNew() ) { - Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.map.mapView.getEditLayer())); + Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.main.getEditLayer())); } } @@ -71,5 +71,5 @@ ret.addAll(rel.getIncompleteMembers()); if( ret.isEmpty() ) return; - Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.map.mapView.getEditLayer())); + Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.main.getEditLayer())); } } Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java (revision 30144) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java (revision 30145) @@ -37,5 +37,5 @@ this.rel = rel; rel.addChosenRelationListener(this); - setEnabled(rel.get() != null && Main.map.mapView.getEditLayer() != null); + setEnabled(rel.get() != null && Main.main.getEditLayer() != null); } @@ -46,14 +46,14 @@ objects.add(relation); objects.addAll(relation.getMemberPrimitives()); - Main.worker.submit(new DownloadReferrersTask(Main.map.mapView.getEditLayer(), objects)); + Main.worker.submit(new DownloadReferrersTask(Main.main.getEditLayer(), objects)); } public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) { - setEnabled(newRelation != null && Main.map.mapView.getEditLayer() != null); + setEnabled(newRelation != null && Main.main.getEditLayer() != null); } protected void downloadMembers( Relation rel ) { if( !rel.isNew() ) { - Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.map.mapView.getEditLayer())); + Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.main.getEditLayer())); } } @@ -64,5 +64,5 @@ ret.addAll(rel.getIncompleteMembers()); if( ret.isEmpty() ) return; - Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.map.mapView.getEditLayer())); + Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.main.getEditLayer())); } } Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java (revision 30144) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/EditChosenRelationAction.java (revision 30145) @@ -32,5 +32,5 @@ Relation relation = rel.get(); if( relation == null ) return; - RelationEditor.getEditor(Main.map.mapView.getEditLayer(), relation, null).setVisible(true); + RelationEditor.getEditor(Main.main.getEditLayer(), relation, null).setVisible(true); } Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java (revision 30144) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectMembersAction.java (revision 30145) @@ -22,5 +22,5 @@ public void actionPerformed( ActionEvent e ) { - Main.map.mapView.getEditLayer().data.setSelected(rel.get() == null ? null : rel.get().getMemberPrimitives()); + Main.main.getEditLayer().data.setSelected(rel.get() == null ? null : rel.get().getMemberPrimitives()); } Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java =================================================================== --- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java (revision 30144) +++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/SelectRelationAction.java (revision 30145) @@ -23,5 +23,5 @@ public void actionPerformed( ActionEvent e ) { - Main.map.mapView.getEditLayer().data.setSelected(rel.get() == null ? null : rel.get()); + Main.main.getEditLayer().data.setSelected(rel.get() == null ? null : rel.get()); } Index: applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java =================================================================== --- applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java (revision 30144) +++ applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java (revision 30145) @@ -174,5 +174,5 @@ public void addLayer() { - OsmDataLayer osmLayer = Main.map.mapView.getEditLayer(); + OsmDataLayer osmLayer = Main.main.getEditLayer(); if (osmLayer != null) { RoutingLayer layer = new RoutingLayer(tr("Routing") + " [" + osmLayer.getName() + "]", osmLayer); Index: applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java =================================================================== --- applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java (revision 30144) +++ applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java (revision 30145) @@ -50,5 +50,5 @@ private List getCurrentEditBounds() { - return Main.map.mapView.getEditLayer().data.getDataSourceBounds(); + return Main.main.getEditLayer().data.getDataSourceBounds(); } Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java =================================================================== --- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java (revision 30144) +++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java (revision 30145) @@ -32,20 +32,12 @@ } - /* (non-Javadoc) - * @see java.util.TimerTask#run() - */ @Override public void run() { - if(Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null) { + OsmDataLayer layer = Main.main.getEditLayer(); + if (layer == null) { return; } - OsmDataLayer layer = Main.map.mapView.getEditLayer(); try { DataSet dataset = layer.data; - -// File outFile = layer.associatedFile; -// if(outFile == null) { -// outFile = file; -// } // write to temporary file, on success, rename tmp file to target file: @@ -69,5 +61,3 @@ } } - - } Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java (revision 30144) +++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsInDatasetListModel.java (revision 30145) @@ -77,5 +77,5 @@ /* --------------------------------------------------------------------------- */ public void dataChanged(DataChangedEvent event) { - OsmDataLayer layer = Main.map.mapView.getEditLayer(); + OsmDataLayer layer = Main.main.getEditLayer(); if (layer == null) { setTurnRestrictions(null); Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java (revision 30144) +++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java (revision 30145) @@ -205,5 +205,5 @@ protected Collection getMembersForCurrentSelection(Relation r) { Collection members = new HashSet(); - Collection selection = Main.map.mapView.getEditLayer().data.getSelected(); + Collection selection = Main.main.getEditLayer().data.getSelected(); for (RelationMember member: r.getMembers()) { if (selection.contains(member.getMember())) {