Changeset 1865 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

Timestamp:

2009-07-28T19:48:39+02:00 (15 years ago)

Author:

Gubaer

Message:

replaced JOptionPane.show* by OptionPaneUtil.show*
ExtendeDialog now always on top, too

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (16 diffs)

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

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -90 +91 @@
             if (wpt_has_link) {
                 for (GpxLink oneLink : (Collection<GpxLink>) wpt.attr.get(GpxData.META_LINKS)) {
-                    if (!oneLink.uri.equals(lastLinkedFile))firstTime = time;
+                    if (!oneLink.uri.equals(lastLinkedFile)) {
+                        firstTime = time;
+                    }
                     lastLinkedFile = oneLink.uri;
                     break;
@@ -96 +99 @@
             }
             Marker m = Marker.createMarker(wpt, indata.storageFile, this, time, time - firstTime);
-            if (m != null)
+            if (m != null) {
                 data.add(m);
+            }
         }
 
@@ -118 +122 @@
                             return;
                         mousePressed  = true;
-                        if (visible)
+                        if (visible) {
                             Main.map.mapView.repaint();
+                        }
                     }
                     @Override public void mouseReleased(MouseEvent ev) {
@@ -129 +134 @@
                         if (ev.getPoint() != null) {
                             for (Marker mkr : data) {
-                                if (mkr.containsPoint(ev.getPoint()))
+                                if (mkr.containsPoint(ev.getPoint())) {
                                     mkr.actionPerformed(new ActionEvent(this, 0, null));
+                                }
                             }
                         }
@@ -183 +189 @@
 
     @Override public void visitBoundingBox(BoundingXYVisitor v) {
-        for (Marker mkr : data)
+        for (Marker mkr : data) {
             v.visit(mkr.getEastNorth());
+        }
     }
 
@@ -198 +205 @@
                 JColorChooser c = new JColorChooser(getColor(name));
                 Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")};
-                int answer = JOptionPane.showOptionDialog(Main.parent, c, tr("Choose a color"), JOptionPane.OK_CANCEL_OPTION,
-                JOptionPane.PLAIN_MESSAGE, null, options, options[0]);
+                int answer = OptionPaneUtil.showOptionDialog(
+                        Main.parent,
+                        c,
+                        tr("Choose a color"),
+                        JOptionPane.OK_CANCEL_OPTION,
+                        JOptionPane.PLAIN_MESSAGE,
+                        options,
+                        options[0]
+                );
                 switch (answer) {
                 case 0:
@@ -219 +233 @@
             public void actionPerformed(ActionEvent e) {
                 if (! AudioPlayer.paused()) {
-                    JOptionPane.showMessageDialog(Main.parent,tr("You need to pause audio at the moment when you hear your synchronization cue."));
+                    OptionPaneUtil.showMessageDialog(
+                            Main.parent,
+                            tr("You need to pause audio at the moment when you hear your synchronization cue."),
+                            tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE
+                    );
                     return;
                 }
                 AudioMarker recent = AudioMarker.recentlyPlayedMarker();
                 if (synchronizeAudioMarkers(recent)) {
-                    JOptionPane.showMessageDialog(Main.parent, tr("Audio synchronized at point {0}.", recent.text));
+                    OptionPaneUtil.showMessageDialog(
+                            Main.parent,
+                            tr("Audio synchronized at point {0}.", recent.text),
+                            tr("Information"),
+                            JOptionPane.INFORMATION_MESSAGE
+                    );
                 } else {
-                    JOptionPane.showMessageDialog(Main.parent,tr("Unable to synchronize in layer being played."));
+                    OptionPaneUtil.showMessageDialog(
+                            Main.parent,
+                            tr("Unable to synchronize in layer being played."),
+                            tr("Error"),
+                            JOptionPane.ERROR_MESSAGE
+                    );
                 }
             }
@@ -236 +265 @@
             public void actionPerformed(ActionEvent e) {
                 if (! AudioPlayer.paused()) {
-                    JOptionPane.showMessageDialog(Main.parent,tr("You need to have paused audio at the point on the track where you want the marker."));
+                    OptionPaneUtil.showMessageDialog(
+                            Main.parent,
+                            tr("You need to have paused audio at the point on the track where you want the marker."),
+                            tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE
+                    );
                     return;
                 }
@@ -285 +319 @@
         URL url = startMarker.url();
         for (Marker m : data) {
-            if (m == startMarker)
+            if (m == startMarker) {
                 seenStart = true;
+            }
             if (seenStart) {
                 AudioMarker ma = (AudioMarker) m; // it must be an AudioMarker
-                if (ma.url().equals(url))
+                if (ma.url().equals(url)) {
                     ma.adjustOffset(adjustment);
+                }
             }
         }
@@ -308 +344 @@
         }
         if (am == null) {
-            JOptionPane.showMessageDialog(Main.parent,tr("No existing audio markers in this layer to offset from."));
+            OptionPaneUtil.showMessageDialog(
+                    Main.parent,
+                    tr("No existing audio markers in this layer to offset from."),
+                    tr("Error"),
+                    JOptionPane.ERROR_MESSAGE
+            );
             return null;
         }
@@ -314 +355 @@
         // make our new marker
         AudioMarker newAudioMarker = AudioMarker.create(coor,
-            AudioMarker.inventName(offset), AudioPlayer.url().toString(), this, time, offset);
+                AudioMarker.inventName(offset), AudioPlayer.url().toString(), this, time, offset);
 
         // insert it at the right place in a copy the collection
@@ -333 +374 @@
 
         if (newAudioMarker != null) {
-            if (am != null)
+            if (am != null) {
                 newAudioMarker.adjustOffset(am.syncOffset()); // i.e. same as predecessor
+            }
             newData.add(newAudioMarker); // insert at end
         }
@@ -363 +405 @@
             for (Marker marker : markerLayer.data) {
                 if (marker == startMarker) {
-                    if (next)
+                    if (next) {
                         nextTime = true;
-                    else {
-                        if (previousMarker == null)
+                    } else {
+                        if (previousMarker == null) {
                             previousMarker = startMarker; // if no previous one, play the first one again
+                        }
                         return previousMarker;
                     }
@@ -389 +432 @@
             return;
         Layer l = Main.map.mapView.getActiveLayer();
-        if(l != null)
+        if(l != null) {
             m = getAdjacentMarker(startMarker, next, l);
+        }
         if(m == null)
         {
@@ -396 +440 @@
             {
                 m = getAdjacentMarker(startMarker, next, layer);
-                if(m != null)
-                    break;
-            }
-        }
-        if(m != null)
+                if(m != null) {
+                    break;
+                }
+            }
+        }
+        if(m != null) {
             ((AudioMarker)m).play();
+        }
     }