Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java
===================================================================
--- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java	(revision 22690)
+++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java	(revision 22691)
@@ -2,27 +2,44 @@
 
 
-import static org.openstreetmap.josm.tools.I18n.tr;
+import java.sql.Time;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Cursor;
+import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-import java.text.SimpleDateFormat;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
+
+import javax.swing.*;
+
+import static org.openstreetmap.josm.tools.I18n.*;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.InfoAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
@@ -31,4 +48,8 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.videomapping.video.GPSVideoPlayer;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
+
+import com.sun.jna.StringArray;
 
 //Basic rendering and GPS layer interaction
@@ -45,5 +66,5 @@
 	private SimpleDateFormat gpsTimeCode;
 	private GPSVideoPlayer gps;
-
+		
 	public PositionLayer(String name, final List<WayPoint> ls) {
 		super(name);
@@ -55,6 +76,6 @@
 		gpsTimeCode= new SimpleDateFormat("hh:mm:ss");
 		Main.map.mapView.addMouseListener(this);
-		Main.map.mapView.addMouseMotionListener(this);
-
+		Main.map.mapView.addMouseMotionListener(this);							
+		
 	}
 
@@ -75,13 +96,14 @@
 
 	@Override
-	public Action[] getMenuEntries() {
-        return new Action[]{
-                LayerListDialog.getInstance().createShowHideLayerAction(),
-                LayerListDialog.getInstance().createDeleteLayerAction(),
-                SeparatorLayerAction.INSTANCE,
+	public Component[] getMenuEntries() {
+        return new Component[]{
+                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
+                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
+                new JSeparator(),
                 //TODO here my stuff
-                new LayerListPopup.InfoAction(this)};//TODO here infos about the linked videos
-	}
-
+                new JSeparator(),
+                new JMenuItem(new LayerListPopup.InfoAction(this))};//TODO here infos about the linked videos
+	}
+	  
 
 
@@ -99,9 +121,9 @@
 	@Override
 	public void mergeFrom(Layer arg0) {
-
-	}
-
-
-
+		
+	}
+
+	
+	
 	@Override
 	//Draw the current position, infos, waypoints
@@ -157,5 +179,5 @@
 			{
 				p=Main.map.mapView.getPoint(iconPosition.getEastNorth());
-				icon.paintIcon(null, g, p.x-icon.getIconWidth()/2, p.y-icon.getIconHeight()/2);
+				icon.paintIcon(null, g, p.x-icon.getIconWidth()/2, p.y-icon.getIconHeight()/2);				
 				//g.drawString(mins.format(iconPosition.getTime()),p.x-10,p.y-10); //TODO when synced we might wan't to use a different layout
 				g.drawString(gpsTimeCode.format(iconPosition.getTime()),p.x-10,p.y-10);
@@ -166,10 +188,10 @@
 			if (player.getCurr()!=null){
 			p=Main.map.mapView.getPoint(player.getCurr().getEastNorth());
-			icon.paintIcon(null, g, p.x-icon.getIconWidth()/2, p.y-icon.getIconHeight()/2);
+			icon.paintIcon(null, g, p.x-icon.getIconWidth()/2, p.y-icon.getIconHeight()/2);			
 			g.drawString(gpsTimeCode.format(player.getCurr().getTime()),p.x-10,p.y-10);
 			}
 		}
 	}
-
+	
 	//finds the first waypoint that is nearby the given point
 	private WayPoint getNearestWayPoint(Point mouse)
@@ -183,13 +205,13 @@
 			p = Main.map.mapView.getPoint(n.getEastNorth());
 			if (rect.contains(p))
-			{
+			{				
 				return n;
 			}
-
+			
 		}
 		return null;
-
-	}
-
+		
+	}
+	
 	//upper left corner like rectangle
 	private Rectangle getIconRect()
@@ -206,8 +228,8 @@
 	}
 
-	public void mouseClicked(MouseEvent e) {
-	}
-
-	public void mouseEntered(MouseEvent arg0) {
+	public void mouseClicked(MouseEvent e) {		
+	}
+
+	public void mouseEntered(MouseEvent arg0) {	
 	}
 
@@ -228,9 +250,9 @@
 			}
 		}
-
-	}
-
+		
+	}
+	
 	//
-	public void mouseReleased(MouseEvent e) {
+	public void mouseReleased(MouseEvent e) {		
 		//only leftclicks on our layer
 		if(e.getButton() == MouseEvent.BUTTON1) {
@@ -251,11 +273,11 @@
 			Main.map.mapView.repaint();
 		}
-
-	}
-
+		
+	}
+	
 	//slide and restrict during movement
-	public void mouseDragged(MouseEvent e) {
+	public void mouseDragged(MouseEvent e) {		
 		if(dragIcon)
-		{
+		{			
 			mouse=e.getPoint();
 			//restrict to GPS track
@@ -267,7 +289,7 @@
 
 	//visualize drag&drop
-	public void mouseMoved(MouseEvent e) {
+	public void mouseMoved(MouseEvent e) {		
 		if (player.getCurr()!=null)
-		{
+		{						
 			if (getIconRect().contains(e.getPoint()))
 			{
@@ -279,12 +301,12 @@
 			}
 		}
-
+		
 	}
 
 	public void setGPSPlayer(GPSVideoPlayer player) {
 		this.gps = player;
-
-	}
-
+		
+	}
+	
 	public static void addObserver(PlayerObserver observer) {
 
@@ -293,5 +315,5 @@
     }
 
-
+ 
 
     public static void removeObserver(PlayerObserver observer) {