Author: akazakov Date: 2009-08-25 09:04:25 -0400 (Tue, 25 Aug 2009) New Revision: 17250 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ResourcePathProposalType.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4822 fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ResourcePathProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ResourcePathProposalType.java 2009-08-25 12:10:36 UTC (rev 17249) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ResourcePathProposalType.java 2009-08-25 13:04:25 UTC (rev 17250) @@ -51,9 +51,11 @@ PAGE_FILE_EXTENSIONS.add(pages[i]); } } + private static String PATH_ADDITION = "pathAddition"; private IContainer webRootResource; private Set<String> extensions; + private List<String> enumeration; /* (non-Javadoc) * @see org.jboss.tools.jst.web.kb.internal.taglib.ModelProposalType#init(org.jboss.tools.jst.web.kb.IPageContext) @@ -71,6 +73,16 @@ if(extensions==null) { initExtensions(); } + if(enumeration==null) { + enumeration = new ArrayList<String>(); + if(params!=null) { + for (int i = 0; i < params.length; i++) { + if(PATH_ADDITION.equals(params[i].getName())) { + enumeration.add(params[i].getValue()); + } + } + } + } } /* (non-Javadoc) @@ -99,6 +111,19 @@ proposal.setImage(ICON); proposals.add(proposal); } + for (String path : enumeration) { + TextProposal proposal = new TextProposal(); + proposal.setLabel(path); + String replacementString = path; + proposal.setAutoActivationContentAssistantAfterApplication(false); + proposal.setReplacementString(replacementString); + proposal.setPosition(replacementString.length()); + if(ICON==null) { + ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage(); + } + proposal.setImage(ICON); + proposals.add(proposal); + } return proposals.toArray(new TextProposal[0]); } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-25 12:10:36 UTC (rev 17249) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Ajax4jsf.xml 2009-08-25 13:04:25 UTC (rev 17250) @@ -1,7 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd"> <tag-lib defaultPrefix="a4j"> - <custom-extension> + <component-extension> + <attribute name="focus"> + <proposal type="id"/> + </attribute> + <attribute name="reRender"> + <proposal type="id"/> + </attribute> + <attribute name="status"> + <proposal type="id"/> + </attribute> + <attribute name="for"> + <proposal type="id"/> + </attribute> + <attribute name="targetId"> + <proposal type="id"/> + </attribute> + <attribute name="panelId"> + <proposal type="id"/> + </attribute> + <attribute name="dragIndicator"> + <proposal type="id"/> + </attribute> + <attribute name="process"> + <proposal type="id"/> + </attribute> + <attribute name="similarityGroupingId"> + <proposal type="id"/> + </attribute> + <attribute name="reRenderAfterComplete"> + <proposal type="id"/> + </attribute> + <attribute name="attachTo"> + <proposal type="id"/> + </attribute> <attribute name="ajaxSingle"> <proposal type="enumeration"> <param value="true" /> @@ -38,7 +71,7 @@ <param value="false" /> </proposal> </attribute> - </custom-extension> + </component-extension> <component closeTag="true" name="loadBundle"> <attribute name="basename"> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml 2009-08-25 12:10:36 UTC (rev 17249) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JBossSeam.xml 2009-08-25 13:04:25 UTC (rev 17250) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd"> <tag-lib defaultPrefix="s"> - <custom-extension> + <component-extension> <attribute name="propagation"> <proposal type="enumeration"> <param value="begin" /> @@ -11,7 +11,7 @@ <param value="end" /> </proposal> </attribute> - </custom-extension> + </component-extension> <component name="button"> <attribute name="view"> <proposal type="file"> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2009-08-25 12:10:36 UTC (rev 17249) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfHtmlBasic.xml 2009-08-25 13:04:25 UTC (rev 17250) @@ -8,8 +8,8 @@ <proposal type="file"> <param name="extensions" value="%image%" /> <param name="pathType" value="absolute" /> - <param name="pathAddition" - value="#{facesContext.externalContext.requestContextPath}" /> + <!-- param name="pathAddition" + value="#{facesContext.externalContext.requestContextPath}" / --> </proposal> </attribute> <attribute name="type"> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-08-25 12:10:36 UTC (rev 17249) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Richfaces.xml 2009-08-25 13:04:25 UTC (rev 17250) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.tools.jst.web.kb/resources/kbCustomTagLibSchema-1.0.dtd"> <tag-lib defaultPrefix="rich"> - <custom-extension> + <component-extension> <attribute name="focus"> <proposal type="id"/> </attribute> @@ -71,7 +71,7 @@ <param value="false" /> </proposal> </attribute> - </custom-extension> + </component-extension> <component name="extendedDataTable"> <attribute name="align">