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

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• FilterMatcher.java (modified) (3 diffs)
• FilterModel.java (modified) (2 diffs)
• NoteData.java (modified) (6 diffs)
• history/HistoryDataSet.java (modified) (2 diffs)
• visitor/BoundingXYVisitor.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
 import org.openstreetmap.josm.actions.search.SearchCompiler;
@@ -12 +11 @@
 import org.openstreetmap.josm.actions.search.SearchCompiler.Not;
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
@@ -224 +225 @@
 
     private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
-
+        MapFrame map = MainApplication.getMap();
         if (primitive.isIncomplete() ||
-                (Main.map != null && Main.map.mapMode != null && Main.map.mapMode.getPreservedPrimitives().contains(primitive)))
+                (map != null && map.mapMode != null && map.mapMode.getPreservedPrimitives().contains(primitive)))
             return FilterType.NOT_FILTERED;
 

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

@@ -19 +19 @@
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
 import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.OSDLabel;
@@ -323 +324 @@
         lblOSD.setSize(lblOSD.getPreferredSize());
 
-        int dx = Main.map.mapView.getWidth() - lblOSD.getPreferredSize().width - 15;
+        int dx = MainApplication.getMap().mapView.getWidth() - lblOSD.getPreferredSize().width - 15;
         int dy = 15;
         g.translate(dx, dy);

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));

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -226 +227 @@
     @Override
     public void layerRemoving(LayerRemoveEvent e) {
-        if (!Main.isDisplayingMapView()) return;
+        if (!MainApplication.isDisplayingMapView()) return;
         if (Main.getLayerManager().getLayers().isEmpty()) {
             data.clear();

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 
 /**
@@ -197 +199 @@
             return;
         // convert size from meters to east/north units
-        double enSize = size * Main.map.mapView.getScale() / Main.map.mapView.getDist100Pixel() * 100;
+        MapFrame map = MainApplication.getMap();
+        double enSize = size * map.mapView.getScale() / map.mapView.getDist100Pixel() * 100;
         visit(bounds.getMin().add(-enSize/2, -enSize/2));
         visit(bounds.getMax().add(+enSize/2, +enSize/2));