Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

Timestamp:

2017-08-24T00:15:51+02:00 (8 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

File:

• trunk/src/org/openstreetmap/josm/data/osm/NoteData.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -10 +10 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.notes.Note;
@@ -16 +15 @@
 import org.openstreetmap.josm.data.notes.NoteComment;
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
@@ -85 +86 @@
     }
 
-    /** Returns the currently selected note
+    /**
+     * Returns the currently selected note
      * @return currently selected note
      */
@@ -92 +94 @@
     }
 
-    /** Set a selected note. Causes the dialog to select the note and
+    /**
+     * Set a selected note. Causes the dialog to select the note and
      * the note layer to draw the selected note's comments.
      * @param note Selected note. Null indicates no selection
@@ -98 +101 @@
     public void setSelectedNote(Note note) {
         selectedNote = note;
-        if (Main.map != null) {
-            Main.map.noteDialog.selectionChanged();
+        MapFrame map = MainApplication.getMap();
+        if (map != null) {
+            map.noteDialog.selectionChanged();
         }
         listeners.fireEvent(l -> l.selectedNoteChanged(this));
@@ -232 +236 @@
 
     private void dataUpdated() {
-        if (Main.isDisplayingMapView()) {
-            Main.map.noteDialog.setNotes(getSortedNotes());
+        if (MainApplication.isDisplayingMapView()) {
+            MainApplication.getMap().noteDialog.setNotes(getSortedNotes());
         }
         listeners.fireEvent(l -> l.noteDataUpdated(this));