Author: dazarov Date: 2010-11-09 09:10:22 -0500 (Tue, 09 Nov 2010) New Revision: 26370 Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml Log: https://jira.jboss.org/browse/JBIDE-7460 Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370) @@ -231,6 +231,14 @@ <axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jstl/core]:import/url" /> + <axis path="*/[http://java.sun.com/jstl/core]:redirect/url" /> + <axis path="*/[http://java.sun.com/jsp/jstl/core]:import/url" /> + <axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" /> + </partitionType> + </contentType> </hyperlinkPartitioner> @@ -631,6 +639,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" /> + </contenttypeidentifier> </hyperlink> </extension> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370) @@ -414,6 +414,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -440,6 +443,13 @@ <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/html]:outputStylesheet/name/" /> + <axis path="*/[http://java.sun.com/jsf/html]:outputScript/name/" /> + <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -454,6 +464,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -486,6 +499,15 @@ <axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/html]:commandButton/action/" /> + <axis path="*/[http://java.sun.com/jsf/html]:commandLink/action/" /> + + <axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/action/&q... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -599,6 +621,42 @@ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converte... /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/core]:converter/converterId/" /> + <axis path="*/[http://java.sun.com/jsf/html]:inputHidden/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:inputSecret/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:inputText/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:inputTextarea/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:outputFormat/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:outputLabel/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:outputLink/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:outputText/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:selectBooleanCheckbox/convert... /> + <axis path="*/[http://java.sun.com/jsf/html]:selectManyCheckbox/converter/... /> + <axis path="*/[http://java.sun.com/jsf/html]:selectManyListbox/converter/&... /> + <axis path="*/[http://java.sun.com/jsf/html]:selectManyMenu/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:selectOneListbox/converter/&q... /> + <axis path="*/[http://java.sun.com/jsf/html]:selectOneMenu/converter/" /> + <axis path="*/[http://java.sun.com/jsf/html]:selectOneRadio/converter/" /> + + <axis path="*/[http://myfaces.apache.org/tomahawk]:inputHidden/converter/&... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:inputSecret/converter/&... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:inputText/converter/" /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:inputTextarea/converter... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:outputFormat/converter/... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLabel/converter/&... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLink/converter/&q... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:outputText/converter/&q... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:selectBooleanCheckbox/c... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyCheckbox/conv... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyListbox/conve... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyMenu/converte... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneListbox/conver... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneMenu/converter... /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converte... /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -619,6 +677,11 @@ <axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -651,6 +714,15 @@ <axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/html]:outputLabel/for/" /> + <axis path="*/[http://java.sun.com/jsf/html]:message/for/" /> + + <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLabel/for/" /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPExprHyperlinkPartitioner" @@ -679,6 +751,14 @@ <partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" /> <partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" /> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" /> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" /> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" /> + <partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" /> + <partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -699,6 +779,11 @@ <!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /--> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /--> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -717,6 +802,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -746,6 +834,14 @@ <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" /> + <axis path="*/[http://java.sun.com/jsf/core]:valueChangeListener/type/" /> + <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" /> + <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -784,6 +880,17 @@ <axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/html]:commandButton/image/" /> + <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/value/" /> + <axis path="*/img/src/" /> + <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/url/" /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/image/" /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/value/" /> + <axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -798,6 +905,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -812,6 +922,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -826,6 +939,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" /> + </contentType> </hyperlinkPartitioner> </extension> @@ -939,6 +1055,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -957,6 +1076,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -994,6 +1116,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1008,6 +1133,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1022,6 +1150,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" /> + </contenttypeidentifier> <contenttypeidentifier id="org.eclipse.jst.jsf.facesconfig.facesConfigFile"> <partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CONVERTER" /> </contenttypeidentifier> @@ -1054,6 +1185,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1068,6 +1202,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" /> + </contenttypeidentifier> </hyperlink> <!-- Faces Config File --> @@ -1101,6 +1238,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1115,6 +1255,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1129,6 +1272,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1143,6 +1289,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1157,6 +1306,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1171,6 +1323,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -1185,6 +1340,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" /> + </contenttypeidentifier> <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" /> </contenttypeidentifier> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370) @@ -19,6 +19,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -33,6 +36,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -62,6 +68,14 @@ <axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/facelets]:composition/template/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:decorate/template/" /> + <axis path="*/[http://jboss.com/products/seam/taglib]:decorate/template/&q... /> + <axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -109,6 +123,20 @@ <axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" /> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/facelets]:component/id/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:component/binding/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:component/rendered/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:define/name/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:fragment/id/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:fragment/binding/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:insert/name/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:param/name/" /> + <axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -129,6 +157,11 @@ <axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -183,6 +216,22 @@ <axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://java.sun.com/jsf/html]:*/columnClasses/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/footerClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/headerClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/rowClasses/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/captionClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/styleClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/errorClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/fatalClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/infoClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/warnClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/disabledClass/" /> + <axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> </extension> @@ -204,6 +253,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" /> + </contenttypeidentifier> </hyperlink> </extension> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370) @@ -124,6 +124,44 @@ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/&q... /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://richfaces.org/a4j]:include/viewId/" /> + <axis path="*/[http://richfaces.org/a4j]:loadStyle/src/" /> + <axis path="*/[http://richfaces.org/a4j]:commandButton/image/" /> + <axis path="*/[http://richfaces.org/a4j]:loadScript/src/" /> + <axis path="*/[http://richfaces.org/rich]:insert/src/" /> + <axis path="*/[http://richfaces.org/rich]:menuGroug/icon/" /> + <axis path="*/[http://richfaces.org/rich]:menuGroug/iconDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolder/" /> + <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolderDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:menuItem/icon/" /> + <axis path="*/[http://richfaces.org/rich]:menuItem/iconDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:tree/icon/" /> + <axis path="*/[http://richfaces.org/rich]:tree/iconCollapsed/" /> + <axis path="*/[http://richfaces.org/rich]:tree/iconExpanded/" /> + <axis path="*/[http://richfaces.org/rich]:tree/iconLeaf/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedGroup/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedTopGroup/... /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledGroup/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledItem/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedGroup/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedTopGroup/&... /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconItem/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledGroup/&... /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledItem/&q... /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopItem/" /> + <axis path="*/[http://richfaces.org/rich]:calendar/buttonIcon/" /> + <axis path="*/[http://richfaces.org/rich]:calendar/buttonIconDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIcon/" /> + <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconInactive/" /> + <axis path="*/[http://richfaces.org/rich]:inplaceInput/cancelControlIcon/&... /> + <axis path="*/[http://richfaces.org/rich]:inplaceInput/saveControlIcon/" /> + <axis path="*/[http://richfaces.org/rich]:inplaceSelect/cancelControlIcon/... /> + <axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/&q... /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -243,6 +281,44 @@ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/&q... /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" > + <axis path="*/[http://richfaces.org/a4j]:include/viewId/" /> + <axis path="*/[http://richfaces.org/a4j]:loadStyle/src/" /> + <axis path="*/[http://richfaces.org/a4j]:commandButton/image/" /> + <axis path="*/[http://richfaces.org/a4j]:loadScript/src/" /> + <axis path="*/[http://richfaces.org/rich]:insert/src/" /> + <axis path="*/[http://richfaces.org/rich]:menuGroug/icon/" /> + <axis path="*/[http://richfaces.org/rich]:menuGroug/iconDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolder/" /> + <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolderDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:menuItem/icon/" /> + <axis path="*/[http://richfaces.org/rich]:menuItem/iconDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:tree/icon/" /> + <axis path="*/[http://richfaces.org/rich]:tree/iconCollapsed/" /> + <axis path="*/[http://richfaces.org/rich]:tree/iconExpanded/" /> + <axis path="*/[http://richfaces.org/rich]:tree/iconLeaf/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedGroup/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedTopGroup/... /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledGroup/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledItem/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedGroup/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedTopGroup/&... /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconItem/" /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledGroup/&... /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledItem/&q... /> + <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopItem/" /> + <axis path="*/[http://richfaces.org/rich]:calendar/buttonIcon/" /> + <axis path="*/[http://richfaces.org/rich]:calendar/buttonIconDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIcon/" /> + <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconDisabled/" /> + <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconInactive/" /> + <axis path="*/[http://richfaces.org/rich]:inplaceInput/cancelControlIcon/&... /> + <axis path="*/[http://richfaces.org/rich]:inplaceInput/saveControlIcon/" /> + <axis path="*/[http://richfaces.org/rich]:inplaceSelect/cancelControlIcon/... /> + <axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/&q... /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -260,6 +336,10 @@ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + </partitionType> + </contentType> </hyperlinkPartitioner> @@ -278,6 +358,10 @@ <partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" /> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" /> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -412,6 +496,49 @@ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/&q... /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://richfaces.org/a4j]:*/focus/" /> + <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/focus/" /> + <axis path="*/[http://richfaces.org/rich]:*/focus/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/focus/" /> + + <axis path="*/[http://richfaces.org/a4j]:*/reRender/" /> + <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/reRender/" /> + <axis path="*/[http://richfaces.org/rich]:*/reRender/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/reRender/" /> + + <axis path="*/[http://richfaces.org/a4j]:*/status/" /> + <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/status/" /> + <axis path="*/[http://richfaces.org/rich]:*/status/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/status/" /> + + <axis path="*/[http://richfaces.org/a4j]:*/for/" /> + <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/for/" /> + <axis path="*/[http://richfaces.org/rich]:*/for/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/for/" /> + + <axis path="*/[http://richfaces.org/rich]:effect/targetId/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:effect/targetId/" /> + + <axis path="*/[http://richfaces.org/rich]:toggleControl/panelId/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:toggleControl/panelId/&... /> + + <axis path="*/[http://richfaces.org/rich]:*/dragIndicator/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/dragIndicator/" /> + + <axis path="*/[http://richfaces.org/rich]:*/process/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/process/" /> + + <axis path="*/[http://richfaces.org/rich]:*/similarityGroupingId/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/similarityGroupingId/... /> + + <axis path="*/[http://richfaces.org/rich]:progressBar/reRenderAfterComplet... /> + + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:componentControl/attach... /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/&q... /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -450,6 +577,17 @@ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://richfaces.org/a4j]:*/converter/" /> + <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/converter/" /> + <axis path="*/[http://richfaces.org/rich]:*/converter/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/converter/" /> + + <axis path="*/[http://richfaces.org/rich]:*/rowKeyConverter/" /> + <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -746,6 +884,103 @@ <axis path="*/[http://richfaces.org/rich]:*/nodeClass/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://richfaces.org/rich]:*/addButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/activeClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/activeTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonDisabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/buttonInactiveClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/barClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/bottomControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/bodyClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/columnClasses/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlsClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlPressedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/controlPressClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/cleanButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/changedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/changedHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/copyAllControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/copyControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/contentClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/completeClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/dayStyleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/decreaseClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/decreaseSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/downControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/errorMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/entryClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/footerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fileEntryClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fileEntryControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/fatalMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/finishClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/headerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/handleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/handleSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/hoveredGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/hoveredItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/highlightedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputDisabledClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inputInactiveClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/itemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/itemSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/increaseClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/increaseSelectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/iconClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/infoMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/initialClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/listClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/labelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/popupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/rowClasses/" /> + <axis path="*/[http://richfaces.org/rich]:*/removeAllControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/removeControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/remainClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/styleClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/stopButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/sidebarClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectedClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/selectValueClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/separatorClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/uploadButtonClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/uploadListClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/upControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/editClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/viewClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/viewHoverClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/tipClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topControlClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topGroupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/topItemClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/tabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/markerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnLabelClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/warnMarkerClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/groupClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/disabledTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/inactiveTabClass/" /> + <axis path="*/[http://richfaces.org/rich]:*/nodeClass/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> </extension> @@ -767,6 +1002,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -781,6 +1019,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" /> + </contenttypeidentifier> </hyperlink> </extension> Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370) @@ -20,6 +20,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.eclipse.wst.html.HTML_DEFAULT" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.eclipse.wst.html.HTML_DEFAULT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -37,6 +40,10 @@ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + </partitionType> + </contentType> </hyperlinkPartitioner> <!--Maksim Areshkau, partitioner for *.taglib.xml files --> @@ -108,6 +115,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -122,6 +132,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -136,6 +149,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" /> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -150,6 +166,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"/> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"/> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -231,6 +250,17 @@ <!--axis path="*/style/" /--> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/link/*" ignoreCase="true"/> + </partitionType> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"> + <axis path="*/link/*" ignoreCase="true"/> + </partitionType> + <partitionType id="com.ibm.sse.STYLE"> + <!--axis path="*/style/" /--> + </partitionType> + </contentType> </hyperlinkPartitioner> <hyperlinkPartitioner @@ -266,6 +296,12 @@ <axis path="*/link/href/" ignoreCase="true"/> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/a/href/" ignoreCase="true"/> + <axis path="*/link/href/" ignoreCase="true"/> + </partitionType> + </contentType> </hyperlinkPartitioner> <!-- End of Common HTML and/or JSP hyperlink partitioners --> @@ -288,6 +324,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -322,6 +361,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" /> + </contenttypeidentifier> </hyperlink> <hyperlink @@ -416,6 +458,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" /> + </contenttypeidentifier> </hyperlink> <hyperlink Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2010-11-09 13:49:25 UTC (rev 26369) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2010-11-09 14:10:22 UTC (rev 26370) @@ -74,6 +74,12 @@ <axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://jboss.com/products/seam/taglib]:button/action/" /> + <axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" /> + </partitionType> + </contentType> </hyperlinkPartitioner> @@ -135,6 +141,9 @@ <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> + </contentType> <contentType id="org.eclipse.core.runtime.xml"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> </contentType> @@ -220,7 +229,12 @@ <axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" /> </partitionType> </contentType> - + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://jboss.com/products/seam/taglib]:button/view/" /> + <axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" /> + </partitionType> + </contentType> <contentType id="org.eclipse.core.runtime.xml"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> <axis path="*/view-id/" /> @@ -253,6 +267,11 @@ <axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/&... /> </partitionType> </contentType> + <contentType id="jsf.facelet.composite"> + <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> + <axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/&... /> + </partitionType> + </contentType> </hyperlinkPartitioner> @@ -313,6 +332,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" /> </contenttypeidentifier> + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" /> + </contenttypeidentifier> <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" /> </contenttypeidentifier> @@ -351,7 +373,9 @@ <contenttypeidentifier id="jsf.facelet"> <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" /> </contenttypeidentifier> - + <contenttypeidentifier id="jsf.facelet.composite"> + <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" /> + </contenttypeidentifier> <contenttypeidentifier id="org.eclipse.core.runtime.xml"> <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" /> </contenttypeidentifier>