Changeset 794 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-08-16T15:04:34+02:00 (16 years ago)

Author:

stoecker

Message:

allow handling node selections in case of multiple nodes on one point. Closes #1413

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NavigatableComponent.java (modified) (1 diff)
• PleaseWaitDialog.java (modified) (1 diff)
• layer/markerlayer/MarkerLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -143 +143 @@
                         if (minDistanceSq > dist && dist < 100) {
                                 minDistanceSq = p.distanceSq(sp);
+                                minPrimitive = n;
+                        }
+                        // prefer already selected node when multiple nodes on one point
+                        else if(minDistanceSq == dist && n.selected && !minPrimitive.selected)
+                        {
                                 minPrimitive = n;
                         }

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -35 +35 @@
                 pane.add(cancel, GBC.eol().anchor(GBC.CENTER));
                 setContentPane(pane);
-                setSize(350,100);
+                setSize(400,100);
                 setLocationRelativeTo(Main.parent);
         }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -211 +211 @@
                                 AudioMarker recent = AudioMarker.recentlyPlayedMarker();
                                 if (synchronizeAudioMarkers(recent)) {
-                                        JOptionPane.showMessageDialog(Main.parent, tr("Audio synchronized at point {0}", recent.text));
+                                        JOptionPane.showMessageDialog(Main.parent, tr("Audio synchronized at point {0}.", recent.text));
                                 } else {
                                         JOptionPane.showMessageDialog(Main.parent,tr("Unable to synchronize in layer being played."));