1.1 --- a/bpel.core/src/org/netbeans/modules/bpel/core/multiview/BPELSourceMultiViewElement.java	Mon Mar 26 10:46:43 2007 +0000
     1.2 +++ b/bpel.core/src/org/netbeans/modules/bpel/core/multiview/BPELSourceMultiViewElement.java	Mon Mar 26 14:15:44 2007 +0000
     1.3 @@ -455,9 +455,13 @@
     1.4          assert nodeFactory != null;
     1.5          
     1.6          NodeType nodeType = Util.getBasicNodeType(foundedEntity);
     1.7 -        if (nodeType == null || NodeType.UNKNOWN_TYPE.equals(nodeType)) {
     1.8 +        if (nodeType == null) {
     1.9              return;
    1.10          }
    1.11 +        
    1.12 +        nodeType = NodeType.UNKNOWN_TYPE.equals(nodeType) 
    1.13 +                ? NodeType.DEFAULT_BPEL_ENTITY_NODE 
    1.14 +                : nodeType;
    1.15          final Node node = nodeFactory.createNode(
    1.16                  nodeType,
    1.17                  foundedEntity,

     2.1 --- a/bpel.editors/src/org/netbeans/modules/bpel/navigator/BpelModelLogicalBeanTree.java	Mon Mar 26 10:46:43 2007 +0000
     2.2 +++ b/bpel.editors/src/org/netbeans/modules/bpel/navigator/BpelModelLogicalBeanTree.java	Mon Mar 26 14:15:44 2007 +0000
     2.3 @@ -41,6 +41,7 @@
     2.4  import org.netbeans.modules.bpel.model.api.events.PropertyUpdateEvent;
     2.5  import org.netbeans.modules.bpel.nodes.BpelNode;
     2.6  import org.netbeans.modules.bpel.nodes.BpelProcessNode;
     2.7 +import org.netbeans.modules.bpel.nodes.DefaultBpelEntityNode;
     2.8  import org.netbeans.modules.bpel.nodes.navigator.Util;
     2.9  import org.netbeans.modules.bpel.nodes.refactoring.UsageFilterNode;
    2.10  import org.netbeans.modules.bpel.properties.NodeUtils;
    2.11 @@ -133,14 +134,22 @@
    2.12          for (Node elem : nodes) {
    2.13              if (elem instanceof UsageFilterNode) {
    2.14                  elem = ((UsageFilterNode)elem).getOriginal();
    2.15 +            } else if (elem instanceof BpelNode 
    2.16 +                    && ((BpelNode)elem).getReference() instanceof BpelEntity
    2.17 +                    && !(org.netbeans.modules.bpel.editors.api.utils.Util.isNavigatorShowableNodeType(((BpelNode)elem).getNodeType()))) 
    2.18 +            {
    2.19 +                elem = org.netbeans.modules.bpel.editors.api.utils.Util.getClosestNavigatorNode(
    2.20 +                        (BpelEntity)((BpelNode)elem).getReference(),
    2.21 +                        elem.getLookup());
    2.22              }
    2.23 -            
    2.24 +
    2.25              if (!(elem instanceof BpelNode)
    2.26              || ((BpelNode)elem).getNodeType().equals(NodeType.SCHEMA_ELEMENT)
    2.27              || !(((BpelNode)elem).getReference() instanceof BpelEntity)) 
    2.28              {
    2.29                  continue;
    2.30              }
    2.31 +            
    2.32              BpelEntity refBpelEntityObj = BpelEntity.class.cast(
    2.33                      ((BpelNode)elem).getReference());
    2.34              if (refBpelEntityObj != null) {