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

Timestamp:

2009-07-28T19:48:39+02:00 (16 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/GeoImageLayer.java (modified) (19 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -70 +70 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -125 +126 @@
             if (cachedImageRef != null) {
                 Image cachedImage = cachedImageRef.get();
-                if (cachedImage != null) {
+                if (cachedImage != null)
                     return cachedImage;
-                }
             }
             return Toolkit.getDefaultToolkit().createImage(currentEntry.file.getAbsolutePath());
@@ -147 +147 @@
         }
         private void loadImage() {
-            if (currentEntry != null) {
+            if (currentEntry != null)
                 return;
-            }
             while (!queue.isEmpty()) {
                 currentEntry = queue.get(0);
@@ -217 +216 @@
 
             while (true) {
-                if (entry.scaledImage != null) {
+                if (entry.scaledImage != null)
                     return entry.scaledImage;
-                }
                 try {
                     wait();
@@ -259 +257 @@
 
         public Image getIcon() {
-            if (icon.scaledImage == null) {
+            if (icon.scaledImage == null)
                 return EMPTY_IMAGE;
-            } else {
+            else
                 return icon.scaledImage;
-            }
         }
 
@@ -330 +327 @@
             ArrayList<ImageEntry> data = new ArrayList<ImageEntry>(files.size());
             for (File f : files) {
-                if (progressMonitor.isCancelled())
+                if (progressMonitor.isCancelled()) {
                     break;
+                }
                 progressMonitor.subTask(tr("Reading {0}...",f.getName()));
 
@@ -341 +339 @@
                     continue;
                 }
-                if (e.time == null)
+                if (e.time == null) {
                     continue;
+                }
 
                 data.add(e);
@@ -350 +349 @@
         }
         @Override protected void finish() {
-            if (layer != null)
+            if (layer != null) {
                 Main.main.addLayer(layer);
+            }
         }
         @Override
@@ -412 +412 @@
                     return;
                 mousePressed  = true;
-                if (visible)
+                if (visible) {
                     Main.map.mapView.repaint();
+                }
             }
             @Override public void mouseReleased(MouseEvent ev) {
@@ -423 +424 @@
                 for (int i = data.size(); i > 0; --i) {
                     ImageEntry e = data.get(i-1);
-                    if (e.pos == null)
+                    if (e.pos == null) {
                         continue;
+                    }
                     Point p = Main.map.mapView.getPoint(e.pos);
                     Rectangle r = new Rectangle(p.x-ICON_SIZE/2, p.y-ICON_SIZE/2, ICON_SIZE, ICON_SIZE);
@@ -440 +442 @@
             public void layerAdded(Layer newLayer) {}
             public void layerRemoved(Layer oldLayer) {
-                if (oldLayer == self)
+                if (oldLayer == self) {
                     Main.map.mapView.removeMouseListener(mouseAdapter);
+                }
             }
         });
@@ -550 +553 @@
             nextButton.setEnabled(currentImage < data.size() - 1);
 
-            if (scaleToggle.getModel().isSelected())
+            if (scaleToggle.getModel().isSelected()) {
                 imageLabel.setIcon(new ImageIcon(imageLoader.waitForImage(currentImageEntry.image,
                         Math.max(imageViewport.getWidth(), imageViewport.getHeight()))));
-            else
+            } else {
                 imageLabel.setIcon(new ImageIcon(imageLoader.waitForImage(currentImageEntry.image)));
-
-            if (centerToggle.getModel().isSelected())
+            }
+
+            if (centerToggle.getModel().isSelected()) {
                 Main.map.mapView.zoomTo(currentImageEntry.pos);
+            }
 
             dlg.setTitle(currentImageEntry.image +
@@ -594 +599 @@
                 setIcon(new ImageIcon(e.getIcon()));
                 setText(e.image.getName()+" ("+dateFormat.format(new Date(e.time.getTime()+(delta+gpstimezone)))+")");
-                if (e.pos == null)
+                if (e.pos == null) {
                     setForeground(Color.red);
+                }
                 return this;
             }
@@ -607 +613 @@
         int i = 0;
         for (ImageEntry e : data)
-            if (e.pos != null)
+            if (e.pos != null) {
                 i++;
+            }
         return data.size()+" "+trn("image","images",data.size())+". "+tr("{0} within the track.",i);
     }
@@ -662 +669 @@
 
     @Override public void visitBoundingBox(BoundingXYVisitor v) {
-        for (ImageEntry e : data)
+        for (ImageEntry e : data) {
             v.visit(e.pos);
+        }
     }
 
@@ -723 +731 @@
             exifDate = ExifReader.readTime(f);
         } catch (ParseException e) {
-            JOptionPane.showMessageDialog(Main.parent, tr("The date in file \"{0}\" could not be parsed.", f.getName()));
+            OptionPaneUtil.showMessageDialog(
+                    Main.parent,
+                    tr("The date in file \"{0}\" could not be parsed.", f.getName()),
+                    tr("Error"),
+                    JOptionPane.ERROR_MESSAGE
+            );
             return;
         }
         if (exifDate == null) {
-            JOptionPane.showMessageDialog(Main.parent, tr("There is no EXIF time within the file \"{0}\".", f.getName()));
+            OptionPaneUtil.showMessageDialog(
+                    Main.parent,
+                    tr("There is no EXIF time within the file \"{0}\".", f.getName()),
+                    tr("Error"),
+                    JOptionPane.ERROR_MESSAGE
+            );
             return;
         }
@@ -738 +756 @@
         p.add(new JLabel(tr("GPS unit timezone (difference to photo)")), GBC.eol());
         String t = Main.pref.get("tagimages.gpstimezone", "0");
-        if (t.charAt(0) != '-')
+        if (t.charAt(0) != '-') {
             t = "+"+t;
+        }
         JTextField gpsTimezone = new JTextField(t);
         p.add(gpsTimezone, GBC.eol().fill(GBC.HORIZONTAL));
 
         while (true) {
-            int answer = JOptionPane.showConfirmDialog(Main.parent, p, tr("Synchronize Time with GPS Unit"), JOptionPane.OK_CANCEL_OPTION);
+            int answer = OptionPaneUtil.showConfirmationDialog(
+                    Main.parent,
+                    p,
+                    tr("Synchronize Time with GPS Unit"),
+                    JOptionPane.OK_CANCEL_OPTION,
+                    JOptionPane.QUESTION_MESSAGE
+            );
             if (answer != JOptionPane.OK_OPTION || gpsText.getText().equals(""))
                 return;
@@ -750 +775 @@
                 delta = DateParser.parse(gpsText.getText()).getTime() - exifDate.getTime();
                 String time = gpsTimezone.getText();
-                if (!time.equals("") && time.charAt(0) == '+')
+                if (!time.equals("") && time.charAt(0) == '+') {
                     time = time.substring(1);
-                if (time.equals(""))
+                }
+                if (time.equals("")) {
                     time = "0";
+                }
                 gpstimezone = Long.valueOf(time)*60*60*1000;
                 Main.pref.put("tagimages.delta", ""+delta);
@@ -760 +787 @@
                 return;
             } catch (NumberFormatException x) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Time entered could not be parsed."));
+                OptionPaneUtil.showMessageDialog(
+                        Main.parent,
+                        tr("Time entered could not be parsed."),
+                        tr("Error"),
+                        JOptionPane.ERROR_MESSAGE
+                );
             } catch (ParseException x) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Time entered could not be parsed."));
+                OptionPaneUtil.showMessageDialog(
+                        Main.parent,
+                        tr("Time entered could not be parsed."),
+                        tr("Error"),
+                        JOptionPane.ERROR_MESSAGE
+                );
             }
         }