Changeset 35722 in osm for applications/editors/josm

Timestamp:

2021-03-13T13:23:28+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20579 - fix EDT violation

Location:

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/io

Files:

• ValidatingImageryReader.java (modified) (2 diffs)
• XmlBoundsImporter.java (modified) (1 diff)

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/io/ValidatingImageryReader.java

@@ -4 +4 @@
 import java.io.IOException;
 
-import javax.xml.XMLConstants;
 import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
 
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.imagery.ImageryReader;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsConstants;
+import org.openstreetmap.josm.tools.XmlUtils;
 import org.xml.sax.SAXException;
 
@@ -52 +50 @@
      */
     public static void validate(String source) throws SAXException, IOException {
-        SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
         try (CachedFile xmlSchema = new CachedFile(XML_SCHEMA)) {
-            Schema schema = factory.newSchema(new StreamSource(xmlSchema.getInputStream()));
-            schema.newValidator().validate(new StreamSource(source));
+            XmlUtils.newXmlSchemaFactory()
+                .newSchema(new StreamSource(xmlSchema.getInputStream()))
+                .newValidator().validate(new StreamSource(source));
         }
     }

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/io/XmlBoundsImporter.java

@@ -64 +64 @@
             entries = reader.parse();
         } catch (SAXException e) {
-            Logging.trace(e);
-            if (JOptionPane.showConfirmDialog(
+            Logging.warn(e);
+            if (JOptionPane.YES_OPTION != GuiHelper.runInEDTAndWaitAndReturn(() -> JOptionPane.showConfirmDialog(
                     MainApplication.getMainFrame(),
                     tr("Validating error in file {0}:\n{1}\nDo you want to continue without validating the file ?",
                             source != null ? source : file.getPath(), e.getLocalizedMessage()),
                     tr("Open Imagery XML file"),
-                    JOptionPane.YES_NO_CANCEL_OPTION) != JOptionPane.YES_OPTION) {
-                return null;
-            }
+                    JOptionPane.YES_NO_CANCEL_OPTION))) {
+                return null;
+            }
 
             try (ImageryReader reader = new ImageryReader(source != null ? source : file.getAbsolutePath())) {