Changeset 27886 in osm for applications

Timestamp:

2012-02-19T19:11:31+01:00 (13 years ago)

Author:

stoecker

Message:

fix deprecation

Location:

applications/editors/josm/plugins/public_transport

Files:

• build.xml (modified) (1 diff)
• src/public_transport/GTFSAddCommand.java (modified) (2 diffs)
• src/public_transport/GTFSCatchCommand.java (modified) (2 diffs)
• src/public_transport/GTFSDeleteCommand.java (modified) (2 diffs)
• src/public_transport/GTFSJoinCommand.java (modified) (2 diffs)
• src/public_transport/SettingsStoptypeCommand.java (modified) (2 diffs)
• src/public_transport/TrackStoplistAddCommand.java (modified) (2 diffs)
• src/public_transport/TrackStoplistDeleteCommand.java (modified) (2 diffs)
• src/public_transport/TrackStoplistDetachCommand.java (modified) (2 diffs)
• src/public_transport/TrackStoplistNameCommand.java (modified) (2 diffs)
• src/public_transport/TrackStoplistRelocateCommand.java (modified) (2 diffs)
• src/public_transport/TrackStoplistSortCommand.java (modified) (1 diff)
• src/public_transport/TrackSuggestStopsCommand.java (modified) (2 diffs)
• src/public_transport/WaypointsDetachCommand.java (modified) (2 diffs)
• src/public_transport/WaypointsDisableCommand.java (modified) (2 diffs)
• src/public_transport/WaypointsEnableCommand.java (modified) (2 diffs)
• src/public_transport/WaypointsNameCommand.java (modified) (2 diffs)

applications/editors/josm/plugins/public_transport/build.xml

@@ -86 +86 @@
                 <attribute name="Plugin-Description" value="This plugin simplifies the mapping and editing of public transport routes."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/public_transport"/>
-                <attribute name="Plugin-Mainversion" value="4549"/>
+                <attribute name="Plugin-Mainversion" value="4980"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/public_transport/src/public_transport/GTFSAddCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class GTFSAddCommand extends Command
@@ -85 +84 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Enable GTFSStops"));
+    return tr("Public Transport: Enable GTFSStops");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/GTFSCatchCommand.java

@@ -11 +11 @@
 import java.util.Iterator;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class GTFSCatchCommand extends Command
@@ -108 +107 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Catch GTFS stops"));
+    return tr("Public Transport: Catch GTFS stops");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/GTFSDeleteCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class GTFSDeleteCommand extends Command
@@ -89 +88 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Disable GTFS"));
+    return tr("Public Transport: Disable GTFS");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/GTFSJoinCommand.java

@@ -11 +11 @@
 import java.util.Iterator;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class GTFSJoinCommand extends Command
@@ -106 +105 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Join GTFS stops"));
+    return tr("Public Transport: Join GTFS stops");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/SettingsStoptypeCommand.java

@@ -11 +11 @@
 import java.util.Vector;
 import javax.swing.DefaultListModel;
-import javax.swing.JLabel;
 
 public class SettingsStoptypeCommand extends Command
@@ -86 +85 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Change stop type"));
+    return tr("Public Transport: Change stop type");
   }
 

applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistAddCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class TrackStoplistAddCommand extends Command
@@ -43 +42 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Add track stop"));
+    return tr("Public Transport: Add track stop");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDeleteCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class TrackStoplistDeleteCommand extends Command
@@ -96 +95 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Delete track stop"));
+    return tr("Public Transport: Delete track stop");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistDetachCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class TrackStoplistDetachCommand extends Command
@@ -75 +74 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Detach track stop list"));
+    return tr("Public Transport: Detach track stop list");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistNameCommand.java

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class TrackStoplistNameCommand extends Command
@@ -97 +96 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Edit track stop list"));
+    return tr("Public Transport: Edit track stop list");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistRelocateCommand.java

@@ -13 +13 @@
 import java.util.Vector;
 import javax.swing.DefaultListModel;
-import javax.swing.JLabel;
 
 public class TrackStoplistRelocateCommand extends Command
@@ -88 +87 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Relocate nodes in track stoplist"));
+    return tr("Public Transport: Relocate nodes in track stoplist");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/TrackStoplistSortCommand.java

@@ -93 +93 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: sort track stop list"));
+    return tr("Public Transport: sort track stop list");
   }
 

applications/editors/josm/plugins/public_transport/src/public_transport/TrackSuggestStopsCommand.java

@@ -8 +8 @@
 import java.util.Vector;
 import javax.swing.DefaultListModel;
-import javax.swing.JLabel;
 
 import org.openstreetmap.josm.Main;
@@ -202 +201 @@
   }
 
-  @Override public JLabel getDescription()
-  {
-    return new JLabel(tr("Public Transport: Suggest stops"));
+  @Override public String getDescriptionText()
+  {
+    return tr("Public Transport: Suggest stops");
   }
 

applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDetachCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class WaypointsDetachCommand extends Command
@@ -75 +74 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Detach waypoints"));
+    return tr("Public Transport: Detach waypoints");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsDisableCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class WaypointsDisableCommand extends Command
@@ -83 +82 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Disable waypoints"));
+    return tr("Public Transport: Disable waypoints");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsEnableCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class WaypointsEnableCommand extends Command
@@ -80 +79 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Enable waypoints"));
+    return tr("Public Transport: Enable waypoints");
   }
 };

applications/editors/josm/plugins/public_transport/src/public_transport/WaypointsNameCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Vector;
-import javax.swing.JLabel;
 
 public class WaypointsNameCommand extends Command
@@ -74 +73 @@
   }
 
-  @Override public JLabel getDescription()
+  @Override public String getDescriptionText()
   {
-    return new JLabel(tr("Public Transport: Edit waypoint name"));
+    return tr("Public Transport: Edit waypoint name");
   }
 };