1.1 --- a/xslt.core/src/org/netbeans/modules/xslt/core/text/completion/handler/HandlerCallTemplateName.java	Wed Jul 09 07:04:51 2008 +0200
     1.2 +++ b/xslt.core/src/org/netbeans/modules/xslt/core/text/completion/handler/HandlerCallTemplateName.java	Fri Jul 11 14:48:31 2008 +0400
     1.3 @@ -65,11 +65,10 @@
     1.4      }
     1.5      
     1.6      private List<XSLTCompletionResultItem> getNamedTemplateNameList() {
     1.7 -        if ((schemaModel == null) || (surroundTag == null) || 
     1.8 -            (attributeName == null) || (xslModel == null)) 
     1.9 +        if ((surroundTag == null) || (attributeName == null) || (xslModel == null)) 
    1.10              return Collections.emptyList();
    1.11          
    1.12 -        String tagName = surroundTag.getTagName(); //getLocalName();
    1.13 +        String tagName = surroundTag.getTagName();
    1.14          if (! tagName.contains(XSLT_TAG_NAME_CALL_TEMPLATE))
    1.15              return Collections.emptyList();
    1.16          if (! attributeName.equals(XSLTCompletionUtil.ATTRIB_NAME))

     2.1 --- a/xslt.core/src/org/netbeans/modules/xslt/core/text/completion/handler/HandlerWithParamName.java	Wed Jul 09 07:04:51 2008 +0200
     2.2 +++ b/xslt.core/src/org/netbeans/modules/xslt/core/text/completion/handler/HandlerWithParamName.java	Fri Jul 11 14:48:31 2008 +0400
     2.3 @@ -70,11 +70,10 @@
     2.4      }
     2.5      
     2.6      private List<XSLTCompletionResultItem> getTemplatesParamNameList() {
     2.7 -        if ((schemaModel == null) || (surroundTag == null) || 
     2.8 -            (attributeName == null) || (xslModel == null)) 
     2.9 +        if ((surroundTag == null) || (attributeName == null) || (xslModel == null)) 
    2.10              return Collections.emptyList();
    2.11          
    2.12 -        String tagName = surroundTag.getTagName(); //getLocalName();
    2.13 +        String tagName = surroundTag.getTagName();
    2.14          if (! tagName.contains(XSLT_TAG_NAME_WITH_PARAM))
    2.15              return Collections.emptyList();
    2.16          if (! attributeName.equals(XSLTCompletionUtil.ATTRIB_NAME))