Index: applications/editors/josm/plugins/graphview/build.xml
===================================================================
--- applications/editors/josm/plugins/graphview/build.xml	(revision 21706)
+++ applications/editors/josm/plugins/graphview/build.xml	(revision 22547)
@@ -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
@@ -26,8 +26,8 @@
 -->
 <project name="graphview" default="dist" basedir=".">
- 
+
 	<property name="commit.message" value="prevent stack overflows; closes bug 4695 in JOSM Trac" />
-	<property name="plugin.main.version" value="3314" />
-	
+	<property name="plugin.main.version" value="3408" />
+
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.build.dir"       value="build"/>
@@ -136,11 +136,11 @@
         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
-	
-	
+
+
 	<!--
-		 ************************** Publishing the plugin *********************************** 
-		-->
-		<!--
-		** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+		 ************************** Publishing the plugin ***********************************
+		-->
+		<!--
+		** extracts the JOSM release for the JOSM version in ../core and saves it in the
 		** property ${coreversion.info.entry.revision}
 		**
@@ -191,15 +191,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/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java	(revision 21706)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/layer/GraphViewLayer.java	(revision 22547)
@@ -3,5 +3,4 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -13,7 +12,6 @@
 import java.util.List;
 
+import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.Main;
@@ -324,9 +322,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)};
 	}