Changeset 18042 in josm for trunk/src/org

Timestamp:

2021-07-16T20:15:07+02:00 (3 years ago)

Author:

Don-vip

Message:

CorrelateGpxWithImages : extract GpxData loading code to a new helper class

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• geoimage/CorrelateGpxWithImages.java (modified) (9 diffs)
• gpx/GpxDataHelper.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -25 +25 @@
 import java.beans.PropertyChangeListener;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -32 +30 @@
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
@@ -72 +69 @@
 
 import org.openstreetmap.josm.actions.DiskAccessAction;
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxImageCorrelation;
@@ -82 +78 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
 import org.openstreetmap.josm.gui.io.importexport.ImageImporter;
-import org.openstreetmap.josm.gui.io.importexport.NMEAImporter;
-import org.openstreetmap.josm.gui.io.importexport.RtkLibImporter;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -92 +85 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.gui.layer.gpx.GpxDataHelper;
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
-import org.openstreetmap.josm.gui.widgets.FileChooserManager;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
-import org.openstreetmap.josm.io.Compression;
-import org.openstreetmap.josm.io.GpxReader;
-import org.openstreetmap.josm.io.IGpxReader;
-import org.openstreetmap.josm.io.nmea.NmeaReader;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.IPreferences;
@@ -109 +98 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.date.DateUtils;
-import org.xml.sax.SAXException;
 
 /**
@@ -280 +268 @@
     private int lastNumMatched;
 
-    /** This class is called when the user doesn't find the GPX file he needs in the files that have
+    /**
+     * This class is called when the user doesn't find the GPX file he needs in the files that have
      * been loaded yet. It displays a FileChooser dialog to select the GPX file to be loaded.
      */
@@ -287 +276 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            ExtensionFileFilter gpxFilter = GpxImporter.getFileFilter();
-            AbstractFileChooser fc = new FileChooserManager(true, null).createFileChooser(false, null,
-                    Arrays.asList(gpxFilter, NMEAImporter.FILE_FILTER, RtkLibImporter.FILE_FILTER), gpxFilter, JFileChooser.FILES_ONLY)
-                    .openFileChooser();
-            if (fc == null)
-                return;
-            File sel = fc.getSelectedFile();
-
-            try {
-                outerPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-                removeDuplicates(sel);
-                GpxData data = null;
-                try (InputStream iStream = Compression.getUncompressedFileInputStream(sel)) {
-                    IGpxReader reader = gpxFilter.accept(sel) ? new GpxReader(iStream) : new NmeaReader(iStream);
-                    reader.parse(false);
-                    data = reader.getGpxData();
-                    data.storageFile = sel;
-
-                } catch (SAXException ex) {
-                    Logging.error(ex);
-                    JOptionPane.showMessageDialog(
-                            MainApplication.getMainFrame(),
-                            tr("Error while parsing {0}", sel.getName())+": "+ex.getMessage(),
-                            tr("Error"),
-                            JOptionPane.ERROR_MESSAGE
-                    );
-                    return;
-                } catch (IOException ex) {
-                    Logging.error(ex);
-                    JOptionPane.showMessageDialog(
-                            MainApplication.getMainFrame(),
-                            tr("Could not read \"{0}\"", sel.getName())+'\n'+ex.getMessage(),
-                            tr("Error"),
-                            JOptionPane.ERROR_MESSAGE
-                    );
-                    return;
-                }
-
-                GpxDataWrapper elem = new GpxDataWrapper(sel.getName(), data, sel);
-                gpxModel.addElement(elem);
-                gpxModel.setSelectedItem(elem);
-                statusBarUpdater.matchAndUpdateStatusBar();
-            } finally {
-                outerPanel.setCursor(Cursor.getDefaultCursor());
+            File sel = GpxDataHelper.chooseGpxDataFile();
+            if (sel != null) {
+                try {
+                    outerPanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+                    removeDuplicates(sel);
+                    GpxData data = GpxDataHelper.loadGpxData(sel);
+                    if (data != null) {
+                        GpxDataWrapper elem = new GpxDataWrapper(sel.getName(), data, sel);
+                        gpxModel.addElement(elem);
+                        gpxModel.setSelectedItem(elem);
+                        statusBarUpdater.matchAndUpdateStatusBar();
+                    }
+                } finally {
+                    outerPanel.setCursor(Cursor.getDefaultCursor());
+                }
             }
         }
@@ -1407 +1367 @@
         closeDialog();
     }
-
 }