Author: akazakov Date: 2009-06-25 19:02:44 -0400 (Thu, 25 Jun 2009) New Revision: 16212 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java Log: https://jira.jboss.org/jira/browse/JBIDE-2808 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java 2009-06-25 21:51:46 UTC (rev 16211) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java 2009-06-25 23:02:44 UTC (rev 16212) @@ -19,6 +19,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.KbQuery; import org.jboss.tools.jst.web.kb.WebKbPlugin; @@ -44,7 +47,7 @@ return EMPTY_PROPOSAL_LIST; } Properties view = new Properties(); - view.put(IWebPromptingProvider.VIEW_PATH, context.getResource().getLocation()); + view.put(IWebPromptingProvider.VIEW_PATH, context.getResource().getFullPath()); List<Object> sourceList = provider.getList(xModel, WebPromptingProvider.JSF_VIEW_ACTIONS, "", view); if (sourceList != null && !sourceList.isEmpty()) { Set<String> sorted = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java 2009-06-25 21:51:46 UTC (rev 16211) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/CustomTagLibAttribute.java 2009-06-25 23:02:44 UTC (rev 16212) @@ -69,6 +69,9 @@ @Override public TextProposal[] getProposals(KbQuery query, IPageContext context) { CustomProposalType[] types = getProposals(); + if(types.length==0) { + return EMPTY_PROPOSAL_LIST; + } if(types.length==1) { return types[0].getProposals(query, context); }