From fe3c00400715f7fc1c287d7a488452bcbf26af66 Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Wed, 13 Apr 2011 19:40:08 +0400 Subject: [PATCH] EA-25564 - NPE: CommonContentEntriesEditor.createComponentImpl --- .../configuration/CommonContentEntriesEditor.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java index c36083ce9e83..06821c652915 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java @@ -175,12 +175,15 @@ public class CommonContentEntriesEditor extends ModuleElementsEditor { mainPanel.add(innerPanel, BorderLayout.SOUTH); } - final ContentEntry[] contentEntries = getModel().getContentEntries(); - if (contentEntries.length > 0) { - for (final ContentEntry contentEntry : contentEntries) { - addContentEntryPanel(contentEntry.getUrl()); + final ModifiableRootModel model = getModel(); + if (model != null) { + final ContentEntry[] contentEntries = model.getContentEntries(); + if (contentEntries.length > 0) { + for (final ContentEntry contentEntry : contentEntries) { + addContentEntryPanel(contentEntry.getUrl()); + } + selectContentEntry(contentEntries[0].getUrl()); } - selectContentEntry(contentEntries[0].getUrl()); } return mainPanel;