Index: /applications/editors/josm/plugins/editgpx/build.xml
===================================================================
--- /applications/editors/josm/plugins/editgpx/build.xml	(revision 16792)
+++ /applications/editors/josm/plugins/editgpx/build.xml	(revision 16793)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast." />
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/EditGpx" />
-                <attribute name="Plugin-Mainversion" value="1725" />
+                <attribute name="Plugin-Mainversion" value="1893" />
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
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 16792)
+++ /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 16793)
@@ -3,4 +3,6 @@
  */
 package org.openstreetmap.josm.plugins.editgpx;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -21,5 +23,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
@@ -37,6 +38,4 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
 
 public class EditGpxLayer extends Layer {
@@ -80,6 +79,6 @@
     public Component[] getMenuEntries() {
         return new Component[] {
-            new JMenuItem(new LayerListDialog.ShowHideLayerAction(this)),
-            new JMenuItem(new LayerListDialog.DeleteLayerAction(this)),
+            new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
+            new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
             new JSeparator(),
             new JMenuItem(layerImport),
@@ -206,5 +205,5 @@
         }
         public void actionPerformed(ActionEvent e) {
-            Main.main.addLayer(new GpxLayer(toGpxData(false), tr("Converted from: {0}", name)));
+            Main.main.addLayer(new GpxLayer(toGpxData(false), tr("Converted from: {0}", getName())));
             Main.main.removeLayer(EditGpxLayer.this);
         }
@@ -217,5 +216,5 @@
         }
         public void actionPerformed(ActionEvent e) {
-            Main.main.addLayer(new GpxLayer(toGpxData(true), tr("Converted from: {0}", name)));
+            Main.main.addLayer(new GpxLayer(toGpxData(true), tr("Converted from: {0}", getName())));
             Main.main.removeLayer(EditGpxLayer.this);
         }
Index: /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java
===================================================================
--- /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 16792)
+++ /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java	(revision 16793)
@@ -81,5 +81,5 @@
                         Layer layer = (Layer)value;
                         JLabel label = (JLabel)super.getListCellRendererComponent(list,
-                                                                                  layer.name, index, isSelected, cellHasFocus);
+                                                                                  layer.getName(), index, isSelected, cellHasFocus);
                         Icon icon = layer.getIcon();
                         label.setIcon(icon);