Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2017-08-24T00:15:51+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 60 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java
r12125 r12630 160 160 // list all imagery entries where the current map location 161 161 // is within the imagery bounds 162 if (Main .isDisplayingMapView()) {163 MapView mv = Main .map.mapView;162 if (MainApplication.isDisplayingMapView()) { 163 MapView mv = MainApplication.getMap().mapView; 164 164 LatLon pos = mv.getProjection().eastNorth2latlon(mv.getCenter()); 165 165 final List<ImageryInfo> inViewLayers = new ArrayList<>(); -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r12629 r12630 106 106 private static final List<String> COMMAND_LINE_ARGS = new ArrayList<>(); 107 107 108 /** 109 * The MapFrame. 110 */ 111 static MapFrame map; 112 108 113 private final MainFrame mainFrame; 109 114 … … 225 230 public static List<String> getCommandLineArgs() { 226 231 return Collections.unmodifiableList(COMMAND_LINE_ARGS); 232 } 233 234 /** 235 * Returns the MapFrame. 236 * <p> 237 * There should be no need to access this to access any map data. Use {@link #layerManager} instead. 238 * @return the MapFrame 239 * @see MainPanel 240 * @since 12630 (as a replacement to {@code Main.map}) 241 */ 242 public static MapFrame getMap() { 243 return map; 244 } 245 246 /** 247 * Replies true if JOSM currently displays a map view. False, if it doesn't, i.e. if 248 * it only shows the MOTD panel. 249 * <p> 250 * You do not need this when accessing the layer manager. The layer manager will be empty if no map view is shown. 251 * 252 * @return <code>true</code> if JOSM currently displays a map view 253 * @since 12630 (as a replacement to {@code Main.isDisplayingMapView()}) 254 */ 255 @SuppressWarnings("deprecation") 256 public static boolean isDisplayingMapView() { 257 return map != null && map.mapView != null; 227 258 } 228 259 -
trunk/src/org/openstreetmap/josm/gui/MainPanel.java
r11713 r12630 44 44 * @param showMap If the map should be displayed. 45 45 */ 46 @SuppressWarnings("deprecation") 46 47 protected synchronized void updateContent(boolean showMap) { 47 48 GuiHelper.assertCallFromEdt(); … … 65 66 map = null; 66 67 Main.map = map; 68 MainApplication.map = map; 67 69 add(getGettingStarted(), BorderLayout.CENTER); 68 70 } … … 83 85 } 84 86 87 @SuppressWarnings("deprecation") 85 88 private MapFrame createNewMapFrame() { 86 89 MapFrame mapFrame = new MapFrame(null); 87 90 // Required by many components. 88 91 Main.map = mapFrame; 92 MainApplication.map = mapFrame; 89 93 90 94 mapFrame.fillPanel(this); -
trunk/src/org/openstreetmap/josm/gui/MapMover.java
r12338 r12630 169 169 boolean allowMovement = (e.getModifiersEx() & (MouseEvent.BUTTON3_DOWN_MASK | offMask)) == MouseEvent.BUTTON3_DOWN_MASK; 170 170 if (Main.isPlatformOsx()) { 171 MapFrame map = MainApplication.getMap(); 171 172 int macMouseMask = MouseEvent.CTRL_DOWN_MASK | MouseEvent.BUTTON1_DOWN_MASK; 172 173 boolean macMovement = e.getModifiersEx() == macMouseMask; 173 boolean allowedMode = ! Main.map.mapModeSelect.equals(Main.map.mapMode)174 || SelectAction.Mode.SELECT.equals( Main.map.mapModeSelect.getMode());174 boolean allowedMode = !map.mapModeSelect.equals(map.mapMode) 175 || SelectAction.Mode.SELECT.equals(map.mapModeSelect.getMode()); 175 176 allowMovement |= macMovement && allowedMode; 176 177 } -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r12620 r12630 406 406 try { 407 407 final MouseState ms = incomingMouseState.take(); 408 if (parent != Main .map)408 if (parent != MainApplication.getMap()) 409 409 return; // exit, if new parent. 410 410 -
trunk/src/org/openstreetmap/josm/gui/MapView.java
r12620 r12630 562 562 } 563 563 564 MapFrame map = MainApplication.getMap(); 564 565 if (AutoFilterManager.getInstance().getCurrentAutoFilter() != null) { 565 566 AutoFilterManager.getInstance().drawOSDText(tempG); 566 } else if (Main .isDisplayingMapView() && Main.map.filterDialog != null) {567 Main.map.filterDialog.drawOSDText(tempG);567 } else if (MainApplication.isDisplayingMapView() && map.filterDialog != null) { 568 map.filterDialog.drawOSDText(tempG); 568 569 } 569 570 … … 660 661 @Override 661 662 public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) { 662 if (Main.map != null) { 663 MapFrame map = MainApplication.getMap(); 664 if (map != null) { 663 665 /* This only makes the buttons look disabled. Disabling the actions as well requires 664 666 * the user to re-select the tool after i.e. moving a layer. While testing I found … … 666 668 * order. This way it works as visual clue for new users */ 667 669 // FIXME: This does not belong here. 668 for (final AbstractButton b: Main.map.allMapModeButtons) {670 for (final AbstractButton b: map.allMapModeButtons) { 669 671 MapMode mode = (MapMode) b.getAction(); 670 672 final boolean activeLayerSupported = mode.layerIsSupported(layerManager.getActiveLayer()); -
trunk/src/org/openstreetmap/josm/gui/NotificationManager.java
r11996 r12630 114 114 int x; 115 115 int y; 116 if (Main.isDisplayingMapView() && Main.map.mapView.getHeight() > 0) { 117 MapView mv = Main.map.mapView; 116 MapFrame map = MainApplication.getMap(); 117 if (MainApplication.isDisplayingMapView() && map.mapView.getHeight() > 0) { 118 MapView mv = map.mapView; 118 119 Point mapViewPos = SwingUtilities.convertPoint(mv.getParent(), mv.getX(), mv.getY(), Main.parent); 119 120 x = mapViewPos.x + margin; 120 y = mapViewPos.y + mv.getHeight() - Main.map.statusLine.getHeight() - size.height - margin;121 y = mapViewPos.y + mv.getHeight() - map.statusLine.getHeight() - size.height - margin; 121 122 } else { 122 123 x = margin; -
trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
r11945 r12630 184 184 public void mousePressed(MouseEvent e) { 185 185 if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() > 1 && Main.getLayerManager().getEditDataSet() != null) { 186 SelectByInternalPointAction.performSelection(Main .map.mapView.getEastNorth(e.getX(), e.getY()),186 SelectByInternalPointAction.performSelection(MainApplication.getMap().mapView.getEastNorth(e.getX(), e.getY()), 187 187 (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0, 188 188 (e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0); -
trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterButton.java
r12474 r12630 11 11 import javax.swing.JButton; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.actions.JosmAction; 15 14 import org.openstreetmap.josm.data.preferences.ColorProperty; 15 import org.openstreetmap.josm.gui.MainApplication; 16 16 17 17 /** … … 36 36 if (filter.equals(afm.getCurrentAutoFilter())) { 37 37 afm.setCurrentAutoFilter(null); 38 Main .map.filterDialog.getFilterModel().executeFilters();38 MainApplication.getMap().filterDialog.getFilterModel().executeFilters(); 39 39 } else { 40 40 afm.setCurrentAutoFilter(filter); -
trunk/src/org/openstreetmap/josm/gui/autofilter/AutoFilterManager.java
r12620 r12630 43 43 import org.openstreetmap.josm.data.preferences.BooleanProperty; 44 44 import org.openstreetmap.josm.data.preferences.StringProperty; 45 import org.openstreetmap.josm.gui.MainApplication; 45 46 import org.openstreetmap.josm.gui.MapFrame; 46 47 import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener; 48 import org.openstreetmap.josm.gui.MapView; 47 49 import org.openstreetmap.josm.gui.NavigatableComponent; 48 50 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener; … … 130 132 131 133 private synchronized void updateButtons() { 132 if (enabledRule != null && Main.map != null 133 && enabledRule.getMinZoomLevel() <= Selector.GeneralSelector.scale2level(Main.map.mapView.getDist100Pixel())) { 134 MapFrame map = MainApplication.getMap(); 135 if (enabledRule != null && map != null 136 && enabledRule.getMinZoomLevel() <= Selector.GeneralSelector.scale2level(map.mapView.getDist100Pixel())) { 134 137 // Retrieve the values from current rule visible on screen 135 138 NavigableSet<String> values = getNumericValues(enabledRule.getKey(), enabledRule.getValueComparator()); … … 148 151 int i = 0; 149 152 int maxWidth = 16; 153 MapView mapView = MainApplication.getMap().mapView; 150 154 for (final String value : values.descendingSet()) { 151 155 Filter filter = new Filter(); … … 161 165 buttons.put(value, button); 162 166 maxWidth = Math.max(maxWidth, button.getPreferredSize().width); 163 Main.map.mapView.add(button).setLocation(3, 60 + 22*i++);167 mapView.add(button).setLocation(3, 60 + 22*i++); 164 168 } 165 169 for (AutoFilterButton b : buttons.values()) { 166 170 b.setSize(maxWidth, 20); 167 171 } 168 Main.map.mapView.validate();172 mapView.validate(); 169 173 } 170 174 171 175 private void removeAllButtons() { 172 176 for (Iterator<String> it = buttons.keySet().iterator(); it.hasNext();) { 173 Main .map.mapView.remove(buttons.get(it.next()));177 MainApplication.getMap().mapView.remove(buttons.get(it.next())); 174 178 it.remove(); 175 179 } … … 193 197 Set<String> values = new TreeSet<>(); 194 198 if (ds != null) { 195 BBox bbox = Main .map.mapView.getState().getViewArea().getLatLonBoundsBox().toBBox();199 BBox bbox = MainApplication.getMap().mapView.getState().getViewArea().getLatLonBoundsBox().toBBox(); 196 200 Consumer<OsmPrimitive> consumer = getTagValuesConsumer(key, values); 197 201 ds.searchNodes(bbox).forEach(consumer); … … 388 392 setCurrentAutoFilter(null); 389 393 removeAllButtons(); 390 if (Main.map != null) { 391 Main.map.filterDialog.getFilterModel().executeFilters(); 394 MapFrame map = MainApplication.getMap(); 395 if (map != null) { 396 map.filterDialog.getFilterModel().executeFilters(); 392 397 } 393 398 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
r12279 r12630 42 42 import org.openstreetmap.josm.data.osm.DataSet; 43 43 import org.openstreetmap.josm.data.osm.OsmPrimitive; 44 import org.openstreetmap.josm.gui.MainApplication; 44 45 import org.openstreetmap.josm.gui.SideButton; 45 46 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 463 464 break; 464 465 } 465 Main .map.repaint();466 MainApplication.getMap().repaint(); 466 467 } 467 468 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r12620 r12630 56 56 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 57 57 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; 58 import org.openstreetmap.josm.gui.MainApplication; 58 59 import org.openstreetmap.josm.gui.NavigatableComponent; 59 60 import org.openstreetmap.josm.gui.OsmPrimitivRenderer; … … 130 131 lstConflicts.addMouseListener(new MouseEventHandler()); 131 132 } 132 addListSelectionListener(e -> Main .map.mapView.repaint());133 addListSelectionListener(e -> MainApplication.getMap().mapView.repaint()); 133 134 134 135 SideButton btnResolve = new SideButton(actResolve); … … 210 211 lstConflicts.setSelectedIndex(index); 211 212 } 212 Main .map.mapView.repaint();213 MainApplication.getMap().mapView.repaint(); 213 214 } 214 215 … … 632 633 ); 633 634 unfurlDialog(); 634 Main .map.repaint();635 MainApplication.getMap().repaint(); 635 636 }); 636 637 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
r12400 r12630 40 40 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent; 41 41 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; 42 import org.openstreetmap.josm.gui.MainApplication; 42 43 import org.openstreetmap.josm.gui.MapFrame; 43 44 import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener; … … 88 89 MapFrame.removeMapModeChangeListener(this); 89 90 filterModel.model.clearFilterFlags(); 90 Main .map.mapView.repaint();91 MainApplication.getMap().mapView.repaint(); 91 92 } 92 93 -
trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
r12620 r12630 11 11 import javax.swing.table.AbstractTableModel; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.data.osm.Filter; 15 14 import org.openstreetmap.josm.data.osm.FilterModel; 16 15 import org.openstreetmap.josm.data.osm.OsmPrimitive; 16 import org.openstreetmap.josm.gui.MainApplication; 17 import org.openstreetmap.josm.gui.MapFrame; 17 18 import org.openstreetmap.josm.gui.autofilter.AutoFilterManager; 18 19 import org.openstreetmap.josm.gui.widgets.OSDLabel; … … 87 88 88 89 private void updateMap() { 89 if (Main.map != null && model.isChanged()) { 90 Main.map.filterDialog.updateDialogHeader(); 90 MapFrame map = MainApplication.getMap(); 91 if (map != null && model.isChanged()) { 92 map.filterDialog.updateDialogHeader(); 91 93 } 92 94 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
r12279 r12630 26 26 import org.openstreetmap.josm.gui.DefaultNameFormatter; 27 27 import org.openstreetmap.josm.gui.ExtendedDialog; 28 import org.openstreetmap.josm.gui.MainApplication; 28 29 import org.openstreetmap.josm.gui.NavigatableComponent; 29 30 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 116 117 final Collection<OsmPrimitive> sel = Main.getLayerManager().getEditDataSet().getAllSelected(); 117 118 ElemStyles elemstyles = MapPaintStyles.getStyles(); 118 NavigatableComponent nc = Main .map.mapView;119 NavigatableComponent nc = MainApplication.getMap().mapView; 119 120 double scale = nc.getDist100Pixel(); 120 121 -
trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
r11905 r12630 44 44 import org.openstreetmap.josm.actions.MergeLayerAction; 45 45 import org.openstreetmap.josm.data.preferences.AbstractProperty; 46 import org.openstreetmap.josm.gui.MainApplication; 47 import org.openstreetmap.josm.gui.MapFrame; 46 48 import org.openstreetmap.josm.gui.MapView; 47 49 import org.openstreetmap.josm.gui.SideButton; … … 507 509 Layer layer = (Layer) value; 508 510 if (layer instanceof NativeScaleLayer) { 509 boolean active = ((NativeScaleLayer) layer) == Main .map.mapView.getNativeScaleLayer();511 boolean active = ((NativeScaleLayer) layer) == MainApplication.getMap().mapView.getNativeScaleLayer(); 510 512 cb.setSelected(active); 511 513 cb.setToolTipText(active … … 824 826 List<Integer> sel = getSelectedRows(); 825 827 List<Layer> layers = getLayers(); 828 MapView mapView = MainApplication.getMap().mapView; 826 829 for (int row : sel) { 827 830 Layer l1 = layers.get(row); 828 831 Layer l2 = layers.get(row-1); 829 Main.map.mapView.moveLayer(l2, row);830 Main.map.mapView.moveLayer(l1, row-1);832 mapView.moveLayer(l2, row); 833 mapView.moveLayer(l1, row-1); 831 834 } 832 835 fireTableDataChanged(); … … 859 862 Collections.reverse(sel); 860 863 List<Layer> layers = getLayers(); 864 MapView mapView = MainApplication.getMap().mapView; 861 865 for (int row : sel) { 862 866 Layer l1 = layers.get(row); 863 867 Layer l2 = layers.get(row+1); 864 Main.map.mapView.moveLayer(l1, row+1);865 Main.map.mapView.moveLayer(l2, row);868 mapView.moveLayer(l1, row+1); 869 mapView.moveLayer(l2, row); 866 870 } 867 871 fireTableDataChanged(); … … 999 1003 break; 1000 1004 case 1: 1001 NativeScaleLayer oldLayer = Main.map.mapView.getNativeScaleLayer(); 1005 MapFrame map = MainApplication.getMap(); 1006 NativeScaleLayer oldLayer = map.mapView.getNativeScaleLayer(); 1002 1007 if (oldLayer == l) { 1003 Main.map.mapView.setNativeScaleLayer(null);1008 map.mapView.setNativeScaleLayer(null); 1004 1009 } else if (l instanceof NativeScaleLayer) { 1005 Main.map.mapView.setNativeScaleLayer((NativeScaleLayer) l);1010 map.mapView.setNativeScaleLayer((NativeScaleLayer) l); 1006 1011 if (oldLayer != null) { 1007 1012 int idx = getLayers().indexOf(oldLayer); -
trunk/src/org/openstreetmap/josm/gui/dialogs/MinimapDialog.java
r11452 r12630 8 8 import java.util.Collections; 9 9 10 import org.openstreetmap.josm.Main;11 10 import org.openstreetmap.josm.data.Bounds; 11 import org.openstreetmap.josm.gui.MainApplication; 12 12 import org.openstreetmap.josm.gui.MapView; 13 13 import org.openstreetmap.josm.gui.NavigatableComponent; … … 55 55 @Override 56 56 public void zoomChanged() { 57 if (!skipEvents && Main .isDisplayingMapView()) {58 MapView mv = Main .map.mapView;57 if (!skipEvents && MainApplication.isDisplayingMapView()) { 58 MapView mv = MainApplication.getMap().mapView; 59 59 final Bounds currentBounds = new Bounds( 60 60 mv.getLatLon(0, mv.getHeight()), … … 72 72 if (!skipEvents) { 73 73 skipEvents = true; 74 Main .map.mapView.zoomTo(slippyMap.getBoundingBox());74 MainApplication.getMap().mapView.zoomTo(slippyMap.getBoundingBox()); 75 75 skipEvents = false; 76 76 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
r12279 r12630 36 36 import org.openstreetmap.josm.data.notes.NoteComment; 37 37 import org.openstreetmap.josm.data.osm.NoteData; 38 import org.openstreetmap.josm.gui.MainApplication; 39 import org.openstreetmap.josm.gui.MapFrame; 38 40 import org.openstreetmap.josm.gui.NoteInputDialog; 39 41 import org.openstreetmap.josm.gui.NoteSortDialog; … … 99 101 public void mouseClicked(MouseEvent e) { 100 102 if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2 && noteData != null && noteData.getSelectedNote() != null) { 101 Main .map.mapView.zoomTo(noteData.getSelectedNote().getLatLon());103 MainApplication.getMap().mapView.zoomTo(noteData.getSelectedNote().getLatLon()); 102 104 } 103 105 } … … 161 163 noteData = null; 162 164 model.clearData(); 163 if (Main.map.mapMode instanceof AddNoteAction) { 164 Main.map.selectMapMode(Main.map.mapModeSelect); 165 MapFrame map = MainApplication.getMap(); 166 if (map.mapMode instanceof AddNoteAction) { 167 map.selectMapMode(map.mapModeSelect); 165 168 } 166 169 } … … 297 300 Note note = displayList.getSelectedValue(); 298 301 if (note == null) { 299 JOptionPane.showMessageDialog(Main .map,302 JOptionPane.showMessageDialog(MainApplication.getMap(), 300 303 "You must select a note first", 301 304 "No note selected", … … 355 358 Main.getLayerManager().addLayer(new NoteLayer()); 356 359 } 357 Main .map.selectMapMode(new AddNoteAction(noteData));360 MainApplication.getMap().selectMapMode(new AddNoteAction(noteData)); 358 361 } 359 362 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r12528 r12630 57 57 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; 58 58 import org.openstreetmap.josm.gui.DefaultNameFormatter; 59 import org.openstreetmap.josm.gui.MainApplication; 59 60 import org.openstreetmap.josm.gui.MapView; 60 61 import org.openstreetmap.josm.gui.NavigatableComponent; … … 209 210 210 211 //update highlights 211 if (highlightEnabled && focused == displaylist && Main .isDisplayingMapView() && highlightHelper.highlightOnly(sel)) {212 Main .map.mapView.repaint();212 if (highlightEnabled && focused == displaylist && MainApplication.isDisplayingMapView() && highlightHelper.highlightOnly(sel)) { 213 MainApplication.getMap().mapView.repaint(); 213 214 } 214 215 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r12279 r12630 67 67 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 68 68 import org.openstreetmap.josm.gui.DefaultNameFormatter; 69 import org.openstreetmap.josm.gui.MainApplication; 70 import org.openstreetmap.josm.gui.MapFrame; 69 71 import org.openstreetmap.josm.gui.OsmPrimitivRenderer; 70 72 import org.openstreetmap.josm.gui.PopupMenuHandler; … … 212 214 actEditRelationSelection.actionPerformed(null); 213 215 } 214 } else if (highlightEnabled && Main .isDisplayingMapView() && helper.highlightOnly(model.getElementAt(idx))) {215 Main .map.mapView.repaint();216 } else if (highlightEnabled && MainApplication.isDisplayingMapView() && helper.highlightOnly(model.getElementAt(idx))) { 217 MainApplication.getMap().mapView.repaint(); 216 218 } 217 219 } … … 442 444 return; 443 445 box.enlargeBoundingBox(); 444 Main .map.mapView.zoomTo(box);446 MainApplication.getMap().mapView.zoomTo(box); 445 447 } 446 448 … … 615 617 if (selection != null) { 616 618 remember(selection); 619 MapFrame map = MainApplication.getMap(); 617 620 if (selection.size() == 2) { 618 621 Iterator<? extends OsmPrimitive> it = selection.iterator(); … … 624 627 LatLon c2 = ((Node) n2).getCoor(); 625 628 if (c1 != null && c2 != null) { 626 Main.map.statusLine.setDist(c1.greatCircleDistance(c2));629 map.statusLine.setDist(c1.greatCircleDistance(c2)); 627 630 return; 628 631 } 629 632 } 630 633 } 631 Main.map.statusLine.setDist(634 map.statusLine.setDist( 632 635 new SubclassFilteredCollection<OsmPrimitive, Way>(selection, Way.class::isInstance)); 633 636 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
r12302 r12630 43 43 import org.openstreetmap.josm.data.validation.TestError; 44 44 import org.openstreetmap.josm.data.validation.ValidatorVisitor; 45 import org.openstreetmap.josm.gui.MainApplication; 46 import org.openstreetmap.josm.gui.MapFrame; 45 47 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 46 48 import org.openstreetmap.josm.gui.PopupMenuHandler; … … 315 317 tree.resetErrors(); 316 318 OsmValidator.saveIgnoredErrors(); 317 Main .map.repaint();319 MainApplication.getMap().repaint(); 318 320 } 319 321 } … … 524 526 fixButton.setEnabled(hasFixes); 525 527 popupMenuHandler.setPrimitives(sel); 526 if (Main.map != null) { 527 Main.map.repaint(); 528 MapFrame map = MainApplication.getMap(); 529 if (map != null) { 530 map.repaint(); 528 531 } 529 532 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
r12620 r12630 22 22 import org.openstreetmap.josm.data.Bounds; 23 23 import org.openstreetmap.josm.gui.JosmUserIdentityManager; 24 import org.openstreetmap.josm.gui.MainApplication; 25 import org.openstreetmap.josm.gui.MapView; 24 26 import org.openstreetmap.josm.gui.widgets.HtmlPanel; 25 27 import org.openstreetmap.josm.gui.widgets.JMultilineLabel; … … 165 167 } 166 168 167 // query for changesets in the current map view only if there *is* a current 168 // map view 169 // query for changesets in the current map view only if there *is* a current map view 169 170 lbl = lblQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW); 170 if (!Main .isDisplayingMapView()) {171 if (!MainApplication.isDisplayingMapView()) { 171 172 rbQueries.get(BasicQuery.CHANGESETS_IN_MAP_VIEW).setEnabled(false); 172 173 lbl.setText(tr("<html>Download changesets in the current map view.<br><em>Disabled. " + … … 241 242 break; 242 243 case CHANGESETS_IN_MAP_VIEW: 243 Bounds b = Main.map.mapView.getLatLonBounds(Main.map.mapView.getBounds()); 244 MapView mapView = MainApplication.getMap().mapView; 245 Bounds b = mapView.getLatLonBounds(mapView.getBounds()); 244 246 query = query.inBbox(b); 245 247 break; -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r12620 r12630 83 83 import org.openstreetmap.josm.gui.DefaultNameFormatter; 84 84 import org.openstreetmap.josm.gui.ExtendedDialog; 85 import org.openstreetmap.josm.gui.MainApplication; 85 86 import org.openstreetmap.josm.gui.PopupMenuHandler; 86 87 import org.openstreetmap.josm.gui.SideButton; … … 385 386 public void mouseClicked(MouseEvent e) { 386 387 //update highlights 387 if (Main .isDisplayingMapView()) {388 if (MainApplication.isDisplayingMapView()) { 388 389 int row = membershipTable.rowAtPoint(e.getPoint()); 389 390 if (row >= 0 && highlightHelper.highlightOnly((Relation) membershipTable.getValueAt(row, 0))) { 390 Main .map.mapView.repaint();391 MainApplication.getMap().mapView.repaint(); 391 392 } 392 393 } … … 484 485 private void editMembership(int row) { 485 486 Relation relation = (Relation) membershipData.getValueAt(row, 0); 486 Main .map.relationListDialog.selectRelation(relation);487 MainApplication.getMap().relationListDialog.selectRelation(relation); 487 488 RelationEditor.getEditor( 488 489 Main.getLayerManager().getEditLayer(), -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r12620 r12630 36 36 import org.openstreetmap.josm.gui.DefaultNameFormatter; 37 37 import org.openstreetmap.josm.gui.ExceptionDialogUtil; 38 import org.openstreetmap.josm.gui.MainApplication; 38 39 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 39 40 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 420 421 refreshView(r); 421 422 } 422 SwingUtilities.invokeLater(Main .map::repaint);423 SwingUtilities.invokeLater(MainApplication.getMap()::repaint); 423 424 } catch (OsmTransferException e) { 424 425 if (canceled) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java
r12620 r12630 13 13 import javax.swing.SwingUtilities; 14 14 15 import org.openstreetmap.josm.Main;16 15 import org.openstreetmap.josm.data.osm.DataSet; 17 16 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 19 18 import org.openstreetmap.josm.gui.DefaultNameFormatter; 20 19 import org.openstreetmap.josm.gui.ExceptionDialogUtil; 20 import org.openstreetmap.josm.gui.MainApplication; 21 21 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 22 22 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 83 83 @Override 84 84 protected void finish() { 85 Main .map.repaint();85 MainApplication.getMap().repaint(); 86 86 if (canceled) 87 87 return; -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java
r12620 r12630 10 10 import javax.swing.SwingUtilities; 11 11 12 import org.openstreetmap.josm.Main;13 12 import org.openstreetmap.josm.data.osm.DataSet; 14 13 import org.openstreetmap.josm.data.osm.DataSetMerger; … … 16 15 import org.openstreetmap.josm.gui.DefaultNameFormatter; 17 16 import org.openstreetmap.josm.gui.ExceptionDialogUtil; 17 import org.openstreetmap.josm.gui.MainApplication; 18 18 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 19 19 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 102 102 layer.mergeFrom(allDownloads); 103 103 layer.onPostDownloadFromServer(); 104 Main .map.repaint();104 MainApplication.getMap().repaint(); 105 105 }); 106 106 } catch (OsmTransferException | InvocationTargetException | InterruptedException e) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
r10683 r12630 28 28 import org.openstreetmap.josm.data.osm.RelationMember; 29 29 import org.openstreetmap.josm.data.osm.Way; 30 import org.openstreetmap.josm.gui.MainApplication; 30 31 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType; 31 32 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType.Direction; … … 108 109 109 110 private transient ListSelectionListener highlighterListener = lse -> { 110 if (Main .isDisplayingMapView()) {111 if (MainApplication.isDisplayingMapView()) { 111 112 Collection<RelationMember> sel = getMemberTableModel().getSelectedMembers(); 112 113 final Set<OsmPrimitive> toHighlight = new HashSet<>(); … … 117 118 } 118 119 SwingUtilities.invokeLater(() -> { 119 if (Main .isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) {120 Main .map.mapView.repaint();120 if (MainApplication.isDisplayingMapView() && highlightHelper.highlightOnly(toHighlight)) { 121 MainApplication.getMap().mapView.repaint(); 121 122 } 122 123 }); … … 128 129 if (!highlightEnabled) return; 129 130 getMemberTableModel().getSelectionModel().addListSelectionListener(highlighterListener); 130 if (Main .isDisplayingMapView()) {131 if (MainApplication.isDisplayingMapView()) { 131 132 HighlightHelper.clearAllHighlighted(); 132 Main .map.mapView.repaint();133 MainApplication.getMap().mapView.repaint(); 133 134 } 134 135 } … … 153 154 getMemberTableModel().getSelectionModel().removeListSelectionListener(highlighterListener); 154 155 highlighterListener = null; 155 if (Main .isDisplayingMapView()) {156 if (MainApplication.isDisplayingMapView()) { 156 157 HighlightHelper.clearAllHighlighted(); 157 Main .map.mapView.repaint();158 MainApplication.getMap().mapView.repaint(); 158 159 } 159 160 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
r12048 r12630 21 21 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 22 22 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; 23 import org.openstreetmap.josm.gui.MainApplication; 23 24 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor; 24 25 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable; … … 82 83 } 83 84 // Relation list gets update in EDT so selecting my be postponed to following EDT run 84 SwingUtilities.invokeLater(() -> Main .map.relationListDialog.selectRelation(newRelation));85 SwingUtilities.invokeLater(() -> MainApplication.getMap().relationListDialog.selectRelation(newRelation)); 85 86 } 86 87 … … 140 141 ); 141 142 if (ret == 0) { 142 Main .map.conflictDialog.unfurlDialog();143 MainApplication.getMap().conflictDialog.unfurlDialog(); 143 144 } 144 145 return ret == 0; -
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r12620 r12630 39 39 import org.openstreetmap.josm.data.preferences.BooleanProperty; 40 40 import org.openstreetmap.josm.data.preferences.IntegerProperty; 41 import org.openstreetmap.josm.gui.MainApplication; 41 42 import org.openstreetmap.josm.gui.MapView; 42 43 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; … … 408 409 tpDownloadAreaSelectors.setSelectedIndex(idx); 409 410 410 if (Main .isDisplayingMapView()) {411 MapView mv = Main .map.mapView;411 if (MainApplication.isDisplayingMapView()) { 412 MapView mv = MainApplication.getMap().mapView; 412 413 currentBounds = new Bounds( 413 414 mv.getLatLon(0, mv.getHeight()), -
trunk/src/org/openstreetmap/josm/gui/io/AbstractPrimitiveTask.java
r10611 r12630 7 7 import java.util.Set; 8 8 9 import org.openstreetmap.josm.Main;10 9 import org.openstreetmap.josm.actions.AutoScaleAction; 11 10 import org.openstreetmap.josm.data.osm.DataSet; … … 16 15 import org.openstreetmap.josm.data.osm.Way; 17 16 import org.openstreetmap.josm.gui.ExceptionDialogUtil; 17 import org.openstreetmap.josm.gui.MainApplication; 18 18 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 19 19 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 186 186 GuiHelper.runInEDTAndWait(() -> { 187 187 layer.mergeFrom(ds); 188 if (zoom && Main .map!= null)188 if (zoom && MainApplication.getMap() != null) 189 189 AutoScaleAction.zoomTo(ds.allPrimitives()); 190 190 layer.onPostDownloadFromServer(); -
trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
r12370 r12630 28 28 import org.openstreetmap.josm.Main; 29 29 import org.openstreetmap.josm.data.osm.Changeset; 30 import org.openstreetmap.josm.gui.MainApplication; 30 31 import org.openstreetmap.josm.gui.widgets.HistoryComboBox; 31 32 import org.openstreetmap.josm.gui.widgets.JMultilineLabel; … … 84 85 sourceLabel.addHyperlinkListener(e -> { 85 86 if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) { 86 final String source = Main .map.mapView.getLayerInformationForSourceTag();87 final String source = MainApplication.getMap().mapView.getLayerInformationForSourceTag(); 87 88 hcbUploadSource.setText(Utils.shortenString(source, Changeset.MAX_CHANGESET_TAG_LENGTH)); 88 89 // Fix #9965 -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r12620 r12630 89 89 import org.openstreetmap.josm.data.projection.Projections; 90 90 import org.openstreetmap.josm.gui.ExtendedDialog; 91 import org.openstreetmap.josm.gui.MainApplication; 91 92 import org.openstreetmap.josm.gui.MapView; 92 93 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener; … … 261 262 262 263 protected void initTileSource(T tileSource) { 263 coordinateConverter = new TileCoordinateConverter(Main .map.mapView, tileSource, getDisplaySettings());264 coordinateConverter = new TileCoordinateConverter(MainApplication.getMap().mapView, tileSource, getDisplaySettings()); 264 265 attribution.initialize(tileSource); 265 266 … … 852 853 853 854 private TileSet getVisibleTileSet() { 854 ProjectionBounds bounds = Main .map.mapView.getState().getViewArea().getProjectionBounds();855 ProjectionBounds bounds = MainApplication.getMap().mapView.getState().getViewArea().getProjectionBounds(); 855 856 return getTileSet(bounds, currentZoomLevel); 856 857 } … … 987 988 drawImageInside(g, img, anchorImage, anchorScreen, null); 988 989 } 989 if (tile instanceof ReprojectionTile && ((ReprojectionTile) tile).needsUpdate(Main.map.mapView.getScale())) { 990 MapView mapView = MainApplication.getMap().mapView; 991 if (tile instanceof ReprojectionTile && ((ReprojectionTile) tile).needsUpdate(mapView.getScale())) { 990 992 // This means we have a reprojected tile in memory cache, but not at 991 993 // current scale. Generally, the positioning of the tile will still -
trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
r11386 r12630 15 15 import javax.swing.border.EtchedBorder; 16 16 17 import org.openstreetmap.josm.Main;18 17 import org.openstreetmap.josm.data.imagery.ImageryInfo; 19 18 import org.openstreetmap.josm.data.preferences.BooleanProperty; 19 import org.openstreetmap.josm.gui.MainApplication; 20 import org.openstreetmap.josm.gui.MapFrame; 20 21 import org.openstreetmap.josm.gui.util.GuiHelper; 21 22 import org.openstreetmap.josm.gui.widgets.JMultilineLabel; … … 54 55 closeButton.setToolTipText(tr("Hide this message and never show it again")); 55 56 closeButton.addActionListener(e -> { 56 if (Main .isDisplayingMapView()) {57 Main .map.removeTopPanel(AlignImageryPanel.class);57 if (MainApplication.isDisplayingMapView()) { 58 MainApplication.getMap().removeTopPanel(AlignImageryPanel.class); 58 59 if (doNotShowAgain.isSelected()) { 59 60 showAgain.put(Boolean.FALSE); … … 83 84 public static void addNagPanelIfNeeded(ImageryInfo infoToAdd) { 84 85 BooleanProperty showAgain = new BooleanProperty("message.imagery.nagPanel." + infoToAdd.getUrl(), true); 85 if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid() 86 && Main.map.getTopPanel(AlignImageryPanel.class) == null) { 86 MapFrame map = MainApplication.getMap(); 87 if (MainApplication.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid() 88 && map.getTopPanel(AlignImageryPanel.class) == null) { 87 89 double w = GuiHelper.getScreenSize().getWidth(); 88 Main.map.addTopPanel(new AlignImageryPanel(w > 1300, showAgain, infoToAdd));90 map.addTopPanel(new AlignImageryPanel(w > 1300, showAgain, infoToAdd)); 89 91 } 90 92 } -
trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
r12460 r12630 35 35 import org.openstreetmap.josm.data.imagery.OffsetBookmark; 36 36 import org.openstreetmap.josm.data.preferences.IntegerProperty; 37 import org.openstreetmap.josm.gui.MainApplication; 38 import org.openstreetmap.josm.gui.MapView; 37 39 import org.openstreetmap.josm.gui.MenuScroller; 38 40 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings; … … 81 83 82 84 public double getPPD() { 83 if (!Main .isDisplayingMapView())85 if (!MainApplication.isDisplayingMapView()) 84 86 return Main.getProjection().getDefaultZoomInPPD(); 85 ProjectionBounds bounds = Main.map.mapView.getProjectionBounds(); 86 return Main.map.mapView.getWidth() / (bounds.maxEast - bounds.minEast); 87 MapView mapView = MainApplication.getMap().mapView; 88 ProjectionBounds bounds = mapView.getProjectionBounds(); 89 return mapView.getWidth() / (bounds.maxEast - bounds.minEast); 87 90 } 88 91 … … 206 209 setOffset(b); 207 210 Main.main.menu.imageryMenu.refreshOffsetMenu(); 208 Main .map.repaint();211 MainApplication.getMap().repaint(); 209 212 } 210 213 } -
trunk/src/org/openstreetmap/josm/gui/layer/LayerManager.java
r11905 r12630 12 12 import java.util.function.Consumer; 13 13 14 import org.openstreetmap.josm. Main;14 import org.openstreetmap.josm.gui.MainApplication; 15 15 import org.openstreetmap.josm.gui.util.GuiHelper; 16 16 import org.openstreetmap.josm.tools.JosmRuntimeException; … … 232 232 insertLayerAt(layer, position); 233 233 fireLayerAdded(layer, initialZoom); 234 if (Main .map!= null) {234 if (MainApplication.getMap() != null) { 235 235 layer.hookUpMapView(); // needs to be after fireLayerAdded 236 236 } -
trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
r12620 r12630 32 32 import org.openstreetmap.josm.data.osm.NoteData.NoteDataUpdateListener; 33 33 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 34 import org.openstreetmap.josm.gui.MainApplication; 34 35 import org.openstreetmap.josm.gui.MapView; 35 36 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; … … 73 74 @Override 74 75 public void hookUpMapView() { 75 Main .map.mapView.addMouseListener(this);76 MainApplication.getMap().mapView.addMouseListener(this); 76 77 } 77 78 78 79 @Override 79 80 public synchronized void destroy() { 80 Main .map.mapView.removeMouseListener(this);81 MainApplication.getMap().mapView.removeMouseListener(this); 81 82 noteData.removeNoteDataUpdateListener(this); 82 83 super.destroy(); … … 134 135 int width = icon.getIconWidth(); 135 136 int height = icon.getIconHeight(); 136 g.drawImage(icon.getImage(), p.x - (width / 2), p.y - height, Main .map.mapView);137 g.drawImage(icon.getImage(), p.x - (width / 2), p.y - height, MainApplication.getMap().mapView); 137 138 } 138 139 if (noteData.getSelectedNote() != null) { … … 260 261 Note closestNote = null; 261 262 for (Note note : noteData.getNotes()) { 262 Point notePoint = Main .map.mapView.getPoint(note.getLatLon());263 Point notePoint = MainApplication.getMap().mapView.getPoint(note.getLatLon()); 263 264 //move the note point to the center of the icon where users are most likely to click when selecting 264 265 notePoint.setLocation(notePoint.getX(), notePoint.getY() - iconHeight / 2); -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r12620 r12630 87 87 import org.openstreetmap.josm.data.validation.TestError; 88 88 import org.openstreetmap.josm.gui.ExtendedDialog; 89 import org.openstreetmap.josm.gui.MainApplication; 90 import org.openstreetmap.josm.gui.MapFrame; 89 91 import org.openstreetmap.josm.gui.MapView; 90 92 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint; … … 176 178 public void setRecentRelation(Relation relation) { 177 179 recentRelations.put(relation, null); 178 if (Main.map != null && Main.map.relationListDialog != null) { 179 Main.map.relationListDialog.enableRecentRelations(); 180 MapFrame map = MainApplication.getMap(); 181 if (map != null && map.relationListDialog != null) { 182 map.relationListDialog.enableRecentRelations(); 180 183 } 181 184 } … … 188 191 public void removeRecentRelation(Relation relation) { 189 192 recentRelations.remove(relation); 190 if (Main.map != null && Main.map.relationListDialog != null) { 191 Main.map.relationListDialog.enableRecentRelations(); 193 MapFrame map = MainApplication.getMap(); 194 if (map != null && map.relationListDialog != null) { 195 map.relationListDialog.enableRecentRelations(); 192 196 } 193 197 } … … 478 482 Rendering painter = MapRendererFactory.getInstance().createActiveRenderer(g, mv, inactive); 479 483 painter.render(data, virtual, box); 480 Main .map.conflictDialog.paintConflicts(g, mv);484 MainApplication.getMap().conflictDialog.paintConflicts(g, mv); 481 485 } 482 486 … … 571 575 invalidate(); 572 576 // warn about new conflicts 573 if (numNewConflicts > 0 && Main.map != null && Main.map.conflictDialog != null) { 574 Main.map.conflictDialog.warnNumNewConflicts(numNewConflicts); 577 MapFrame map = MainApplication.getMap(); 578 if (numNewConflicts > 0 && map != null && map.conflictDialog != null) { 579 map.conflictDialog.warnNumNewConflicts(numNewConflicts); 575 580 } 576 581 } -
trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
r12028 r12630 22 22 import org.openstreetmap.josm.data.validation.Severity; 23 23 import org.openstreetmap.josm.data.validation.TestError; 24 import org.openstreetmap.josm.gui.MainApplication; 24 25 import org.openstreetmap.josm.gui.MapView; 25 26 import org.openstreetmap.josm.gui.dialogs.LayerListDialog; … … 49 50 super(tr("Validation errors")); 50 51 Main.getLayerManager().addLayerChangeListener(this); 51 Main .map.validatorDialog.tree.addInvalidationListener(invalidator);52 MainApplication.getMap().validatorDialog.tree.addInvalidationListener(invalidator); 52 53 } 53 54 … … 68 69 @Override 69 70 public void paint(final Graphics2D g, final MapView mv, Bounds bounds) { 70 DefaultMutableTreeNode root = Main .map.validatorDialog.tree.getRoot();71 DefaultMutableTreeNode root = MainApplication.getMap().validatorDialog.tree.getRoot(); 71 72 if (root == null || root.getChildCount() == 0) 72 73 return; … … 94 95 public String getToolTipText() { 95 96 MultiMap<Severity, TestError> errorTree = new MultiMap<>(); 96 List<TestError> errors = Main .map.validatorDialog.tree.getErrors();97 List<TestError> errors = MainApplication.getMap().validatorDialog.tree.getErrors(); 97 98 for (TestError e : errors) { 98 99 errorTree.put(e.getSeverity(), e); … … 173 174 @Override 174 175 public synchronized void destroy() { 175 Main .map.validatorDialog.tree.removeInvalidationListener(invalidator);176 MainApplication.getMap().validatorDialog.tree.removeInvalidationListener(invalidator); 176 177 Main.getLayerManager().removeLayerChangeListener(this); 177 178 super.destroy(); -
trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
r12620 r12630 14 14 import org.openstreetmap.josm.data.imagery.WMTSTileSource; 15 15 import org.openstreetmap.josm.data.projection.Projection; 16 import org.openstreetmap.josm.gui.MainApplication; 16 17 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings; 17 18 import org.openstreetmap.josm.tools.Logging; … … 71 72 @Override 72 73 public int getBestZoom() { 73 if (!Main .isDisplayingMapView())74 if (!MainApplication.isDisplayingMapView()) 74 75 return 0; 75 76 ScaleList scaleList = getNativeScales(); … … 77 78 return getMaxZoomLvl(); 78 79 } 79 double displayScale = Main .map.mapView.getScale();80 double displayScale = MainApplication.getMap().mapView.getScale(); 80 81 if (coordinateConverter.requiresReprojection()) { 81 82 displayScale *= Main.getProjection().getMetersPerUnit(); -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r12620 r12630 71 71 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 72 72 import org.openstreetmap.josm.gui.ExtendedDialog; 73 import org.openstreetmap.josm.gui.MainApplication; 73 74 import org.openstreetmap.josm.gui.layer.GpxLayer; 74 75 import org.openstreetmap.josm.gui.layer.Layer; … … 194 195 BoundingXYVisitor bbox = new BoundingXYVisitor(); 195 196 yLayer.visitBoundingBox(bbox); 196 Main .map.mapView.zoomTo(bbox);197 MainApplication.getMap().mapView.zoomTo(bbox); 197 198 } 198 199 -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
r12620 r12630 47 47 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 48 48 import org.openstreetmap.josm.gui.ExtendedDialog; 49 import org.openstreetmap.josm.gui.MainApplication; 49 50 import org.openstreetmap.josm.gui.MapFrame; 50 51 import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener; … … 458 459 459 460 private static Dimension scaledDimension(Image thumb) { 460 final double d = Main .map.mapView.getDist100Pixel();461 final double d = MainApplication.getMap().mapView.getDist100Pixel(); 461 462 final double size = 10 /*meter*/; /* size of the photo on the map */ 462 463 double s = size * 100 /*px*/ / d; … … 778 779 ImageEntry img = data.get(idx); 779 780 if (img.getPos() != null) { 780 Point imgCenter = Main .map.mapView.getPoint(img.getPos());781 Point imgCenter = MainApplication.getMap().mapView.getPoint(img.getPos()); 781 782 Rectangle imgRect; 782 783 if (useThumbs && img.hasThumbnail()) { … … 932 933 mouseAdapter = new MouseAdapter() { 933 934 private boolean isMapModeOk() { 934 return Main.map.mapMode == null || isSupportedMapMode(Main.map.mapMode); 935 MapMode mapMode = MainApplication.getMap().mapMode; 936 return mapMode == null || isSupportedMapMode(mapMode); 935 937 } 936 938 … … 977 979 978 980 mapModeListener = (oldMapMode, newMapMode) -> { 981 MapView mapView = MainApplication.getMap().mapView; 979 982 if (newMapMode == null || isSupportedMapMode(newMapMode)) { 980 Main.map.mapView.addMouseListener(mouseAdapter);981 Main.map.mapView.addMouseMotionListener(mouseMotionAdapter);983 mapView.addMouseListener(mouseAdapter); 984 mapView.addMouseMotionListener(mouseMotionAdapter); 982 985 } else { 983 Main.map.mapView.removeMouseListener(mouseAdapter);984 Main.map.mapView.removeMouseMotionListener(mouseMotionAdapter);986 mapView.removeMouseListener(mouseAdapter); 987 mapView.removeMouseMotionListener(mouseMotionAdapter); 985 988 } 986 989 }; 987 990 988 991 MapFrame.addMapModeChangeListener(mapModeListener); 989 mapModeListener.mapModeChange(null, Main .map.mapMode);992 mapModeListener.mapModeChange(null, MainApplication.getMap().mapMode); 990 993 991 994 Main.getLayerManager().addActiveLayerChangeListener(e -> { 992 995 if (Main.getLayerManager().getActiveLayer() == this) { 993 996 // only in select mode it is possible to click the images 994 Main .map.selectSelectTool(false);997 MainApplication.getMap().selectSelectTool(false); 995 998 } 996 999 }); … … 1006 1009 if (e.getRemovedLayer() == GeoImageLayer.this) { 1007 1010 stopLoadThumbs(); 1008 Main.map.mapView.removeMouseListener(mouseAdapter); 1009 Main.map.mapView.removeMouseMotionListener(mouseMotionAdapter); 1011 MapView mapView = MainApplication.getMap().mapView; 1012 mapView.removeMouseListener(mouseAdapter); 1013 mapView.removeMouseMotionListener(mouseMotionAdapter); 1010 1014 MapFrame.removeMapModeChangeListener(mapModeListener); 1011 1015 currentPhoto = -1; … … 1025 1029 }); 1026 1030 1027 if (Main.map.getToggleDialog(ImageViewerDialog.class) == null) { 1031 MapFrame map = MainApplication.getMap(); 1032 if (map.getToggleDialog(ImageViewerDialog.class) == null) { 1028 1033 ImageViewerDialog.newInstance(); 1029 Main.map.addToggleDialog(ImageViewerDialog.getInstance());1034 map.addToggleDialog(ImageViewerDialog.getInstance()); 1030 1035 } 1031 1036 } -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
r12460 r12630 23 23 24 24 import org.openstreetmap.josm.Main; 25 import org.openstreetmap.josm.gui.MainApplication; 25 26 import org.openstreetmap.josm.gui.dialogs.DialogsPanel.Action; 26 27 import org.openstreetmap.josm.gui.dialogs.ToggleDialog; … … 236 237 centerView = button.isEnabled() && button.isSelected(); 237 238 if (centerView && currentEntry != null && currentEntry.getPos() != null) { 238 Main .map.mapView.zoomTo(currentEntry.getPos());239 MainApplication.getMap().mapView.zoomTo(currentEntry.getPos()); 239 240 } 240 241 } else if (COMMAND_ZOOM.equals(action)) { … … 309 310 imageChanged = currentEntry != entry; 310 311 311 if (centerView && entry != null && Main .isDisplayingMapView() && entry.getPos() != null) {312 Main .map.mapView.zoomTo(entry.getPos());312 if (centerView && entry != null && MainApplication.isDisplayingMapView() && entry.getPos() != null) { 313 MainApplication.getMap().mapView.zoomTo(entry.getPos()); 313 314 } 314 315 -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
r12620 r12630 21 21 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry; 22 22 import org.openstreetmap.josm.data.cache.JCSCacheManager; 23 import org.openstreetmap.josm.gui.MainApplication; 23 24 import org.openstreetmap.josm.tools.ExifReader; 24 25 import org.openstreetmap.josm.tools.Logging; … … 79 80 public void run() { 80 81 Logging.debug("Load Thumbnails"); 81 tracker = new MediaTracker(Main .map.mapView);82 tracker = new MediaTracker(MainApplication.getMap().mapView); 82 83 for (ImageEntry entry : data) { 83 84 if (stop) return; … … 87 88 entry.setThumbnail(loadThumb(entry)); 88 89 89 if (layer != null && Main .isDisplayingMapView()) {90 if (layer != null && MainApplication.isDisplayingMapView()) { 90 91 layer.updateBufferAndRepaint(); 91 92 } -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java
r12279 r12630 36 36 import org.openstreetmap.josm.data.gpx.GpxTrack; 37 37 import org.openstreetmap.josm.gui.ExtendedDialog; 38 import org.openstreetmap.josm.gui.MainApplication; 38 39 import org.openstreetmap.josm.gui.layer.GpxLayer; 39 40 import org.openstreetmap.josm.tools.GBC; … … 279 280 if (v != 1 && v != 2) { 280 281 layer.trackVisibility = Arrays.copyOf(trackVisibilityBackup, layer.trackVisibility.length); 281 Main .map.repaint();282 MainApplication.getMap().repaint(); 282 283 return; 283 284 } -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java
r12377 r12630 19 19 20 20 import org.openstreetmap.josm.Main; 21 import org.openstreetmap.josm.gui.MainApplication; 21 22 import org.openstreetmap.josm.gui.layer.GpxLayer; 22 23 import org.openstreetmap.josm.gui.layer.Layer; … … 111 112 panel.savePreferences(layer.getName(), f); 112 113 } 113 Main .map.repaint();114 MainApplication.getMap().repaint(); 114 115 } 115 116 -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
r12328 r12630 26 26 import org.openstreetmap.josm.data.gpx.WayPoint; 27 27 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 28 import org.openstreetmap.josm.gui.MainApplication; 28 29 import org.openstreetmap.josm.gui.layer.GpxLayer; 29 30 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker; … … 115 116 } 116 117 Main.getLayerManager().addLayer(ml); 117 Main .map.repaint();118 MainApplication.getMap().repaint(); 118 119 } 119 120 } -
trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java
r12148 r12630 13 13 import org.openstreetmap.josm.data.projection.Projection; 14 14 import org.openstreetmap.josm.data.projection.Projections; 15 import org.openstreetmap.josm.gui.MainApplication; 15 16 import org.openstreetmap.josm.tools.ImageWarp; 16 17 import org.openstreetmap.josm.tools.Utils; … … 101 102 */ 102 103 protected void transform(BufferedImage imageIn) { 103 if (!Main .isDisplayingMapView()) {104 if (!MainApplication.isDisplayingMapView()) { 104 105 reset(); 105 106 return; 106 107 } 107 double scaleMapView = Main .map.mapView.getScale();108 double scaleMapView = MainApplication.getMap().mapView.getScale(); 108 109 ImageWarp.Interpolation interpolation; 109 110 switch (Main.pref.get("imagery.warp.pixel-interpolation", "bilinear")) { -
trunk/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToNativeLevelAction.java
r12603 r12630 8 8 import javax.swing.AbstractAction; 9 9 10 import org.openstreetmap.josm. Main;10 import org.openstreetmap.josm.gui.MainApplication; 11 11 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer; 12 12 … … 31 31 public void actionPerformed(ActionEvent ae) { 32 32 double newFactor = Math.sqrt(layer.getScaleFactor(layer.getZoomLevel())); 33 Main .map.mapView.zoomToFactor(newFactor);33 MainApplication.getMap().mapView.zoomToFactor(newFactor); 34 34 layer.invalidate(); 35 35 } -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
r12328 r12630 7 7 import java.util.Collections; 8 8 9 import org.openstreetmap.josm.Main;10 9 import org.openstreetmap.josm.data.coor.LatLon; 11 10 import org.openstreetmap.josm.data.gpx.GpxConstants; 12 11 import org.openstreetmap.josm.data.gpx.GpxLink; 13 12 import org.openstreetmap.josm.data.gpx.WayPoint; 13 import org.openstreetmap.josm.gui.MainApplication; 14 14 import org.openstreetmap.josm.io.audio.AudioPlayer; 15 15 import org.openstreetmap.josm.io.audio.AudioUtil; … … 56 56 try { 57 57 // first enable tracing the audio along the track 58 Main .map.mapView.playHeadMarker.animate();58 MainApplication.getMap().mapView.playHeadMarker.animate(); 59 59 60 60 AudioPlayer.play(audioUrl, offset + syncOffset + after); -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java
r10234 r12630 13 13 import org.openstreetmap.josm.Main; 14 14 import org.openstreetmap.josm.data.coor.LatLon; 15 import org.openstreetmap.josm.gui.MainApplication; 15 16 import org.openstreetmap.josm.gui.MapView; 16 17 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider; … … 38 39 39 40 @Override public boolean containsPoint(Point p) { 40 Point screen = Main .map.mapView.getPoint(getEastNorth());41 Point screen = MainApplication.getMap().mapView.getPoint(getEastNorth()); 41 42 buttonRectangle.setLocation(screen.x+4, screen.y+2); 42 43 return buttonRectangle.contains(p); -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r12620 r12630 39 39 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 40 40 import org.openstreetmap.josm.data.preferences.ColorProperty; 41 import org.openstreetmap.josm.gui.MainApplication; 41 42 import org.openstreetmap.josm.gui.MapView; 42 43 import org.openstreetmap.josm.gui.dialogs.LayerListDialog; … … 351 352 } 352 353 } 353 Main .map.mapView.zoomTo(currentMarker.getEastNorth());354 MainApplication.getMap().mapView.zoomTo(currentMarker.getEastNorth()); 354 355 } 355 356 … … 370 371 } 371 372 } 372 Main .map.mapView.zoomTo(currentMarker.getEastNorth());373 MainApplication.getMap().mapView.zoomTo(currentMarker.getEastNorth()); 373 374 } 374 375 … … 413 414 414 415 private static void playAdjacentMarker(Marker startMarker, boolean next) { 415 if (!Main .isDisplayingMapView())416 if (!MainApplication.isDisplayingMapView()) 416 417 return; 417 418 Marker m = null; … … 565 566 return; 566 567 } 567 PlayHeadMarker playHeadMarker = Main .map.mapView.playHeadMarker;568 PlayHeadMarker playHeadMarker = MainApplication.getMap().mapView.playHeadMarker; 568 569 if (playHeadMarker == null) 569 570 return; -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
r12579 r12630 22 22 import org.openstreetmap.josm.data.gpx.GpxTrackSegment; 23 23 import org.openstreetmap.josm.data.gpx.WayPoint; 24 import org.openstreetmap.josm.gui.MainApplication; 25 import org.openstreetmap.josm.gui.MapFrame; 24 26 import org.openstreetmap.josm.gui.MapView; 25 27 import org.openstreetmap.josm.gui.layer.GpxLayer; … … 63 65 if (!enabled) return; 64 66 dropTolerance = Main.pref.getInteger("marker.playHeadDropTolerance", 50); 65 if (Main.isDisplayingMapView()) { 66 Main.map.mapView.addMouseListener(new MouseAdapter() { 67 if (MainApplication.isDisplayingMapView()) { 68 MapFrame map = MainApplication.getMap(); 69 map.mapView.addMouseListener(new MouseAdapter() { 67 70 @Override public void mousePressed(MouseEvent ev) { 68 71 if (ev.getButton() == MouseEvent.BUTTON1 && playHead.containsPoint(ev.getPoint())) { 69 72 /* when we get a click on the marker, we need to switch mode to avoid 70 73 * getting confused with other drag operations (like select) */ 71 oldMode = Main.map.mapMode;74 oldMode = map.mapMode; 72 75 oldCoor = getCoor(); 73 76 PlayHeadDragMode playHeadDragMode = new PlayHeadDragMode(playHead); 74 Main.map.selectMapMode(playHeadDragMode);77 map.selectMapMode(playHeadDragMode); 75 78 playHeadDragMode.mousePressed(ev); 76 79 } … … 82 85 @Override 83 86 public boolean containsPoint(Point p) { 84 Point screen = Main .map.mapView.getPoint(getEastNorth());87 Point screen = MainApplication.getMap().mapView.getPoint(getEastNorth()); 85 88 Rectangle r = new Rectangle(screen.x, screen.y, symbol.getIconWidth(), 86 89 symbol.getIconHeight()); … … 121 124 setCoor(oldCoor); 122 125 } 123 Main.map.selectMapMode(oldMode); 124 Main.map.mapView.repaint(); 126 MapFrame map = MainApplication.getMap(); 127 map.selectMapMode(oldMode); 128 map.mapView.repaint(); 125 129 if (timer != null) { 126 130 timer.start(); … … 134 138 public void drag(EastNorth en) { 135 139 setEastNorth(en); 136 Main .map.mapView.repaint();140 MainApplication.getMap().mapView.repaint(); 137 141 } 138 142 … … 148 152 if (recent != null && recent.parentLayer != null && recent.parentLayer.fromLayer != null) { 149 153 /* work out EastNorth equivalent of 50 (default) pixels tolerance */ 150 Point p = Main.map.mapView.getPoint(en); 151 EastNorth enPlus25px = Main.map.mapView.getEastNorth(p.x+dropTolerance, p.y); 154 MapView mapView = MainApplication.getMap().mapView; 155 Point p = mapView.getPoint(en); 156 EastNorth enPlus25px = mapView.getEastNorth(p.x+dropTolerance, p.y); 152 157 cw = recent.parentLayer.fromLayer.data.nearestPointOnTrack(en, enPlus25px.east() - en.east()); 153 158 } … … 202 207 return; 203 208 /* First, see if we dropped onto an existing audio marker in the layer being played */ 204 Point startPoint = Main.map.mapView.getPoint(en); 209 MapView mapView = MainApplication.getMap().mapView; 210 Point startPoint = mapView.getPoint(en); 205 211 AudioMarker ca = null; 206 212 if (recent.parentLayer != null) { … … 225 231 if (ca == null) { 226 232 /* work out EastNorth equivalent of 50 (default) pixels tolerance */ 227 Point p = Main.map.mapView.getPoint(en);228 EastNorth enPlus25px = Main.map.mapView.getEastNorth(p.x+dropTolerance, p.y);233 Point p = mapView.getPoint(en); 234 EastNorth enPlus25px = mapView.getEastNorth(p.x+dropTolerance, p.y); 229 235 WayPoint cw = recent.parentLayer.fromLayer.data.nearestPointOnTrack(en, enPlus25px.east() - en.east()); 230 236 if (cw == null) { … … 345 351 (audioTime - w1.time)/(w2.time - w1.time))); 346 352 time = audioTime; 353 MapView mapView = MainApplication.getMap().mapView; 347 354 if (jumpToMarker) { 348 355 jumpToMarker = false; 349 Main.map.mapView.zoomTo(w1.getEastNorth());350 } 351 Main.map.mapView.repaint();356 mapView.zoomTo(w1.getEastNorth()); 357 } 358 mapView.repaint(); 352 359 } 353 360 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
r10453 r12630 14 14 import org.openstreetmap.josm.Main; 15 15 import org.openstreetmap.josm.actions.JosmAction; 16 import org.openstreetmap.josm.gui.MainApplication; 16 17 import org.openstreetmap.josm.gui.dialogs.MapPaintDialog; 17 18 import org.openstreetmap.josm.gui.layer.GpxLayer; … … 66 67 @Override 67 68 public void updateEnabledState() { 68 setEnabled(Main .isDisplayingMapView() && (Main.getLayerManager().getEditLayer() != null || mapHasGpxorMarkerLayer()));69 setEnabled(MainApplication.isDisplayingMapView() && (Main.getLayerManager().getEditLayer() != null || mapHasGpxorMarkerLayer())); 69 70 } 70 71 -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java
r12303 r12630 12 12 import javax.swing.ImageIcon; 13 13 14 import org.openstreetmap.josm.Main; 14 import org.openstreetmap.josm.gui.MainApplication; 15 import org.openstreetmap.josm.gui.MapView; 15 16 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; 16 17 import org.openstreetmap.josm.gui.mappaint.StyleSource; … … 149 150 if (temporary) { 150 151 disabledImgCache = null; 151 Main.map.mapView.preferenceChanged(null); // otherwise repaint is ignored, because layer hasn't changed 152 Main.map.mapView.repaint(); 152 MapView mapView = MainApplication.getMap().mapView; 153 mapView.preferenceChanged(null); // otherwise repaint is ignored, because layer hasn't changed 154 mapView.repaint(); 153 155 } 154 156 temporary = false; -
trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
r12620 r12630 20 20 21 21 import org.openstreetmap.josm.Main; 22 import org.openstreetmap.josm.gui.MainApplication; 22 23 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; 23 24 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource; … … 179 180 MapPaintStyles.readFromPreferences(); 180 181 } 181 if (Main .isDisplayingMapView()) {182 if (MainApplication.isDisplayingMapView()) { 182 183 MapPaintStyles.getStyles().clearCached(); 183 184 } -
trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
r12369 r12630 12 12 13 13 import org.openstreetmap.josm.Main; 14 import org.openstreetmap.josm.gui.MainApplication; 14 15 import org.openstreetmap.josm.gui.MapFrame; 15 16 import org.openstreetmap.josm.gui.MapStatus.BackgroundProgressMonitor; … … 107 108 108 109 BackgroundProgressMonitor backgroundMonitor = null; 109 MapFrame map = Main .map;110 MapFrame map = MainApplication.getMap(); 110 111 if (map != null) { 111 112 backgroundMonitor = map.statusLine.progressMonitor; … … 314 315 } 315 316 BackgroundProgressMonitor backgroundMonitor = null; 316 MapFrame map = Main .map;317 MapFrame map = MainApplication.getMap(); 317 318 if (map != null) { 318 319 backgroundMonitor = map.statusLine.progressMonitor; … … 339 340 dialog = null; 340 341 Main.currentProgressMonitor = null; 341 MapFrame map = Main .map;342 MapFrame map = MainApplication.getMap(); 342 343 if (map != null) { 343 344 map.statusLine.progressMonitor.setVisible(false); … … 354 355 doInEDT(() -> { 355 356 if (dialog != null) { 356 dialog.setInBackgroundPossible(taskId != null && Main .isDisplayingMapView());357 dialog.setInBackgroundPossible(taskId != null && MainApplication.isDisplayingMapView()); 357 358 reset(); 358 359 getDialog(); … … 366 367 doInEDT(() -> { 367 368 if (dialog != null) { 368 dialog.setInBackgroundPossible(taskId != null && Main .isDisplayingMapView());369 dialog.setInBackgroundPossible(taskId != null && MainApplication.isDisplayingMapView()); 369 370 } 370 371 }); -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
r12620 r12630 24 24 25 25 import org.openstreetmap.josm.Main; 26 import org.openstreetmap.josm.gui.MainApplication; 27 import org.openstreetmap.josm.gui.MapFrame; 26 28 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; 27 29 import org.openstreetmap.josm.gui.widgets.JosmComboBox; … … 51 53 @Override 52 54 public void focusLost(FocusEvent e) { 53 if (Main.map != null) { 54 Main.map.keyDetector.setEnabled(true); 55 MapFrame map = MainApplication.getMap(); 56 if (map != null) { 57 map.keyDetector.setEnabled(true); 55 58 } 56 59 } … … 58 61 @Override 59 62 public void focusGained(FocusEvent e) { 60 if (Main.map != null) { 61 Main.map.keyDetector.setEnabled(false); 63 MapFrame map = MainApplication.getMap(); 64 if (map != null) { 65 map.keyDetector.setEnabled(false); 62 66 } 63 67 // save unix system selection (middle mouse paste) -
trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
r12620 r12630 13 13 import javax.swing.text.JTextComponent; 14 14 15 import org.openstreetmap.josm.Main; 15 import org.openstreetmap.josm.gui.MainApplication; 16 import org.openstreetmap.josm.gui.MapFrame; 16 17 import org.openstreetmap.josm.tools.Logging; 17 18 … … 99 100 @Override 100 101 public void focusGained(FocusEvent e) { 101 if (Main.map != null) { 102 Main.map.keyDetector.setEnabled(false); 102 MapFrame map = MainApplication.getMap(); 103 if (map != null) { 104 map.keyDetector.setEnabled(false); 103 105 } 104 106 } … … 106 108 @Override 107 109 public void focusLost(FocusEvent e) { 108 if (Main.map != null) { 109 Main.map.keyDetector.setEnabled(true); 110 MapFrame map = MainApplication.getMap(); 111 if (map != null) { 112 map.keyDetector.setEnabled(true); 110 113 } 111 114 } -
trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextArea.java
r11308 r12630 9 9 import javax.swing.text.Document; 10 10 11 import org.openstreetmap.josm.Main; 11 import org.openstreetmap.josm.gui.MainApplication; 12 import org.openstreetmap.josm.gui.MapFrame; 12 13 13 14 /** … … 105 106 @Override 106 107 public void focusGained(FocusEvent e) { 107 if (Main.map != null) { 108 Main.map.keyDetector.setEnabled(false); 108 MapFrame map = MainApplication.getMap(); 109 if (map != null) { 110 map.keyDetector.setEnabled(false); 109 111 } 110 112 } … … 112 114 @Override 113 115 public void focusLost(FocusEvent e) { 114 if (Main.map != null) { 115 Main.map.keyDetector.setEnabled(true); 116 MapFrame map = MainApplication.getMap(); 117 if (map != null) { 118 map.keyDetector.setEnabled(true); 116 119 } 117 120 } -
trunk/src/org/openstreetmap/josm/gui/widgets/JosmTextField.java
r11809 r12630 14 14 import javax.swing.text.Document; 15 15 16 import org.openstreetmap.josm.Main; 16 import org.openstreetmap.josm.gui.MainApplication; 17 import org.openstreetmap.josm.gui.MapFrame; 17 18 18 19 /** … … 168 169 @Override 169 170 public void focusGained(FocusEvent e) { 170 if (Main.map != null) { 171 Main.map.keyDetector.setEnabled(false); 171 MapFrame map = MainApplication.getMap(); 172 if (map != null) { 173 map.keyDetector.setEnabled(false); 172 174 } 173 175 repaint(); … … 176 178 @Override 177 179 public void focusLost(FocusEvent e) { 178 if (Main.map != null) { 179 Main.map.keyDetector.setEnabled(true); 180 MapFrame map = MainApplication.getMap(); 181 if (map != null) { 182 map.keyDetector.setEnabled(true); 180 183 } 181 184 repaint();
Note:
See TracChangeset
for help on using the changeset viewer.