Author: vrubezhny
Date: 2009-08-18 11:29:28 -0400 (Tue, 18 Aug 2009)
New Revision: 17132
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
Log:
JBIDE-4757: NPE when try to open xhtml page from jar file
Issue is fixed
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-08-18
14:35:58 UTC (rev 17131)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-08-18
15:29:28 UTC (rev 17132)
@@ -15,6 +15,7 @@
import java.util.Map;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.contentassist.IContextInformation;
@@ -142,9 +143,13 @@
if (nameSpaces == null || nameSpaces.isEmpty())
return EMPTY_LIBRARIES;
+ IProject project = context.getResource() == null ? null :
context.getResource().getProject();
+ if (project == null)
+ return EMPTY_LIBRARIES;
+
List<ITagLibrary> tagLibraries = new ArrayList<ITagLibrary>();
for (INameSpace nameSpace : nameSpaces.values()) {
- ITagLibrary[] libs =
TagLibriryManager.getLibraries(context.getResource().getProject(), nameSpace.getURI());
+ ITagLibrary[] libs = TagLibriryManager.getLibraries(project, nameSpace.getURI());
if (libs != null && libs.length > 0) {
for (ITagLibrary lib : libs) {
tagLibraries.add(lib);
Show replies by date