From ed0b52d81064bf5486a620dad92b85a3138f2814 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Tue, 16 Feb 2016 18:14:49 +0300 Subject: [PATCH] FIXED IDEA-136208 Import non-eclipse formatter xml (more explanatory message) --- .../eclipse/importer/EclipseXmlProfileReader.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseXmlProfileReader.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseXmlProfileReader.java index 4216e58cec14..7e3f52219d31 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseXmlProfileReader.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importer/EclipseXmlProfileReader.java @@ -53,7 +53,12 @@ public class EclipseXmlProfileReader extends DefaultHandler implements EclipseXm parser.parse(input, this); } catch (Exception e) { - throw new SchemeImportException(e); + if (e.getCause() instanceof NonEclipseXmlFileException) { + throw new SchemeImportException("The input file is not a valid Eclipse XML profile."); + } + else { + throw new SchemeImportException(e); + } } } @@ -79,7 +84,13 @@ public class EclipseXmlProfileReader extends DefaultHandler implements EclipseXm // Ignore } else { - throw new SAXException("Unknown XML element: " + qName); + throw new SAXException(new NonEclipseXmlFileException("Unknown XML element: " + qName)); + } + } + + private static class NonEclipseXmlFileException extends Exception { + public NonEclipseXmlFileException(String message) { + super(message); } }