Index: /utils/josm/plugins/landsat/src/landsat/LandsatLayer.java
===================================================================
--- /utils/josm/plugins/landsat/src/landsat/LandsatLayer.java	(revision 1442)
+++ /utils/josm/plugins/landsat/src/landsat/LandsatLayer.java	(revision 1443)
@@ -17,5 +17,5 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.dialogs.LayerList;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -92,6 +92,6 @@
 	@Override public Component[] getMenuEntries() {
 		return new Component[]{
-				new JMenuItem(new LayerList.ShowHideLayerAction(this)),
-				new JMenuItem(new LayerList.DeleteLayerAction(this)),
+				new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
+				new JMenuItem(new LayerListDialog.DeleteLayerAction(this)),
 				new JSeparator(),
 				new JMenuItem(new LayerListPopup.InfoAction(this))};
Index: /utils/josm/plugins/mappaint/.project
===================================================================
--- /utils/josm/plugins/mappaint/.project	(revision 1442)
+++ /utils/josm/plugins/mappaint/.project	(revision 1443)
@@ -11,13 +11,4 @@
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Ant.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
Index: /utils/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java
===================================================================
--- /utils/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java	(revision 1442)
+++ /utils/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java	(revision 1443)
@@ -23,7 +23,7 @@
 
 	/**
-	 * Draw a small rectangle. 
+	 * Draw a small rectangle.
 	 * White if selected (as always) or red otherwise.
-	 * 
+	 *
 	 * @param n The node to draw.
 	 */
@@ -44,5 +44,5 @@
 		else
 		{
-			drawNode(n, n.selected ? getPreferencesColor("selected", 
+			drawNode(n, n.selected ? getPreferencesColor("selected",
 									Color.YELLOW)
 				: getPreferencesColor("node", Color.RED));
@@ -92,5 +92,5 @@
 			{
 				if (!ls.selected) // selected already in good color
-					drawSegment(ls, w.selected ? 
+					drawSegment(ls, w.selected ?
 						getPreferencesColor("selected", Color.YELLOW) : colour,
 						width);
@@ -118,5 +118,5 @@
 		}
 
-		g.setColor( w.selected ? 
+		g.setColor( w.selected ?
 						getPreferencesColor("selected", Color.YELLOW) : colour);
 
@@ -146,10 +146,10 @@
 	 * Draw a line with the given color.
 	 */
-	// Altered - now specify width 
+	// Altered - now specify width
 	@Override protected void drawSegment(Segment ls, Color col) {
 			drawSegment(ls,col,1);
 	}
 
-	// Altered - now specify width 
+	// Altered - now specify width
 	private void drawSegment (Segment ls, Color col, int width) {
 		Graphics2D g2d = (Graphics2D)g;