Index: applications/editors/josm/plugins/editgpx/build.xml
===================================================================
--- applications/editors/josm/plugins/editgpx/build.xml	(revision 22547)
+++ applications/editors/josm/plugins/editgpx/build.xml	(revision 22548)
@@ -18,5 +18,5 @@
 **
 ** To build against the core in ../../core, create a correct manifest and deploy to
-** SVN, 
+** SVN,
 **    set the properties commit.message and plugin.main.version
 ** and run
@@ -29,5 +29,5 @@
 
 	<property name="commit.message" value="Changed constructor signature of plugin main class" />
-	<property name="plugin.main.version" value="2907" />
+	<property name="plugin.main.version" value="3408" />
 
 
@@ -89,8 +89,8 @@
 
 	<!--
-	 ************************** Publishing the plugin *********************************** 
+	 ************************** Publishing the plugin ***********************************
 	-->
 	<!--
-	** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+	** extracts the JOSM release for the JOSM version in ../core and saves it in the
 	** property ${coreversion.info.entry.revision}
 	**
@@ -141,15 +141,15 @@
 
 	<!--
-	** commits the plugin.jar 
+	** commits the plugin.jar
 	-->
 	<target name="commit-dist">
 		<echo>
 ***** Properties of published ${plugin.jar} *****
-Commit message    : '${commit.message}'					
+Commit message    : '${commit.message}'
 Plugin-Mainversion: ${plugin.main.version}
 JOSM build version: ${coreversion.info.entry.revision}
 Plugin-Version    : ${version.entry.commit.revision}
-***** / Properties of published ${plugin.jar} *****					
-					
+***** / Properties of published ${plugin.jar} *****
+
 Now commiting ${plugin.jar} ...
 </echo>
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 22547)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 22548)
@@ -7,5 +7,4 @@
 
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Graphics2D;
 import java.awt.Point;
@@ -14,8 +13,7 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-import javax.swing.JMenuItem;
-import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.Main;
@@ -73,14 +71,14 @@
 
 	@Override
-	public Component[] getMenuEntries() {
-		return new Component[] {
-				new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-				new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-				new JSeparator(),
-				new JMenuItem(layerImport),
-				new JMenuItem(new ConvertToGpxLayerAction()),
-				new JMenuItem(new ConvertToAnonTimeGpxLayerAction()),
-				new JSeparator(),
-				new JMenuItem(new LayerListPopup.InfoAction(this))};
+	public Action[] getMenuEntries() {
+		return new Action[] {
+				LayerListDialog.getInstance().createShowHideLayerAction(),
+				LayerListDialog.getInstance().createDeleteLayerAction(),
+				SeparatorLayerAction.INSTANCE,
+				layerImport,
+				new ConvertToGpxLayerAction(),
+				new ConvertToAnonTimeGpxLayerAction(),
+				SeparatorLayerAction.INSTANCE,
+				new LayerListPopup.InfoAction(this)};
 	}
 
Index: applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java
===================================================================
--- applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java	(revision 22547)
+++ applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java	(revision 22548)
@@ -25,5 +25,4 @@
  * TODO:
  * - BUG: when importing eGpxLayer is shown as RawGpxLayer??
- * - BUG: after deletion of layer not all data is deleted (eg dataset)
  * - implement reset if user made mistake while marking
  *
Index: applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 22547)
+++ applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 22548)
@@ -18,5 +18,5 @@
 **
 ** To build against the core in ../../core, create a correct manifest and deploy to
-** SVN, 
+** SVN,
 **    set the properties commit.message and plugin.main.version
 ** and run
@@ -28,5 +28,5 @@
 
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-	<property name="plugin.main.version" value="3157" />
+	<property name="plugin.main.version" value="3408" />
 
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -87,8 +87,8 @@
 
 	<!--
-		 ************************** Publishing the plugin *********************************** 
+		 ************************** Publishing the plugin ***********************************
 		-->
 	<!--
-		** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+		** extracts the JOSM release for the JOSM version in ../core and saves it in the
 		** property ${coreversion.info.entry.revision}
 		**
@@ -139,15 +139,15 @@
 
 	<!--
-		** commits the plugin.jar 
+		** commits the plugin.jar
 		-->
 	<target name="commit-dist">
 		<echo>
 	***** Properties of published ${plugin.jar} *****
-	Commit message    : '${commit.message}'					
+	Commit message    : '${commit.message}'
 	Plugin-Mainversion: ${plugin.main.version}
 	JOSM build version: ${coreversion.info.entry.revision}
 	Plugin-Version    : ${version.entry.commit.revision}
-	***** / Properties of published ${plugin.jar} *****					
-						
+	***** / Properties of published ${plugin.jar} *****
+
 	Now commiting ${plugin.jar} ...
 	</echo>
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 22547)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 22548)
@@ -30,5 +30,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -42,8 +41,7 @@
 import java.util.List;
 
+import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-import javax.swing.JMenuItem;
-import javax.swing.JSeparator;
 import javax.swing.JToolTip;
 
@@ -74,5 +72,5 @@
     private static ImageIcon iconError = OsbPlugin.loadIcon("icon_error16.png");
     private static ImageIcon iconValid = OsbPlugin.loadIcon("icon_valid16.png");
-    
+
     private OsbDialog dialog;
 
@@ -100,12 +98,12 @@
 
     @Override
-    public Component[] getMenuEntries() {
-        return new Component[]{
-                new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-                new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-                new JSeparator(),
-                new JMenuItem(new RenameLayerAction(null, this)),
-                new JSeparator(),
-                new JMenuItem(new LayerListPopup.InfoAction(this))};
+    public Action[] getMenuEntries() {
+        return new Action[]{
+                LayerListDialog.getInstance().createShowHideLayerAction(),
+                LayerListDialog.getInstance().createDeleteLayerAction(),
+                SeparatorLayerAction.INSTANCE,
+                new RenameLayerAction(null, this),
+                SeparatorLayerAction.INSTANCE,
+                new LayerListPopup.InfoAction(this)};
     }
 
@@ -272,5 +270,5 @@
 
     public void mouseExited(MouseEvent e) {}
-    
+
     public DataSet getDataSet() {
         return data;