JsSearchDocument ---> Try to open 'Existing' Model, then open model for read.
Util.java --> Remove null ContentTypes from returned value in utility method when JSP content type not defined.
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java
index 5c87877..3ffdd78 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/java/search/JsSearchDocument.java
@@ -125,7 +125,9 @@
// get existing model for read, then get document from it
IModelManager modelManager = StructuredModelManager.getModelManager();
if (modelManager != null) {
- model = modelManager.getModelForRead(jspFile);
+ model = modelManager.getExistingModelForRead(jspFile);
+ if(model==null)
+ model = modelManager.getModelForRead(jspFile);
}
// handle unsupported
if (model instanceof IDOMModel) {
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java
index 16a3eaf..a1ca656 100644
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java
+++ b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java
@@ -32,13 +32,14 @@
public static IContentType[] getJavascriptContentTypes() {
String[] contentTypeIds = ContentTypeIdForEmbededJs.ContentTypeIds;
- IContentType[] fContentTypes = new IContentType[contentTypeIds.length];
+ ArrayList fContentTypes = new ArrayList();
for(int i = 0;i<contentTypeIds.length;i++) {
- fContentTypes[i] = Platform.getContentTypeManager().getContentType(contentTypeIds[i]);
+ IContentType ct = Platform.getContentTypeManager().getContentType(contentTypeIds[i]);
+ if(ct!=null) fContentTypes.add(ct);
}
- return fContentTypes;
+ return (IContentType[])fContentTypes.toArray(new IContentType[fContentTypes.size()]);
}
}