Index: plications/editors/josm/plugins/livegps/livegps/LiveGpsLayer.java
===================================================================
--- /applications/editors/josm/plugins/livegps/livegps/LiveGpsLayer.java	(revision 3074)
+++ 	(revision )
@@ -1,111 +1,0 @@
-package livegps;
-
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-
-import javax.swing.JLabel;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
-import org.openstreetmap.josm.gui.layer.RawGpsLayer;
-import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
-
-public class LiveGpsLayer extends RawGpsLayer {
-
-	LatLon lastPos;
-	GpsPoint lastPoint;
-	Collection<GpsPoint> trackBeingWritten;
-	float speed;
-	float course;
-	String status;
-	JLabel lbl;
-	boolean autocenter;
-	
-	public LiveGpsLayer(Collection<Collection<GpsPoint>> data)
-	{
-		super (data, "LiveGPS layer", null);
-		if (data.isEmpty())
-		{
-			data.add(new ArrayList<GpsPoint>());
-		}
-		for (Collection<GpsPoint> track : data) trackBeingWritten = track;
-		lbl = new JLabel();
-	}
-	
-	void setCurrentPosition(double lat, double lon)
-	{
-		LatLon thisPos = new LatLon(lat, lon);
-		if ((lastPos != null) && (thisPos.equalsEpsilon(lastPos))) {
-			// no change in position
-			// maybe show a "paused" cursor or some such
-			return;
-		}
-			
-		lastPos = thisPos;
-		lastPoint = new GpsPoint (thisPos, new Date().toString());
-		trackBeingWritten.add(lastPoint);
-		if (autocenter) center();
-		
-		Main.map.repaint();
-	}
-
-	public void center()
-	{
-		if (lastPoint != null) 
-			Main.map.mapView.zoomTo(lastPoint.eastNorth, Main.map.mapView.getScale());
-	}
-	
-	void setStatus(String status)
-	{
-		this.status = status;
-		Main.map.repaint();
-	}
-	
-	void setSpeed(float metresPerSecond)
-	{
-		speed = metresPerSecond;
-		Main.map.repaint();
-	}
-
-	void setCourse(float degrees)
-	{
-		course = degrees;
-		Main.map.repaint();
-	}
-	
-	void setAutoCenter(boolean ac)
-	{
-		autocenter = ac;
-	}
-
-	@Override public void paint(Graphics g, MapView mv)
-	{
-		super.paint(g, mv);
-		int statusHeight = 50;
-		Rectangle mvs = mv.getBounds();
-		mvs.y = mvs.y + mvs.height - statusHeight;
-		mvs.height = statusHeight;
-		g.setColor(new Color(1.0f, 1.0f, 1.0f, 0.8f)); 
-		g.fillRect(mvs.x, mvs.y, mvs.width, mvs.height);
-		
-		if (lastPoint != null)
-		{
-			Point screen = mv.getPoint(lastPoint.eastNorth);
-			g.setColor(Color.RED);
-			g.drawOval(screen.x-10, screen.y-10,20,20);
-			g.drawOval(screen.x-9, screen.y-9,18,18);
-		}
-		lbl.setText("gpsd: "+status+" Speed: " + speed + " Course: "+course);
-		lbl.setBounds(0, 0, mvs.width-10, mvs.height-10);
-		Graphics sub = g.create(mvs.x+5, mvs.y+5, mvs.width-10, mvs.height-10);
-		lbl.paint(sub);
-	}
-}
Index: plications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java
===================================================================
--- /applications/editors/josm/plugins/livegps/livegps/LiveGpsPlugin.java	(revision 3074)
+++ 	(revision )
@@ -1,86 +1,0 @@
-package livegps;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.layer.MarkerLayer;
-import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
-import org.openstreetmap.josm.plugins.Plugin;
-
-public class LiveGpsPlugin extends Plugin 
-{
-	private LiveGpsAcquirer acquirer = null;
-	private Thread acquirerThread = null;
-    private JMenu lgpsmenu;
-    private JCheckBoxMenuItem lgpscapture;
-    private JMenuItem lgpscenter;
-    private JCheckBoxMenuItem lgpsautocenter;
-    
-	private Collection<Collection<GpsPoint>> data = new ArrayList<Collection<GpsPoint>>();
-    private LiveGpsLayer lgpslayer;
-    
-    public LiveGpsPlugin() 
-    {
-        JMenuBar menu = Main.main.menu;
-        lgpsmenu = new JMenu("LiveGPS");
-        menu.add(lgpsmenu, 2);
-        lgpscapture = new JCheckBoxMenuItem("Capture GPS Track");
-        lgpscapture.setSelected(false);
-        lgpscapture.addChangeListener(new ChangeListener() {
-        	public void stateChanged(ChangeEvent ev) {
-        		if ((acquirer != null) && (!lgpscapture.isSelected()))
-        		{
-        			acquirer.shutdown();
-        			acquirer = null;
-        			acquirerThread = null;
-        		}
-        		else if ((acquirer == null) && (lgpscapture.isSelected()))
-        		{
-        			acquirer = new LiveGpsAcquirer();
-        			if (lgpslayer == null)
-        			{
-        		    	lgpslayer = new LiveGpsLayer(data);
-        				Main.main.addLayer(lgpslayer);
-        			}
-        			acquirer.setOutputLayer(lgpslayer);
-        			acquirerThread = new Thread(acquirer);
-        			acquirerThread.start();
-        		}
-        	}
-        });
-        lgpsmenu.add(lgpscapture);
-
-        lgpscenter = new JMenuItem("Center Once", KeyEvent.VK_C);
-        lgpscenter.addActionListener(new ActionListener() {
-        	public void actionPerformed(ActionEvent ev) {
-        		lgpslayer.center();
-        	}
-        });
-        lgpsmenu.add(lgpscenter);
-        
-        
-        lgpsautocenter = new JCheckBoxMenuItem("Auto-Center on current position");
-        lgpsautocenter.setSelected(false);
-        lgpsautocenter.addChangeListener(new ChangeListener() {
-        	public void stateChanged(ChangeEvent ev) {
-        		lgpslayer.setAutoCenter(lgpsautocenter.isSelected());
-        		if (lgpsautocenter.isSelected()) lgpslayer.center();
-        	}
-        });
-        lgpsmenu.add(lgpsautocenter);
-        
-    }
-}