Changeset 33819 in osm for applications/editors/josm

Timestamp:

2017-11-17T00:59:50+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12840

Location:

applications/editors/josm/plugins/videomapping

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java (modified) (5 diffs)

applications/editors/josm/plugins/videomapping/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="fix after JOSM update"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12840"/>
     <property name="plugin.author" value="Matthias Meißer"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.videomapping.VideoPlugin"/>

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java

@@ -28 +28 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -71 +72 @@
         super(info);
         VideoEngine.setupPlayer();
-        Main.getLayerManager().addLayerChangeListener(this);
-        Main.getLayerManager().addActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addLayerChangeListener(this);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         createMenusAndShortCuts();
         enableVideoControlMenus(false);
@@ -80 +81 @@
 
     private void createMenusAndShortCuts() {
-        VMenu = Main.main.menu.addMenu("Video", tr("Video"), KeyEvent.VK_Q, Main.main.menu.getDefaultMenuPos(), ht("/Plugin/Videomapping"));
+        VMenu = MainApplication.getMenu().addMenu("Video", tr("Video"), KeyEvent.VK_Q,
+                MainApplication.getMenu().getDefaultMenuPos(), ht("/Plugin/Videomapping"));
         VMenu.setEnabled(false);
         VAdd = new JosmAction(tr("Import Video"), "videomapping", tr("Sync a video against this GPS track"), null, false) {
@@ -286 +288 @@
 
     private void saveProperties() {
-        Main.pref.put(PROP_AUTOCENTER, autoCenter);
+        Main.pref.putBoolean(PROP_AUTOCENTER, autoCenter);
         Main.pref.put(PROP_JUMPLENGTH, jumpLength.toString());
         Main.pref.put(PROP_LOOPLENGTH, loopLength.toString());
@@ -343 +345 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        handleLayer(Main.getLayerManager().getActiveLayer());
+        handleLayer(MainApplication.getLayerManager().getActiveLayer());
     }
 

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -51 +52 @@
         gpsTimeFormat = new SimpleDateFormat("HH:mm:ss");
         iconPosition = gpsTrack.get(0);
-        Main.getLayerManager().addLayer(this);
+        MainApplication.getLayerManager().addLayer(this);
     }
 
@@ -77 +78 @@
         g.setColor(Color.YELLOW);
         for (WayPoint n: gpsTrack) {
-            Point p = map.getPoint(n.getEastNorth());
+            Point p = map.getPoint(n.getEastNorth(Main.getProjection()));
             g.drawOval(p.x - 2, p.y - 2, 4, 4);
         }
@@ -86 +87 @@
         for (WayPoint n : gpsTrack) {
             if (n.attr.containsKey("synced")) {
-                Point p = map.getPoint(n.getEastNorth());
+                Point p = map.getPoint(n.getEastNorth(Main.getProjection()));
                 g.drawOval(p.x - 2, p.y - 2, 4, 4);
             }
@@ -94 +95 @@
     private void paintPositionIcon(Graphics2D g, MapView map) {
         if (iconPosition != null) {
-            Point p = map.getPoint(iconPosition.getEastNorth());
+            Point p = map.getPoint(iconPosition.getEastNorth(Main.getProjection()));
             layerIcon.paintIcon(null, g, p.x-layerIcon.getIconWidth()/2, p.y-layerIcon.getIconHeight()/2);
             g.drawString(gpsTimeFormat.format(iconPosition.getTime()), p.x-15, p.y-15);
@@ -216 +217 @@
     public void setIconPosition(WayPoint wp) {
         iconPosition = wp;
-        if (Main.isDisplayingMapView()) {
-            Main.map.mapView.repaint();
+        if (MainApplication.isDisplayingMapView()) {
+            invalidate();
             if (autoCenter)
-                Main.map.mapView.zoomTo(iconPosition.getCoor());
+                MainApplication.getMap().mapView.zoomTo(iconPosition.getCoor());
         }
     }
@@ -244 +245 @@
         //iterate through all possible notes
         for (WayPoint n : gpsTrack) {
-            p = Main.map.mapView.getPoint(n.getEastNorth());
+            p = MainApplication.getMap().mapView.getPoint(n.getEastNorth(Main.getProjection()));
             if (rect.contains(p)) {
                 return n;
@@ -300 +301 @@
 
     public void unload() {
-        Main.getLayerManager().removeLayer(this);
+        MainApplication.getLayerManager().removeLayer(this);
     }
 }

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java

@@ -7 +7 @@
 import javax.swing.JComponent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.videomapping.VideoPositionLayer;
 
@@ -52 +52 @@
         lastWayPoint = getLastGPS();
         markSyncedWayPoints();
-        Main.map.mapView.repaint();
+        MainApplication.getMap().mapView.repaint();
     }
 

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java

@@ -8 +8 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 import com.sun.jna.NativeLibrary;
@@ -51 +51 @@
                             WindowsRuntimeUtil.VLC_INSTALL_DIR_KEY);
                 } catch (RuntimeException e) {
-                    Main.error(e);
+                    Logging.error(e);
                 }
             }
@@ -61 +61 @@
 
         if (vlcInstallDir != null) {
-            Main.info("videomapping: found VLC install dir: "+vlcInstallDir);
+            Logging.info("videomapping: found VLC install dir: "+vlcInstallDir);
             NativeLibrary.addSearchPath("libvlc", vlcInstallDir);
         } else {
-            Main.error("videomapping: unable to locate VLC install dir");
+            Logging.error("videomapping: unable to locate VLC install dir");
         }
     }
@@ -76 +76 @@
             fullScreenStrategy = new DefaultFullScreenStrategy(parent);
         } catch (NoClassDefFoundError e) {
-            Main.error(tr("Unable to find JNA Java library!"));
+            Logging.error(tr("Unable to find JNA Java library!"));
         } catch (UnsatisfiedLinkError e) {
-            Main.error(tr("Unable to find native libvlc library!"));
+            Logging.error(tr("Unable to find native libvlc library!"));
         } catch (Exception t) {
-            Main.error(t);
+            Logging.error(t);
         }
     }
@@ -97 +97 @@
             //now fetching and playback starts automatically
         } catch (NoClassDefFoundError e) {
-            Main.error(tr("Unable to find JNA Java library!"));
+            Logging.error(tr("Unable to find JNA Java library!"));
         } catch (UnsatisfiedLinkError e) {
-            Main.error(tr("Unable to find native libvlc library!"));
+            Logging.error(tr("Unable to find native libvlc library!"));
         }
     }