Changeset 27887 in osm for applications/editors/josm/plugins/routes/src/org

Timestamp:

2012-02-19T19:18:51+01:00 (13 years ago)

Author:

stoecker

Message:

fix deprecation

File:

• applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java (modified) (3 diffs)

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java

@@ -7 +7 @@
 import java.util.Collection;
 
-import javax.swing.JLabel;
+import javax.swing.Icon;
 
 import org.openstreetmap.josm.Main;
@@ -63 +63 @@
     @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {}
 
-    @Override public JLabel getDescription() {
+    @Override public String getDescriptionText() {
         String msg = "";
         switch(OsmPrimitiveType.from(member.getMember())) {
@@ -70 +70 @@
             case RELATION: msg = marktr("Remove relation ''{0}'' at position {1} from relation ''{2}''"); break;
         }
-        return new JLabel(
-                tr(msg,
-                        member.getMember().getDisplayName(DefaultNameFormatter.getInstance()),
-                        relation.getMembers().indexOf(member),
-                        relation.getDisplayName(DefaultNameFormatter.getInstance())
-                ),
-                ImageProvider.get(OsmPrimitiveType.from(relation)),
-                JLabel.HORIZONTAL
-        );
+        return tr(msg,
+            member.getMember().getDisplayName(DefaultNameFormatter.getInstance()),
+            relation.getMembers().indexOf(member),
+            relation.getDisplayName(DefaultNameFormatter.getInstance()));
+    }
+
+    @Override public Icon getDescriptionIcon() {
+        return ImageProvider.get(OsmPrimitiveType.from(relation));
     }
 }