Index: applications/editors/josm/plugins/walkingpapers/build.xml
===================================================================
--- applications/editors/josm/plugins/walkingpapers/build.xml	(revision 21706)
+++ applications/editors/josm/plugins/walkingpapers/build.xml	(revision 22549)
@@ -14,5 +14,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
@@ -23,11 +23,11 @@
 <project name="walkingpapers" default="dist" basedir=".">
 
-	<!-- 
-	** update before publishing 
+	<!--
+	** update before publishing
 	-->
 	<property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-	<property name="plugin.main.version" value="2830" />
+	<property name="plugin.main.version" value="3408" />
 
-	
+
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
 	<property name="plugin.dist.dir"        value="../../dist"/>
@@ -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/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java
===================================================================
--- applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java	(revision 21706)
+++ applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java	(revision 22549)
@@ -4,5 +4,4 @@
 
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -14,7 +13,6 @@
 import java.util.TreeSet;
 
+import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.Main;
@@ -119,5 +117,5 @@
 	}
 
-	class TileTimeComp implements Comparator<WalkingPapersTile> {
+	static class TileTimeComp implements Comparator<WalkingPapersTile> {
 		public int compare(WalkingPapersTile s1, WalkingPapersTile s2) {
 			long t1 = s1.access_time();
@@ -349,13 +347,13 @@
 
 	@Override
-	public Component[] getMenuEntries() {
-		return new Component[] {
-				new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-				new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-				new JSeparator(),
+	public Action[] getMenuEntries() {
+		return new Action[] {
+				LayerListDialog.getInstance().createShowHideLayerAction(),
+				LayerListDialog.getInstance().createDeleteLayerAction(),
+				SeparatorLayerAction.INSTANCE,
 				// color,
 				// new JMenuItem(new RenameLayerAction(associatedFile, this)),
-				new JSeparator(),
-				new JMenuItem(new LayerListPopup.InfoAction(this)) };
+				SeparatorLayerAction.INSTANCE,
+				new LayerListPopup.InfoAction(this) };
 	}