Changeset 18954 in josm for trunk/src/org/openstreetmap/josm/io/session/NoteSessionImporter.java

Timestamp:

2024-01-23T15:17:43+01:00 (10 months ago)

Author:

GerdP

Message:

fix #23427 load session performance strongly depends on order of layers
The patch

• removes the duplicated code regarding XPath and calls existing method OsmDataSessionImporter.extractFileName() instead
• improves that method to first try to find a "file" node given the current element before falling back to the possibly very slow XPath evaluate call (not sure if the XPath part is still needed, it is never used in my example).

File:

• trunk/src/org/openstreetmap/josm/io/session/NoteSessionImporter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/session/NoteSessionImporter.java

@@ -7 +7 @@
 import java.io.InputStream;
 
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
 import org.openstreetmap.josm.gui.io.importexport.NoteImporter;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -19 +13 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
-import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
@@ -35 +28 @@
             throw new IllegalDataException(tr("Version ''{0}'' of meta data for note layer is not supported. Expected: 0.1", version));
         }
-        try {
-            XPathFactory xPathFactory = XPathFactory.newInstance();
-            XPath xpath = xPathFactory.newXPath();
-            XPathExpression fileExp = xpath.compile("file/text()");
-            String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
-            if (Utils.isEmpty(fileStr)) {
-                throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
-            }
 
-            NoteImporter importer = new NoteImporter();
-            try (InputStream in = support.getInputStream(fileStr)) {
-                return importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
-            }
-        } catch (XPathExpressionException | SAXException e) {
+        String fileStr = OsmDataSessionImporter.extractFileName(elem, support);
+
+        NoteImporter importer = new NoteImporter();
+        try (InputStream in = support.getInputStream(fileStr)) {
+            return importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
+        } catch (SAXException e) {
             throw new IllegalDataException(e);
         }