Author: vrubezhny Date: 2011-02-25 17:26:32 -0500 (Fri, 25 Feb 2011) New Revision: 29365 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml Log: JBIDE-8049 *.inc content type JSP clash with PDT Issue is fixed. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2011-02-25 22:19:14 UTC (rev 29364) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.properties 2011-02-25 22:26:32 UTC (rev 29365) @@ -20,3 +20,5 @@ Externalize.Selected.Property=Externalize Strings... vpe.toolbar.name=VPE Toolbar + +ContentType_JBossToolsINC=JBoss Tools JSP Include \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-02-25 22:19:14 UTC (rev 29364) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2011-02-25 22:26:32 UTC (rev 29365) @@ -194,7 +194,7 @@ contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor" id="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor" matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl" - extensions="jsp, jspf, jspx, tag, tagf, inc"> + extensions="jsp, jspf, jspx, tag, tagf"> <contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspsource"/> </editor> <editor @@ -538,9 +538,9 @@ </extension> <extension point="org.eclipse.core.runtime.contentTypes"> - <file-association + <!--file-association content-type="org.eclipse.jst.jsp.core.jspsource" - file-extensions="inc"/> + file-extensions="inc"/ --> <file-association content-type="org.eclipse.wst.html.core.htmlsource" file-extensions="jsf"/> @@ -972,6 +972,17 @@ </extension> + <extension point="org.eclipse.core.contenttype.contentTypes"> + <content-type id="org.eclipse.jst.jsp.core.jspsource" + name="%ContentType_JBossToolsINC" + base-type="org.eclipse.core.runtime.text" + describer="org.jboss.tools.jst.jsp.jspeditor.JSPIncludeContentDescriber" + file-extensions="inc" + priority="normal" + /> + </extension> + + <extension point="org.jboss.tools.common.model.resourceMapping"> <mapping