Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (revision 33376) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (revision 33819) @@ -28,4 +28,5 @@ 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,6 +72,6 @@ super(info); VideoEngine.setupPlayer(); - Main.getLayerManager().addLayerChangeListener(this); - Main.getLayerManager().addActiveLayerChangeListener(this); + MainApplication.getLayerManager().addLayerChangeListener(this); + MainApplication.getLayerManager().addActiveLayerChangeListener(this); createMenusAndShortCuts(); enableVideoControlMenus(false); @@ -80,5 +81,6 @@ 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,5 +288,5 @@ 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,5 +345,5 @@ @Override public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) { - handleLayer(Main.getLayerManager().getActiveLayer()); + handleLayer(MainApplication.getLayerManager().getActiveLayer()); } Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java (revision 33376) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPositionLayer.java (revision 33819) @@ -28,4 +28,5 @@ 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,5 +52,5 @@ gpsTimeFormat = new SimpleDateFormat("HH:mm:ss"); iconPosition = gpsTrack.get(0); - Main.getLayerManager().addLayer(this); + MainApplication.getLayerManager().addLayer(this); } @@ -77,5 +78,5 @@ 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,5 +87,5 @@ 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,5 +95,5 @@ 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,8 +217,8 @@ 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,5 +245,5 @@ //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,5 +301,5 @@ public void unload() { - Main.getLayerManager().removeLayer(this); + MainApplication.getLayerManager().removeLayer(this); } } Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java (revision 33376) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideo.java (revision 33819) @@ -7,6 +7,6 @@ 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,5 +52,5 @@ lastWayPoint = getLastGPS(); markSyncedWayPoints(); - Main.map.mapView.repaint(); + MainApplication.getMap().mapView.repaint(); } Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java =================================================================== --- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java (revision 33376) +++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java (revision 33819) @@ -8,5 +8,5 @@ import java.util.List; -import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.tools.Logging; import com.sun.jna.NativeLibrary; @@ -51,5 +51,5 @@ WindowsRuntimeUtil.VLC_INSTALL_DIR_KEY); } catch (RuntimeException e) { - Main.error(e); + Logging.error(e); } } @@ -61,8 +61,8 @@ 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,9 +76,9 @@ 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,7 +97,7 @@ //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!")); } }