From c801fa60b4752b101cc16e7e01e27622ff595b08 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Fri, 23 Apr 2010 15:53:39 +0400 Subject: [PATCH] load document from resource --- .../openapi/application/impl/ApplicationInfoImpl.java | 6 +++--- platform/util/src/com/intellij/openapi/util/JDOMUtil.java | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java index 960296bf7146..019003a1259d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java @@ -284,9 +284,9 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern if (ourShadowInstance == null) { ourShadowInstance = new ApplicationInfoImpl(); try { - Document doc = JDOMUtil.loadDocument(ApplicationInfoImpl.class.getResourceAsStream(IDEA_PATH + - ApplicationNamesInfo.getComponentName() + - XML_EXTENSION)); + Document doc = JDOMUtil.loadDocument(ApplicationInfoImpl.class, IDEA_PATH + + ApplicationNamesInfo.getComponentName() + + XML_EXTENSION); ourShadowInstance.readExternal(doc.getRootElement()); } catch (Exception e) { diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java index 8d4500ca3ca5..2f74eb28adc8 100644 --- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java +++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java @@ -336,6 +336,13 @@ public class JDOMUtil { } } + @NotNull + public static Document loadDocument(Class clazz, String reaource) throws JDOMException, IOException { + InputStream stream = clazz.getResourceAsStream(reaource); + if (stream == null) throw new FileNotFoundException(reaource); + return loadDocument(stream); + } + @NotNull public static Document loadDocument(URL url) throws JDOMException, IOException { return loadDocument(URLUtil.openStream(url));