Author: vrubezhny Date: 2008-10-27 12:27:38 -0400 (Mon, 27 Oct 2008) New Revision: 11212 Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3010 NullPoineterException when call CA Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-27 16:19:02 UTC (rev 11211) +++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-27 16:27:38 UTC (rev 11212) @@ -350,6 +350,7 @@ <contentAssistProcessor class="org.jboss.tools.jst.jsp.contentassist.ExtendedJSPContentAssistProcessor" id="org.jboss.tools.jst.jsp.contentassist.ExtendedJSPContentAssistProcessor"> + <contenttype id="org.eclipse.jst.jsp.core.jspsource"> <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" /> <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" /> @@ -359,25 +360,12 @@ <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" /> <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> </contenttype> - <contenttype id="org.eclipse.wst.html.core.htmlsource"> - <partitiontype id="org.eclipse.wst.xml.XML_DEFAULT" /> - <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" /> - <partitiontype id="org.eclipse.jst.jsp.DEFAULT_JSP" /> - <partitiontype id="org.eclipse.jst.jsp.JSP_DIRECTIVE" /> - <partitiontype id="org.eclipse.jst.jsp.SCRIPT.DELIMITER" /> - <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" /> - <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> - </contenttype> </contentAssistProcessor> <contentAssistProcessor class="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor" id="org.jboss.tools.jst.jsp.contentassist.FaceletsHtmlContentAssistProcessor"> - <contenttype id="org.eclipse.jst.jsp.core.jspsource"> - <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" /> - <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" /> - <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" /> <!-- Is this forgotten? --> - </contenttype> + <contenttype id="org.eclipse.wst.html.core.htmlsource"> <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" /> <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" /> @@ -392,9 +380,7 @@ <contentAssistProcessor class="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor" id="org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor"> - <contenttype id="org.eclipse.jst.jsp.core.jspsource"> - <partitiontype id="org.eclipse.wst.css.STYLE" /> - </contenttype> + <contenttype id="org.eclipse.wst.html.core.htmlsource"> <partitiontype id="org.eclipse.wst.css.STYLE" /> </contenttype>