Ticket #23427: 23427.patch

File 23427.patch, 11.8 KB (added by GerdP, 2 years ago)
  • remove duplicated code

  • src/org/openstreetmap/josm/io/session/GpxTracksSessionImporter.java

     
    66import java.io.IOException;
    77import java.io.InputStream;
    88
    9 import javax.xml.xpath.XPath;
    10 import javax.xml.xpath.XPathConstants;
    11 import javax.xml.xpath.XPathExpression;
    12 import javax.xml.xpath.XPathExpressionException;
    13 import javax.xml.xpath.XPathFactory;
    14 
    159import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
    1610import org.openstreetmap.josm.gui.io.importexport.NMEAImporter;
    1711import org.openstreetmap.josm.gui.io.importexport.RtkLibImporter;
    … …  
    2014import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    2115import org.openstreetmap.josm.io.IllegalDataException;
    2216import org.openstreetmap.josm.tools.Logging;
    23 import org.openstreetmap.josm.tools.Utils;
    2417import org.w3c.dom.Element;
    2518import org.w3c.dom.Node;
    2619import org.w3c.dom.NodeList;
    … …  
    3831        if (!"0.1".equals(version)) {
    3932            throw new IllegalDataException(tr("Version ''{0}'' of meta data for gpx track layer is not supported. Expected: 0.1", version));
    4033        }
    41         try {
    42             XPathFactory xPathFactory = XPathFactory.newInstance();
    43             XPath xpath = xPathFactory.newXPath();
    44             XPathExpression fileExp = xpath.compile("file/text()");
    45             String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
    46             if (Utils.isEmpty(fileStr)) {
    47                 throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
    48             }
     34        String fileStr = OsmDataSessionImporter.extractFileName(elem, support);
    4935
    50             try (InputStream in = support.getInputStream(fileStr)) {
    51                 GpxImporter.GpxImporterData importData;
     36        try (InputStream in = support.getInputStream(fileStr)) {
     37            GpxImporter.GpxImporterData importData;
    5238
    53                 if (NMEAImporter.FILE_FILTER.acceptName(fileStr)) {
    54                     importData = NMEAImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName());
    55                 } else if (RtkLibImporter.FILE_FILTER.acceptName(fileStr)) {
    56                     importData = RtkLibImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName());
    57                 } else {
    58                     importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
     39            if (NMEAImporter.FILE_FILTER.acceptName(fileStr)) {
     40                importData = NMEAImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName());
     41            } else if (RtkLibImporter.FILE_FILTER.acceptName(fileStr)) {
     42                importData = RtkLibImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName());
     43            } else {
     44                importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
     45            }
     46            if (importData.getGpxLayer() != null && importData.getGpxLayer().data != null) {
     47                importData.getGpxLayer().data.fromSession = true;
     48            }
     49            NodeList markerNodes = elem.getElementsByTagName("markerLayer");
     50            if (markerNodes.getLength() > 0 && markerNodes.item(0).getNodeType() == Node.ELEMENT_NODE) {
     51                Element markerEl = (Element) markerNodes.item(0);
     52                try {
     53                    int index = Integer.parseInt(markerEl.getAttribute("index"));
     54                    support.addSubLayer(index, importData.getMarkerLayer(), markerEl);
     55                } catch (NumberFormatException ex) {
     56                    Logging.warn(ex);
    5957                }
    60                 if (importData.getGpxLayer() != null && importData.getGpxLayer().data != null) {
    61                     importData.getGpxLayer().data.fromSession = true;
    62                 }
    63                 NodeList markerNodes = elem.getElementsByTagName("markerLayer");
    64                 if (markerNodes.getLength() > 0 && markerNodes.item(0).getNodeType() == Node.ELEMENT_NODE) {
    65                     Element markerEl = (Element) markerNodes.item(0);
    66                     try {
    67                         int index = Integer.parseInt(markerEl.getAttribute("index"));
    68                         support.addSubLayer(index, importData.getMarkerLayer(), markerEl);
    69                     } catch (NumberFormatException ex) {
    70                         Logging.warn(ex);
    71                     }
    72                 }
    73 
    74                 support.addPostLayersTask(importData.getPostLayerTask());
    75                 return getLayer(importData);
    7658            }
    7759
    78         } catch (XPathExpressionException e) {
    79             throw new IllegalDataException(e);
     60            support.addPostLayersTask(importData.getPostLayerTask());
     61            return getLayer(importData);
    8062        }
    8163    }
    8264

  • src/org/openstreetmap/josm/io/session/MarkerSessionImporter.java

     
    66import java.io.IOException;
    77import java.io.InputStream;
    88
    9 import javax.xml.xpath.XPath;
    10 import javax.xml.xpath.XPathConstants;
    11 import javax.xml.xpath.XPathExpression;
    12 import javax.xml.xpath.XPathExpressionException;
    13 import javax.xml.xpath.XPathFactory;
    14 
    159import org.openstreetmap.josm.gui.io.importexport.GpxImporter;
    1610import org.openstreetmap.josm.gui.layer.Layer;
    1711import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
    … …  
    1812import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    1913import org.openstreetmap.josm.io.IllegalDataException;
    2014import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
    21 import org.openstreetmap.josm.tools.Utils;
    2215import org.w3c.dom.Element;
    2316
    2417/**
    … …  
    3326        if (!"0.1".equals(version)) {
    3427            throw new IllegalDataException(tr("Version ''{0}'' of meta data for marker layer is not supported. Expected: 0.1", version));
    3528        }
    36         try {
    37             XPathFactory xPathFactory = XPathFactory.newInstance();
    38             XPath xpath = xPathFactory.newXPath();
    39             XPathExpression fileExp = xpath.compile("file/text()");
    40             String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
    41             if (Utils.isEmpty(fileStr)) {
    42                 throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
    43             }
     29        String fileStr = OsmDataSessionImporter.extractFileName(elem, support);
    4430
    45             try (InputStream in = support.getInputStream(fileStr)) {
    46                 GpxImporter.GpxImporterData importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(),
    47                         progressMonitor);
     31        try (InputStream in = support.getInputStream(fileStr)) {
     32            GpxImporter.GpxImporterData importData = GpxImporter.loadLayers(in, support.getFile(fileStr), support.getLayerName(),
     33                    progressMonitor);
    4834
    49                 support.addPostLayersTask(importData.getPostLayerTask());
     35            support.addPostLayersTask(importData.getPostLayerTask());
    5036
    51                 importData.getGpxLayer().destroy();
    52                 return importData.getMarkerLayer();
    53             }
    54         } catch (XPathExpressionException e) {
    55             throw new IllegalDataException(e);
     37            importData.getGpxLayer().destroy();
     38            return importData.getMarkerLayer();
    5639        }
    5740    }
    5841}

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

     
    66import java.io.IOException;
    77import java.io.InputStream;
    88
    9 import javax.xml.xpath.XPath;
    10 import javax.xml.xpath.XPathConstants;
    11 import javax.xml.xpath.XPathExpression;
    12 import javax.xml.xpath.XPathExpressionException;
    13 import javax.xml.xpath.XPathFactory;
    14 
    159import org.openstreetmap.josm.gui.io.importexport.NoteImporter;
    1610import org.openstreetmap.josm.gui.layer.Layer;
    1711import org.openstreetmap.josm.gui.layer.NoteLayer;
    … …  
    1812import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    1913import org.openstreetmap.josm.io.IllegalDataException;
    2014import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
    21 import org.openstreetmap.josm.tools.Utils;
    2215import org.w3c.dom.Element;
    2316import org.xml.sax.SAXException;
    2417
    … …  
    3427        if (!"0.1".equals(version)) {
    3528            throw new IllegalDataException(tr("Version ''{0}'' of meta data for note layer is not supported. Expected: 0.1", version));
    3629        }
    37         try {
    38             XPathFactory xPathFactory = XPathFactory.newInstance();
    39             XPath xpath = xPathFactory.newXPath();
    40             XPathExpression fileExp = xpath.compile("file/text()");
    41             String fileStr = (String) fileExp.evaluate(elem, XPathConstants.STRING);
    42             if (Utils.isEmpty(fileStr)) {
    43                 throw new IllegalDataException(tr("File name expected for layer no. {0}", support.getLayerIndex()));
    44             }
    4530
    46             NoteImporter importer = new NoteImporter();
    47             try (InputStream in = support.getInputStream(fileStr)) {
    48                 return importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
    49             }
    50         } catch (XPathExpressionException | SAXException e) {
     31        String fileStr = OsmDataSessionImporter.extractFileName(elem, support);
     32
     33        NoteImporter importer = new NoteImporter();
     34        try (InputStream in = support.getInputStream(fileStr)) {
     35            return importer.loadLayer(in, support.getFile(fileStr), support.getLayerName(), progressMonitor);
     36        } catch (SAXException e) {
    5137            throw new IllegalDataException(e);
    5238        }
    5339    }

  • src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java

     
    2222import org.openstreetmap.josm.io.IllegalDataException;
    2323import org.openstreetmap.josm.io.session.SessionReader.ImportSupport;
    2424import org.openstreetmap.josm.tools.Utils;
     25import org.w3c.dom.Attr;
    2526import org.w3c.dom.Element;
     27import org.w3c.dom.Node;
     28import org.w3c.dom.NodeList;
    2629
    2730/**
    2831 * Session importer for {@link OsmDataLayer}.
    … …  
    3033 */
    3134public class OsmDataSessionImporter implements SessionLayerImporter {
    3235
     36    private static Attr x2;
     37
    3338    @Override
    3439    public Layer load(Element elem, ImportSupport support, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
    3540        checkMetaVersion(elem);
    … …  
    6772     */
    6873    public static String extractFileName(Element elem, ImportSupport support) throws IllegalDataException {
    6974        try {
     75            // see #23427: try first to avoid possibly very slow XPath call
     76            NodeList x = elem.getElementsByTagName("file");
     77            if (x.getLength() > 0 && x.item(0).getNodeType() == Node.ELEMENT_NODE) {
     78                String fileStr = x.item(0).getTextContent();
     79                if (!Utils.isEmpty(fileStr))
     80                    return fileStr;
     81            }
    7082            XPathFactory xPathFactory = XPathFactory.newInstance();
    7183            XPath xpath = xPathFactory.newXPath();
    7284            XPathExpression fileExp = xpath.compile("file/text()");