Changeset 22046 in osm for applications/editors/josm/plugins/routes

Timestamp:

2010-06-27T23:03:50+02:00 (15 years ago)

Author:

bastik

Message:

update to josm latest

Location:

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes

Files:

• RelationEditMode.java (modified) (2 diffs)
• RemoveRelationMemberCommand.java (modified) (3 diffs)

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

@@ -47 +47 @@
         @Override
         public void mouseMoved(MouseEvent e) {
-                Way nearestWay = Main.map.mapView.getNearestWay(e.getPoint());
+                Way nearestWay = Main.map.mapView.getNearestWay(e.getPoint(), OsmPrimitive.isUsablePredicate);
                 if (nearestWay != highlightedWay) {
                         if (highlightedWay != null) {
@@ -65 +65 @@
                         return;
 
-                Way way = Main.map.mapView.getNearestWay(e.getPoint());
+                Way way = Main.map.mapView.getNearestWay(e.getPoint(), OsmPrimitive.isUsablePredicate);
                 Collection<Relation> selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations();
 

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

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