Index: /applications/editors/josm/plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java	(revision 22048)
@@ -9,6 +9,5 @@
 import java.util.Vector;
 import javax.swing.DefaultListModel;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class SettingsStoptypeCommand extends Command
@@ -85,7 +84,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.Settings.ChangeStoptype");
+    return new JLabel("public_transport.Settings.ChangeStoptype");
   }
   
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistAddCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistAddCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistAddCommand.java	(revision 22048)
@@ -8,6 +8,5 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class TrackStoplistAddCommand extends Command
@@ -42,7 +41,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.TrackStoplist.Add");
+    return new JLabel("public_transport.TrackStoplist.Add");
   }
 };
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java	(revision 22048)
@@ -8,6 +8,5 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class TrackStoplistDeleteCommand extends Command
@@ -95,7 +94,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.TrackStoplist.Delete");
+    return new JLabel("public_transport.TrackStoplist.Delete");
   }
 };
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java	(revision 22048)
@@ -8,6 +8,5 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class TrackStoplistDetachCommand extends Command
@@ -74,7 +73,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.TrackStoplist.Detach");
+    return new JLabel("public_transport.TrackStoplist.Detach");
   }
 };
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java	(revision 22048)
@@ -9,6 +9,5 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class TrackStoplistNameCommand extends Command
@@ -102,7 +101,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.TrackStoplist.Edit");
+    return new JLabel("public_transport.TrackStoplist.Edit");
   }
 };
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistRelocateCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistRelocateCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistRelocateCommand.java	(revision 22048)
@@ -11,6 +11,5 @@
 import java.util.Vector;
 import javax.swing.DefaultListModel;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class TrackStoplistRelocateCommand extends Command
@@ -87,7 +86,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.TrackStoplist.RelocateNodes");
+    return new JLabel("public_transport.TrackStoplist.RelocateNodes");
   }
 };
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java	(revision 22048)
@@ -11,6 +11,5 @@
 import java.util.Vector;
 import javax.swing.DefaultListModel;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class TrackStoplistSortCommand extends Command
@@ -92,7 +91,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.TrackStoplist.Sort");
+    return new JLabel("public_transport.TrackStoplist.Sort");
   }
   
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java	(revision 22048)
@@ -6,6 +6,5 @@
 import java.util.Vector;
 import javax.swing.DefaultListModel;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 import org.openstreetmap.josm.Main;
@@ -201,7 +200,7 @@
   }
   
-  public MutableTreeNode description()
-  {
-    return new DefaultMutableTreeNode("public_transport.TrackStoplist.SuggestStops");
+  @Override public JLabel getDescription()
+  {
+    return new JLabel("public_transport.TrackStoplist.SuggestStops");
   }
   
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDetachCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDetachCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDetachCommand.java	(revision 22048)
@@ -8,6 +8,5 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class WaypointsDetachCommand extends Command
@@ -74,7 +73,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.Waypoints.Detach");
+    return new JLabel("public_transport.Waypoints.Detach");
   }
 };
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java	(revision 22048)
@@ -8,6 +8,5 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class WaypointsDisableCommand extends Command
@@ -82,7 +81,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.Waypoints.Disable");
+    return new JLabel("public_transport.Waypoints.Disable");
   }
 };
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java	(revision 22048)
@@ -8,6 +8,5 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class WaypointsEnableCommand extends Command
@@ -81,7 +80,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.Waypoints.Enable");
+    return new JLabel("public_transport.Waypoints.Enable");
   }
 };
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsNameCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsNameCommand.java	(revision 22047)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsNameCommand.java	(revision 22048)
@@ -8,6 +8,5 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.JLabel;
 
 public class WaypointsNameCommand extends Command
@@ -81,7 +80,7 @@
   }
   
-  public MutableTreeNode description()
+  @Override public JLabel getDescription()
   {
-    return new DefaultMutableTreeNode("public_transport.Waypoints.EditName");
+    return new JLabel("public_transport.Waypoints.EditName");
   }
 };