EA-25564 - NPE: CommonContentEntriesEditor.createComponentImpl

This commit is contained in:
Alexey Pegov
2011-04-13 19:40:08 +04:00
parent 588afceb7f
commit fe3c004007
@@ -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;