Changeset 319 in josm for src/org/openstreetmap/josm/gui

Timestamp:

2007-09-04T10:21:49+02:00 (19 years ago)

Author:

imi

Message:

• removed MinML2 dependency (use javax.xml)
• fixed reorder action (thanks Robert)
• added backup files before saving (thanks Dave)
• added search for last modifying user (thanks Dave)
• fixed import of plugin list and added author field (thanks Shaun)

Location:

src/org/openstreetmap/josm/gui

Files:

• layer/GeoImageLayer.java (modified) (9 diffs)
• preferences/CsvPreference.java (modified) (2 diffs)
• preferences/FilePreferences.java (added)
• preferences/PreferenceDialog.java (modified) (1 diff)

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

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+//License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.gui.layer;
 
@@ -104 +104 @@
                                                 throw new IOException(tr("No time for point {0} x {1}",p.latlon.lat(),p.latlon.lon()));
                                         Date d = null;
-                    try {
-                        d = DateParser.parse(p.time);
-                    } catch (ParseException e) {
-                        throw new IOException(tr("Cannot read time \"{0}\" from point {1} x {2}",p.time,p.latlon.lat(),p.latlon.lon()));
-                    }
+                                        try {
+                                                d = DateParser.parse(p.time);
+                                        } catch (ParseException e) {
+                                                throw new IOException(tr("Cannot read time \"{0}\" from point {1} x {2}",p.time,p.latlon.lat(),p.latlon.lon()));
+                                        }
                                         gps.add(new TimedPoint(d, p.eastNorth));
                                 }
@@ -130 +130 @@
                                 ImageEntry e = new ImageEntry();
                                 try {
-                        e.time = ExifReader.readTime(f);
-                } catch (ParseException e1) {
-                        continue;
-                }
+                                        e.time = ExifReader.readTime(f);
+                                } catch (ParseException e1) {
+                                        continue;
+                                }
                                 if (e.time == null)
                                         continue;
@@ -163 +163 @@
         private static final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss");
         private MouseAdapter mouseAdapter;
-    private int currentImage;
-    
+        private int currentImage;
+
         public static final class GpsTimeIncorrect extends Exception {
                 public GpsTimeIncorrect(String message, Throwable cause) {
@@ -218 +218 @@
                                         Rectangle r = new Rectangle(p.x-e.icon.getIconWidth()/2, p.y-e.icon.getIconHeight()/2, e.icon.getIconWidth(), e.icon.getIconHeight());
                                         if (r.contains(ev.getPoint())) {
-                                            //                                          showImage(e);
-                                            showImage(i-1);
+                                                showImage(i-1);
                                                 break;
                                         }
@@ -236 +235 @@
         }
 
-    //  private void showImage(final ImageEntry e) {
         private void showImage(int i) {
-            currentImage = i;
+                currentImage = i;
                 final JPanel p = new JPanel(new BorderLayout());
                 final ImageEntry e = data.get(currentImage);
@@ -273 +271 @@
                 cent.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent ev) {
-                            final ImageEntry e = data.get(currentImage);
-                            if (cent.getModel().isSelected())
-                                Main.map.mapView.zoomTo(e.pos, Main.map.mapView.getScale());
-                        }
-                    });
+                                final ImageEntry e = data.get(currentImage);
+                                if (cent.getModel().isSelected())
+                                        Main.map.mapView.zoomTo(e.pos, Main.map.mapView.getScale());
+                        }
+                });
 
                 ActionListener nextprevAction = new ActionListener(){
                         public void actionPerformed(ActionEvent ev) {                       
-                            p.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-                            if (ev.getActionCommand().equals("Next")) {
-                                currentImage++; 
-                                if(currentImage>=data.size()-1) next.setEnabled(false);
-                                prev.setEnabled(true);
-                            } else {
-                                currentImage--;
-                                if(currentImage<=0) prev.setEnabled(false);
-                                next.setEnabled(true);
-                            }
-                            
-                            final ImageEntry e = data.get(currentImage);
-                            if (scale.getModel().isSelected())
-                                ((JLabel)vp.getView()).setIcon(loadScaledImage(e.image, Math.max(vp.getWidth(), vp.getHeight())));
-                            else
-                                ((JLabel)vp.getView()).setIcon(new ImageIcon(e.image.getPath()));
-                            dlg.setTitle(e.image+" ("+e.coor.toDisplayString()+")");
-                            if (cent.getModel().isSelected())
-                                Main.map.mapView.zoomTo(e.pos, Main.map.mapView.getScale());
-                            p.setCursor(Cursor.getDefaultCursor());
-                        }
-                    };
+                                p.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+                                if (ev.getActionCommand().equals("Next")) {
+                                        currentImage++; 
+                                        if(currentImage>=data.size()-1) next.setEnabled(false);
+                                        prev.setEnabled(true);
+                                } else {
+                                        currentImage--;
+                                        if(currentImage<=0) prev.setEnabled(false);
+                                        next.setEnabled(true);
+                                }
+
+                                final ImageEntry e = data.get(currentImage);
+                                if (scale.getModel().isSelected())
+                                        ((JLabel)vp.getView()).setIcon(loadScaledImage(e.image, Math.max(vp.getWidth(), vp.getHeight())));
+                                else
+                                        ((JLabel)vp.getView()).setIcon(new ImageIcon(e.image.getPath()));
+                                dlg.setTitle(e.image+" ("+e.coor.toDisplayString()+")");
+                                if (cent.getModel().isSelected())
+                                        Main.map.mapView.zoomTo(e.pos, Main.map.mapView.getScale());
+                                p.setCursor(Cursor.getDefaultCursor());
+                        }
+                };
                 next.setActionCommand("Next");
                 prev.setActionCommand("Previous");
@@ -453 +451 @@
         private void sync(File f) {
                 Date exifDate;
-        try {
-                exifDate = ExifReader.readTime(f);
-        } catch (ParseException e) {
-                JOptionPane.showMessageDialog(Main.parent, tr("The date in file \"{0}\" could not be parsed.", f.getName()));
-                return;
-        }
+                try {
+                        exifDate = ExifReader.readTime(f);
+                } catch (ParseException e) {
+                        JOptionPane.showMessageDialog(Main.parent, tr("The date in file \"{0}\" could not be parsed.", f.getName()));
+                        return;
+                }
                 if (exifDate == null) {
                         JOptionPane.showMessageDialog(Main.parent, tr("There is no EXIF time within the file \"{0}\".", f.getName()));
@@ -489 +487 @@
                                 gpstimezone = Long.valueOf(time)*60*60*1000;
                                 Main.pref.put("tagimages.delta", ""+delta);
-                Main.pref.put("tagimages.gpstimezone", time);
+                                Main.pref.put("tagimages.gpstimezone", time);
                                 calculatePosition();
                                 return;

src/org/openstreetmap/josm/gui/preferences/CsvPreference.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.Box;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
@@ -31 +30 @@
                 gui.connection.add(new JLabel(tr("CSV import specification (empty: read from first line in data)")), GBC.eol());
                 gui.connection.add(csvImportString, GBC.eop().fill(GBC.HORIZONTAL));
-                gui.connection.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
     }
 

src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -103 +103 @@
                 settings.add(new ServerAccessPreference());
                 settings.add(new CsvPreference());
+                settings.add(new FilePreferences());
                 settings.add(new ProjectionPreference());
                 settings.add(new TaggingPresetPreference());