assertion for EA-23281 - NPE: MasterDetailsComponent.addNode

This commit is contained in:
nik
2010-11-30 16:02:06 +03:00
parent 1a97855dbf
commit 0da6b7175d
2 changed files with 4 additions and 2 deletions
@@ -62,7 +62,9 @@ public class FacetEditorFacadeImpl implements FacetEditorFacade {
private void addFacetNode(Facet facet) {
addFacetNode(facet, myStructureConfigurable.findModuleNode(facet.getModule()));
final FacetStructureConfigurable facetStructureConfigurable = FacetStructureConfigurable.getInstance(myStructureConfigurable.getProject());
facetStructureConfigurable.addFacetNode(facetStructureConfigurable.findFacetTypeNode(facet.getType()), facet, this);
final MasterDetailsComponent.MyNode facetTypeNode = facetStructureConfigurable.findFacetTypeNode(facet.getType());
LOG.assertTrue(facetTypeNode != null, "Cannot found node for " + facet.getType());
facetStructureConfigurable.addFacetNode(facetTypeNode, facet, this);
}
private MasterDetailsComponent.MyNode addFacetNode(final Facet facet, final MasterDetailsComponent.MyNode moduleNode) {
@@ -100,7 +100,7 @@ public class FacetStructureConfigurable extends BaseStructureConfigurable {
return findNodeByObject(myRoot, facetType);
}
public void addFacetNode(MyNode facetTypeNode, Facet facet, FacetEditorFacadeImpl editorFacade) {
public void addFacetNode(@NotNull MyNode facetTypeNode, @NotNull Facet facet, @NotNull FacetEditorFacadeImpl editorFacade) {
FacetConfigurable facetConfigurable = editorFacade.getOrCreateConfigurable(facet);
addNode(new FacetConfigurableNode(facetConfigurable), facetTypeNode);
}