Changeset 33545 in osm for applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java

Timestamp:

2017-08-26T20:45:43+02:00 (7 years ago)

Author:

zverik

Message:

Upgrade API for geochat

File:

• applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java (modified) (8 diffs)

applications/editors/josm/plugins/geochat/src/geochat/ChatServerConnection.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -122 +124 @@
                     }
                 } catch (InterruptedException e) {
-                    Main.warn(e);
+                    Logging.warn(e);
                 }
                 autoLogin(userName);
@@ -164 +166 @@
             });
         } catch (UnsupportedEncodingException e) {
-            Main.error(e);
+            Logging.error(e);
         }
     }
@@ -266 +268 @@
             });
         } catch (UnsupportedEncodingException e) {
-            Main.error(e);
+            Logging.error(e);
         }
     }
@@ -274 +276 @@
      */
     private static LatLon getPosition() {
-        if (Main.map == null || Main.map.mapView == null)
+        if (!MainApplication.isDisplayingMapView())
             return null;
         if (getCurrentZoom() < 10)
             return null;
         Projection proj = Main.getProjection();
-        return proj.eastNorth2latlon(Main.map.mapView.getCenter());
+        return proj.eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
     }
 
@@ -294 +296 @@
 
     public static int getCurrentZoom() {
-        if (Main.map == null || Main.map.mapView == null) {
+        if (!MainApplication.isDisplayingMapView()) {
             return 1;
         }
-        MapView mv = Main.map.mapView;
+        MapView mv = MainApplication.getMap().mapView;
         LatLon topLeft = mv.getLatLon(0, 0);
         LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());
@@ -434 +436 @@
                     result.add(cm);
                 } catch (JsonException e) {
-                    Main.trace(e);
+                    Logging.trace(e);
                 }
             }
@@ -450 +452 @@
                     result.put(name, new LatLon(lat, lon));
                 } catch (JsonException e) {
-                    Main.trace(e);
+                    Logging.trace(e);
                 }
             }