[jbosstools-commits] JBoss Tools SVN: r16302 - in trunk/jst/plugins: org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib and 2 other directories.

Author: akazakov Date: 2009-06-30 15:05:04 -0400 (Tue, 30 Jun 2009) New Revision: 16302 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Facelets.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2808 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-30 18:20:02 UTC (rev 16301) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-30 19:05:04 UTC (rev 16302) @@ -100,7 +100,7 @@ String matchString = super.getMatchString(parent, aRegion, offset); String regionType = aRegion.getType(); if(regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && matchString.startsWith("\"")) { - matchString = matchString.substring(1); //$NON-NLS-1$ + matchString = matchString.substring(1); } return matchString; } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-06-30 18:20:02 UTC (rev 16301) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletPageContectAssistProcessor.java 2009-06-30 19:05:04 UTC (rev 16302) @@ -30,6 +30,7 @@ import org.jboss.tools.jst.web.kb.PageProcessor; import org.jboss.tools.jst.web.kb.KbQuery.Type; import org.jboss.tools.jst.web.kb.internal.FaceletPageContextImpl; +import org.jboss.tools.jst.web.kb.taglib.CustomTagLibManager; import org.jboss.tools.jst.web.kb.taglib.INameSpace; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -43,8 +44,6 @@ * */ public class FaceletPageContectAssistProcessor extends JspContentAssistProcessor { - private static final String UI_URI_JSF_FACELETS = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$ - private static final String UI_URI_XHTML_FACELETS = "http://www.w3.org/1999/xhtml/facelets"; //$NON-NLS-1$ private static final String JSFC_ATTRIBUTE_NAME = "jsfc"; //$NON-NLS-1$ private boolean replaceJsfcTags; @@ -139,10 +138,10 @@ } }; context.addNameSpace(region, nameSpace); - if (UI_URI_JSF_FACELETS.equals(uri)) { + if (CustomTagLibManager.FACELETS_UI_TAG_LIB_URI.equals(uri)) { nameSpace = new INameSpace(){ public String getURI() { - return UI_URI_XHTML_FACELETS; + return CustomTagLibManager.FACELETS_HTML_TAG_LIB_URI; } public String getPrefix() { return ""; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java 2009-06-30 18:20:02 UTC (rev 16301) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/EnumerationProposalType.java 2009-06-30 19:05:04 UTC (rev 16302) @@ -39,14 +39,16 @@ List<TextProposal> proposals = new ArrayList<TextProposal>(); for (int i = 0; i < params.length; i++) { String text = params[i].getValue(); - TextProposal proposal = new TextProposal(); - proposal.setLabel(text); - proposal.setReplacementString(text); - proposal.setPosition(text.length()); - if(ICON==null) { - ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage(); + if(text.startsWith(query.getValue())) { + TextProposal proposal = new TextProposal(); + proposal.setLabel(text); + proposal.setReplacementString(text); + proposal.setPosition(text.length()); + if(ICON==null) { + ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage(); + } + proposals.add(proposal); } - proposals.add(proposal); } return proposals.toArray(new TextProposal[0]); } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java 2009-06-30 18:20:02 UTC (rev 16301) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/taglib/CustomTagLibManager.java 2009-06-30 19:05:04 UTC (rev 16302) @@ -37,8 +37,8 @@ */ public class CustomTagLibManager { - public static final String FACELETS_UI_TAG_LIB_URI = "http://java.sun.com/jsf/facelets"; - public static final String FACELETS_HTML_TAG_LIB_URI = "http://www.w3.org/1999/xhtml/facelets"; + public static final String FACELETS_UI_TAG_LIB_URI = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$ + public static final String FACELETS_HTML_TAG_LIB_URI = "http://www.w3.org/1999/xhtml/facelets"; //$NON-NLS-1$ private static final CustomTagLibManager INSTANCE = new CustomTagLibManager(); @@ -90,7 +90,7 @@ IConfigurationElement[] elements = extension.getConfigurationElements(); for(int j=0; j<elements.length; j++) { String elementName = elements[j].getName(); - if("tag-lib".equals(elementName)) { + if("tag-lib".equals(elementName)) { //$NON-NLS-1$ String uri = elements[j].getAttribute("uri"); //$NON-NLS-1$ String location = elements[j].getAttribute("location"); //$NON-NLS-1$ String version = elements[j].getAttribute("version"); //$NON-NLS-1$ @@ -98,7 +98,7 @@ Bundle sourcePlugin = Platform.getBundle(elements[j].getNamespaceIdentifier()); File schemaLocation = null; try { - String pluginPath = FileLocator.resolve(sourcePlugin.getEntry("/")).getPath(); + String pluginPath = FileLocator.resolve(sourcePlugin.getEntry("/")).getPath(); //$NON-NLS-1$ if(uri==null || uri.length()==0 || location==null || location.length()==0) { WebKbPlugin.getDefault().logWarning("Incorrect org.jboss.tools.jst.web.kb.KbTagLib extension in " + pluginPath + " plugin. URI or location can't be empty."); //$NON-NLS-1$ $NON-NLS-2$ continue; @@ -114,7 +114,7 @@ } else { WebKbPlugin.getDefault().logWarning("Can't load KB schema: " + schemaLocation); //$NON-NLS-1$ } - } else if("component-extension".equals(elementName)) { + } else if("component-extension".equals(elementName)) { //$NON-NLS-1$ String location = elements[j].getAttribute("location"); //$NON-NLS-1$ Bundle sourcePlugin = Platform.getBundle(elements[j].getNamespaceIdentifier()); File schemaLocation = null; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Facelets.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Facelets.xml 2009-06-30 18:20:02 UTC (rev 16301) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/Facelets.xml 2009-06-30 19:05:04 UTC (rev 16302) @@ -1,17 +1,17 @@ <?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="ui"> - <component name="component" extended="true"> + <component name="component" extended="false"> <description>The component tag and the composition tag behave exactly the same, except the component tag will insert a new UIComponent instance into the tree as the root of all the child components/fragments it has.</description> - <attribute extended="true" name="id"> + <attribute extended="false" name="id"> <description>A unique id may be provided, otherwise Facelets will automatically assign one under the same logic it uses for all UIComponents.</description> </attribute> - <attribute extended="true" name="binding"> + <attribute extended="false" name="binding"> <description>This binding attribute is used the same as with any other UIComponent such that it allows you to reference them as a property of a JavaBean. If that target property did not have a @@ -19,15 +19,15 @@ create an instance for you and set it on your JavaBean before continuing with building the tree.</description> </attribute> - <attribute extended="true" name="xmlns"> + <attribute extended="false" name="xmlns"> <proposal type="taglib" /> </attribute> - <attribute extended="true" name="xmlns:*"> + <attribute extended="false" name="xmlns:*"> <proposal type="taglib" /> </attribute> </component> - <component name="composition" extended="true"> - <attribute extended="true" name="template"> + <component name="composition" extended="false"> + <attribute extended="false" name="template"> <description>The resolvable URI of the template to use. The content within the composition tag will be used in populating the template specified.</description> @@ -35,14 +35,14 @@ <param name="extensions" value="%page%" /> </proposal> </attribute> - <attribute extended="true" name="xmlns"> + <attribute extended="false" name="xmlns"> <proposal type="taglib" /> </attribute> - <attribute extended="true" name="xmlns:*"> + <attribute extended="false" name="xmlns:*"> <proposal type="taglib" /> </attribute> </component> - <component closeTag="true" name="debug" extended="true"> + <component closeTag="true" name="debug" extended="false"> <description>The debug tag will capture the component tree and variables when it is encoded, storing the data for retrieval later. You may launch the debug window at any time from your browser by @@ -52,13 +52,13 @@ enabled/disabled across your whole application. If your application uses multiple windows, you might want to assign different hot keys to each one.</description> - <attribute extended="true" name="hotkey"> + <attribute extended="false" name="hotkey"> <description>The hot key to use in combination with 'CTRL' + 'SHIFT' to launch the debug window. By default, when the debug tag is used, you may launch the debug window with 'CTRL' + 'SHIFT' + 'D'. This value cannot be an EL expression.</description> </attribute> - <attribute extended="true" name="rendered"> + <attribute extended="false" name="rendered"> <description>Creating debug output on every request adds some overhead, so you can use the UIComponent rendered property to turn debugging on or off based on some expression.</description> @@ -68,14 +68,14 @@ </proposal> </attribute> </component> - <component name="decorate" extended="true"> + <component name="decorate" extended="false"> <description>The decorate tag acts the same as a composition tag, but it will not trim everything outside of it. This is useful in cases where you have a list of items in a document, which you would like to be decorated or framed. The sum of it all is that you can take any element in the document and decorate it with some external logic as provided by the template.</description> - <attribute extended="true" name="template" required="true"> + <attribute extended="false" name="template" required="true"> <description>The resolvable URI of the template to use. The content within the decorate tag will be used in populating the template specified.</description> @@ -83,22 +83,22 @@ <param name="extensions" value="%page%" /> </proposal> </attribute> - <attribute extended="true" name="xmlns"> + <attribute extended="false" name="xmlns"> <proposal type="taglib" /> </attribute> - <attribute extended="true" name="xmlns:*"> + <attribute extended="false" name="xmlns:*"> <proposal type="taglib" /> </attribute> </component> - <component name="define" extended="true"> + <component name="define" extended="false"> <description>The define tag can be used within tags that allow templating. This includes composition and decorate tags.</description> - <attribute extended="true" name="name" required="true"> + <attribute extended="false" name="name" required="true"> <description>The literal name for this definition. This name will match up with a &lt;ui:insert/&gt; tag in a target template.</description> </attribute> </component> - <component name="fragment" extended="true"> + <component name="fragment" extended="false"> <description>Just like composition has decorate as a non-trimming version of the same behavior, component has fragment. This allows you to logically insert a UIComponent into the tree and possibly bind @@ -109,12 +109,12 @@ children, you may want more control over the building process that Facelets does and using a fragment tag will help guarantee parent/child relationships for you.</description> - <attribute extended="true" name="id"> + <attribute extended="false" name="id"> <description>A unique id may be provided, otherwise Facelets will automatically assign one under the same logic it uses for all UIComponents.</description> </attribute> - <attribute extended="true" name="binding"> + <attribute extended="false" name="binding"> <description>This binding attribute is used the same as with any other UIComponent such that it allows you to reference them as a property of a JavaBean. If that target property did not have a @@ -122,14 +122,14 @@ create an instance for you and set it on your JavaBean before continuing with building the tree.</description> </attribute> - <attribute extended="true" name="xmlns"> + <attribute extended="false" name="xmlns"> <proposal type="taglib" /> </attribute> - <attribute extended="true" name="xmlns:*"> + <attribute extended="false" name="xmlns:*"> <proposal type="taglib" /> </attribute> </component> - <component closeTag="true" name="include" extended="true"> + <component closeTag="true" name="include" extended="false"> <description>The include tag can point at any Facelet which might use the composition tag, component tag, or simply be straight XHTML/XML. It should be noted that the src path does allow relative path names, @@ -137,7 +137,7 @@ requested. The include tag can be used in conjunction with multiple &lt;ui:param/&gt; tags to pass EL expressions/values to the target page.</description> - <attribute extended="true" name="src" required="true"> + <attribute extended="false" name="src" required="true"> <description>A literal or EL expression that specifies the target Facelet that you would like to include into your document.</description> <proposal type="file"> @@ -145,46 +145,46 @@ </proposal> </attribute> </component> - <component name="insert" extended="true"> + <component name="insert" extended="false"> <description>The insert tag is used within your templates to declare spots of replacable data.</description> - <attribute extended="true" name="name"> + <attribute extended="false" name="name"> <description>The optional name attribute matches the associated &lt;ui:define/&gt; tag in this template's client. If no name is specified, it's expected that the whole template client will be inserted.</description> </attribute> </component> - <component closeTag="true" name="param" extended="true"> + <component closeTag="true" name="param" extended="false"> <description /> - <attribute extended="true" name="name" required="true"> + <attribute extended="false" name="name" required="true"> <description>The name of the variable to pass to the included Facelet.</description> </attribute> - <attribute extended="true" name="value" required="true"> + <attribute extended="false" name="value" required="true"> <description>The literal or EL expression value to assign to the named variable.</description> </attribute> </component> - <component name="remove" extended="true"> + <component name="remove" extended="false"> <description>The remove tag does not have any attributes and is used to remove chunks of XML content from a Facelet at compilation time. The remove tag is often used in conjunction with the jsfc feature.</description> </component> - <component name="repeat" extended="true"> - <attribute extended="true" name="value" required="true"> + <component name="repeat" extended="false"> + <attribute name="value" required="true"> <description>Expression for the list of items</description> </attribute> - <attribute extended="true" name="var" required="true"> + <attribute name="var" required="true"> <description>The name of the variable to put the current item.</description> </attribute> - <attribute extended="true" name="offset"> + <attribute extended="false" name="offset"> <description>The offset index.</description> </attribute> - <attribute extended="true" name="size"> + <attribute extended="false" name="size"> <description>Number of items to produce.</description> </attribute> - <attribute extended="true" name="varStatus"> + <attribute extended="false" name="varStatus"> <description>Index object.</description> </attribute> </component>