Attachment #70420 for bug #190564

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 190564
Collapse All | Expand All

Lines 7-12 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Export-Package: org.eclipse.jst.jsf.common;x-internal:=true,	8	Export-Package: org.eclipse.jst.jsf.common;x-internal:=true,
9	org.eclipse.jst.jsf.common.dom,	9	org.eclipse.jst.jsf.common.dom,
		10	org.eclipse.jst.jsf.common.internal;x-friends:="org.eclipse.jst.jsf.core",
10	org.eclipse.jst.jsf.common.internal.types;x-friends:="org.eclipse.jst.jsf.core,org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.validation.el.tests,org.eclipse.jst.jsf.designtime.tests,org.eclipse.jst.jsf.context.symbol.tests",	11	org.eclipse.jst.jsf.common.internal.types;x-friends:="org.eclipse.jst.jsf.core,org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.validation.el.tests,org.eclipse.jst.jsf.designtime.tests,org.eclipse.jst.jsf.context.symbol.tests",
11	org.eclipse.jst.jsf.common.metadata,	12	org.eclipse.jst.jsf.common.metadata,
12	org.eclipse.jst.jsf.common.metadata.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests",	13	org.eclipse.jst.jsf.common.metadata.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests",

Lines 14-19 Link Here

(-)src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java (-1 / +2 lines)
14		14
15	import java.util.Iterator;	15	import java.util.Iterator;
16		16
		17	import org.eclipse.jst.jsf.common.internal.JSPUtil;
17	import org.eclipse.jst.jsf.context.IModelContext;	18	import org.eclipse.jst.jsf.context.IModelContext;
18	import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;	19	import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;
19	import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;	20	import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
Lines 145-151 Link Here
145	try	146	try
146	{	147	{
147	smodel = StructuredModelManager.getModelManager().getModelForRead((IStructuredDocument)context.getStructuredDocument());	148	smodel = StructuredModelManager.getModelManager().getModelForRead((IStructuredDocument)context.getStructuredDocument());
148	return "org.eclipse.jst.jsp.core.jspsource".equals(smodel.getContentTypeIdentifier()); //$NON-NLS-1$	149	return JSPUtil.isJSPContentType(smodel.getContentTypeIdentifier()); //$NON-NLS-1$
149	}	150	}
150	finally	151	finally
151	{	152	{




package org.eclipse.jst.jsf.common.internal;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.content.IContentTypeManager;

/**
 * Utility JSP methods
 * @author cbateman
 *
 */
public final class JSPUtil 
{
    private final static String  CTYPE_JSPSOURCE = 
        "org.eclipse.jst.jsp.core.jspsource"; //$NON-NLS-1$
    private final static String  CTYPE_JSPFRAGMENTSOURCE = 
        "org.eclipse.jst.jsp.core.jspfragmentsource"; //$NON-NLS-1$
    /**
     * @param contentType
     * @return true if contentType is one of the content types registered
     * for JSP files
     */
    public static boolean isJSPContentType(final String contentType)
    {
        return CTYPE_JSPSOURCE.equals(contentType)
                    || CTYPE_JSPFRAGMENTSOURCE.equals(contentType);
    }
    
    /**
     * @param file
     * @return true if file is associated with a JSP or JSP fragment content type
     */
    public static boolean isJSPContentType(final IFile file)
    {
        final IContentTypeManager typeManager = Platform.getContentTypeManager();
        IContentType jspContentType = 
            typeManager.getContentType(CTYPE_JSPSOURCE);
        if (jspContentType != null
                && jspContentType.isAssociatedWith(file.getName()))
        {
            return true;
        }

        jspContentType = 
            typeManager.getContentType(CTYPE_JSPFRAGMENTSOURCE); 
        
        // otherwise check if fragment
        if (jspContentType != null
                && jspContentType.isAssociatedWith(file.getName()))
        {
            return true;
        }
        
        return false;
    }
    
    private JSPUtil()
    {
        // no instantiation
    }
}




        super("/testdata/jsps/beanPropertyResolution.jsp.data", "/beanPropertyResolution.jsp", IJSFCoreConstants.FACET_VERSION_1_1,FACES_CONFIG_FILE_NAME_1_1);
    }

    /**
     * Allow sub-classing for sensitivity analysis (i.e. different dest file extensions)
     * 
     * @param srcFile
     * @param destFile
     */
    protected BeanPropertyResolutionTestCase(final String srcFile, final String destFile)
    {
        super(srcFile,destFile, IJSFCoreConstants.FACET_VERSION_1_1,FACES_CONFIG_FILE_NAME_1_1);
    }
    
    protected void setUp() throws Exception
    {
        super.setUp();

Lines 30-35 Link Here

(-)src/org/eclipse/jst/jsf/validation/el/tests/CommonTests.java (+9 lines)
30	import org.eclipse.jst.jsf.validation.el.tests.jsp.PropertiesOfMapsTestCase;	30	import org.eclipse.jst.jsf.validation.el.tests.jsp.PropertiesOfMapsTestCase;
31	import org.eclipse.jst.jsf.validation.el.tests.jsp.UnaryEmptyTestCase;	31	import org.eclipse.jst.jsf.validation.el.tests.jsp.UnaryEmptyTestCase;
32	import org.eclipse.jst.jsf.validation.el.tests.jsp.UnaryMinusTestCase;	32	import org.eclipse.jst.jsf.validation.el.tests.jsp.UnaryMinusTestCase;
		33	import org.eclipse.jst.jsf.validation.el.tests.jsp.ext.BeanPropertyResolutionTestCase_JSFExt;
		34	import org.eclipse.jst.jsf.validation.el.tests.jsp.ext.BeanPropertyResolutionTestCase_JSPFExt;
		35	import org.eclipse.jst.jsf.validation.el.tests.jsp.ext.BeanPropertyResolutionTestCase_JSPXExt;
33		36
34	public class CommonTests	37	public class CommonTests
35	{	38	{
Lines 68-73 Link Here
68	suite.addTest(new ConfigurableTestSuite(UnaryMinusTestCase.class));	71	suite.addTest(new ConfigurableTestSuite(UnaryMinusTestCase.class));
69		72
70	suite.addTest(new ConfigurableTestSuite(MarkerOffsetsTestCase.class));	73	suite.addTest(new ConfigurableTestSuite(MarkerOffsetsTestCase.class));
		74
		75	// file extension sensitivity
		76	suite.addTest(new ConfigurableTestSuite(BeanPropertyResolutionTestCase_JSFExt.class));
		77	suite.addTest(new ConfigurableTestSuite(BeanPropertyResolutionTestCase_JSPXExt.class));
		78	suite.addTest(new ConfigurableTestSuite(BeanPropertyResolutionTestCase_JSPFExt.class));
		79
71	//$JUnit-END$	80	//$JUnit-END$
72	}	81	}
73	}	82	}




package org.eclipse.jst.jsf.validation.el.tests.jsp.ext;

import org.eclipse.jst.jsf.validation.el.tests.jsp.BeanPropertyResolutionTestCase;

/**
 * Test cases for bean property resolution
 * 
 * @author cbateman
 */
public class BeanPropertyResolutionTestCase_JSPXExt extends BeanPropertyResolutionTestCase 
{
    public BeanPropertyResolutionTestCase_JSPXExt() {
        super("/testdata/jsps/beanPropertyResolution.jsp.data", "/beanPropertyResolution.jspx");
    }
}




package org.eclipse.jst.jsf.validation.el.tests.jsp.ext;

import org.eclipse.jst.jsf.validation.el.tests.jsp.BeanPropertyResolutionTestCase;

/**
 * Test cases for bean property resolution
 * 
 * @author cbateman
 */
public class BeanPropertyResolutionTestCase_JSFExt extends BeanPropertyResolutionTestCase 
{
    public BeanPropertyResolutionTestCase_JSFExt() {
        super("/testdata/jsps/beanPropertyResolution.jsp.data", "/beanPropertyResolution.jsf");
    }
}




package org.eclipse.jst.jsf.validation.el.tests.jsp.ext;

import org.eclipse.jst.jsf.validation.el.tests.jsp.BeanPropertyResolutionTestCase;

/**
 * Test cases for bean property resolution
 * 
 * @author cbateman
 */
public class BeanPropertyResolutionTestCase_JSPFExt extends BeanPropertyResolutionTestCase 
{
    public BeanPropertyResolutionTestCase_JSPFExt() {
        super("/testdata/jsps/beanPropertyResolution.jsp.data", "/beanPropertyResolution.jspf");
    }
}





import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jst.jsf.common.internal.JSPUtil;
import org.eclipse.core.runtime.content.IContentTypeManager;
import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils;
import org.eclipse.ui.IEditorInput;


            if (file != null)
            {
                return JSPUtil.isJSPContentType(file);
                IContentType jspContentType = 
                    typeManager.getContentType("org.eclipse.jst.jsp.core.jspsource"); //$NON-NLS-1$
                if (jspContentType != null
                        && jspContentType.isAssociatedWith(file.getName()))
                {
                    return true;
                }
            }

            return false;




		<validator>
			<projectNature id="org.eclipse.wst.common.modulecore.ModuleCoreNature" />
			<projectNature id="org.eclipse.jdt.core.javanature" />
			<filter
				objectClass="org.eclipse.core.resources.IFile"
				nameFilter="*.jsp">
			</filter>
			<filter
				objectClass="org.eclipse.core.resources.IFile"
				nameFilter="*.jspx">
			</filter> 
			<markerId
               markerIdValue="JSPSemanticsValidatorMarker">
         	</markerId>

         		incremental="true"
         		fullBuild="true"
         	/>
   <contentTypeBinding
         contentTypeId="org.eclipse.jst.jsp.core.jspsource">
   </contentTypeBinding>
   <contentTypeBinding
         contentTypeId="org.eclipse.jst.jsp.core.jspfragmentsource">
   </contentTypeBinding>
		</validator>
		</extension>


Return to bug 190564

Lines 210-223 Link Here

(-)plugin.xml (-8 / +6 lines)
210	<validator>	210	<validator>
211	<projectNature id="org.eclipse.wst.common.modulecore.ModuleCoreNature" />	211	<projectNature id="org.eclipse.wst.common.modulecore.ModuleCoreNature" />
212	<projectNature id="org.eclipse.jdt.core.javanature" />	212	<projectNature id="org.eclipse.jdt.core.javanature" />
213	<filter
214	objectClass="org.eclipse.core.resources.IFile"
215	nameFilter="*.jsp">
216	</filter>
217	<filter
218	objectClass="org.eclipse.core.resources.IFile"
219	nameFilter="*.jspx">
220	</filter>
221	<markerId	213	<markerId
222	markerIdValue="JSPSemanticsValidatorMarker">	214	markerIdValue="JSPSemanticsValidatorMarker">
223	</markerId>	215	</markerId>
Lines 229-234 Link Here
229	incremental="true"	221	incremental="true"
230	fullBuild="true"	222	fullBuild="true"
231	/>	223	/>
		224	<contentTypeBinding
		225	contentTypeId="org.eclipse.jst.jsp.core.jspsource">
		226	</contentTypeBinding>
		227	<contentTypeBinding
		228	contentTypeId="org.eclipse.jst.jsp.core.jspfragmentsource">
		229	</contentTypeBinding>
232	</validator>	230	</validator>
233	</extension>	231	</extension>
234		232

Added Link Here

(-)src/org/eclipse/jst/jsf/common/internal/JSPUtil.java (+62 lines)
1	package org.eclipse.jst.jsf.common.internal;
2
3	import org.eclipse.core.resources.IFile;
4	import org.eclipse.core.runtime.Platform;
5	import org.eclipse.core.runtime.content.IContentType;
6	import org.eclipse.core.runtime.content.IContentTypeManager;
7
8	/**
9	* Utility JSP methods
10	* @author cbateman
11	*
12	*/
13	public final class JSPUtil
14	{
15	private final static String CTYPE_JSPSOURCE =
16	"org.eclipse.jst.jsp.core.jspsource"; //$NON-NLS-1$
17	private final static String CTYPE_JSPFRAGMENTSOURCE =
18	"org.eclipse.jst.jsp.core.jspfragmentsource"; //$NON-NLS-1$
19	/**
20	* @param contentType
21	* @return true if contentType is one of the content types registered
22	* for JSP files
23	*/
24	public static boolean isJSPContentType(final String contentType)
25	{
26	return CTYPE_JSPSOURCE.equals(contentType)
27	\|\| CTYPE_JSPFRAGMENTSOURCE.equals(contentType);
28	}
29
30	/**
31	* @param file
32	* @return true if file is associated with a JSP or JSP fragment content type
33	*/
34	public static boolean isJSPContentType(final IFile file)
35	{
36	final IContentTypeManager typeManager = Platform.getContentTypeManager();
37	IContentType jspContentType =
38	typeManager.getContentType(CTYPE_JSPSOURCE);
39	if (jspContentType != null
40	&& jspContentType.isAssociatedWith(file.getName()))
41	{
42	return true;
43	}
44
45	jspContentType =
46	typeManager.getContentType(CTYPE_JSPFRAGMENTSOURCE);
47
48	// otherwise check if fragment
49	if (jspContentType != null
50	&& jspContentType.isAssociatedWith(file.getName()))
51	{
52	return true;
53	}
54
55	return false;
56	}
57
58	private JSPUtil()
59	{
60	// no instantiation
61	}
62	}

Lines 20-25 Link Here

(-)src/org/eclipse/jst/jsf/validation/el/tests/jsp/BeanPropertyResolutionTestCase.java (+11 lines)
20	super("/testdata/jsps/beanPropertyResolution.jsp.data", "/beanPropertyResolution.jsp", IJSFCoreConstants.FACET_VERSION_1_1,FACES_CONFIG_FILE_NAME_1_1);	20	super("/testdata/jsps/beanPropertyResolution.jsp.data", "/beanPropertyResolution.jsp", IJSFCoreConstants.FACET_VERSION_1_1,FACES_CONFIG_FILE_NAME_1_1);
21	}	21	}
22		22
		23	/**
		24	* Allow sub-classing for sensitivity analysis (i.e. different dest file extensions)
		25	*
		26	* @param srcFile
		27	* @param destFile
		28	*/
		29	protected BeanPropertyResolutionTestCase(final String srcFile, final String destFile)
		30	{
		31	super(srcFile,destFile, IJSFCoreConstants.FACET_VERSION_1_1,FACES_CONFIG_FILE_NAME_1_1);
		32	}
		33
23	protected void setUp() throws Exception	34	protected void setUp() throws Exception
24	{	35	{
25	super.setUp();	36	super.setUp();

Added Link Here

(-)src/org/eclipse/jst/jsf/validation/el/tests/jsp/ext/BeanPropertyResolutionTestCase_JSPXExt.java (+15 lines)
1	package org.eclipse.jst.jsf.validation.el.tests.jsp.ext;
2
3	import org.eclipse.jst.jsf.validation.el.tests.jsp.BeanPropertyResolutionTestCase;
4
5	/**
6	* Test cases for bean property resolution
7	*
8	* @author cbateman
9	*/
10	public class BeanPropertyResolutionTestCase_JSPXExt extends BeanPropertyResolutionTestCase
11	{
12	public BeanPropertyResolutionTestCase_JSPXExt() {
13	super("/testdata/jsps/beanPropertyResolution.jsp.data", "/beanPropertyResolution.jspx");
14	}
15	}

Lines 14-23 Link Here

(-)src/org/eclipse/jst/jsf/designtime/internal/jsp/StartupHandler.java (-11 / +2 lines)
14		14
15	import org.eclipse.core.resources.IFile;	15	import org.eclipse.core.resources.IFile;
16	import org.eclipse.core.runtime.IStatus;	16	import org.eclipse.core.runtime.IStatus;
17	import org.eclipse.core.runtime.Platform;
18	import org.eclipse.core.runtime.Status;	17	import org.eclipse.core.runtime.Status;
19	import org.eclipse.core.runtime.content.IContentType;	18	import org.eclipse.jst.jsf.common.internal.JSPUtil;
20	import org.eclipse.core.runtime.content.IContentTypeManager;
21	import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;	19	import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
22	import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils;	20	import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils;
23	import org.eclipse.ui.IEditorInput;	21	import org.eclipse.ui.IEditorInput;
Lines 142-155 Link Here
142		140
143	if (file != null)	141	if (file != null)
144	{	142	{
145	IContentTypeManager typeManager = Platform.getContentTypeManager();	143	return JSPUtil.isJSPContentType(file);
146	IContentType jspContentType =
147	typeManager.getContentType("org.eclipse.jst.jsp.core.jspsource"); //$NON-NLS-1$
148	if (jspContentType != null
149	&& jspContentType.isAssociatedWith(file.getName()))
150	{
151	return true;
152	}
153	}	144	}
154		145
155	return false;	146	return false;