[jbosstools-commits] JBoss Tools SVN: r31113 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline.

[jbosstools-commits at lists.jboss.org]

Author: dgolovin
Date: 2011-05-05 16:02:31 -0400 (Thu, 05 May 2011)
New Revision: 31113

Modified:
   trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
Log:
https://issues.jboss.org/browse/JBIDE-8864 NullPointerExceptopn occurs after removing tag from source in HTML Visual Editor
fixed

Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java	2011-05-05 19:14:48 UTC (rev 31112)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPPropertySourceAdapter.java	2011-05-05 20:02:31 UTC (rev 31113)
@@ -107,8 +107,8 @@
 	}
 	
 	public void setTarget(INodeNotifier target) {
-		if(fNode == target) return;
 		fNode = (target instanceof Node) ? (Node) target : null;
+
 		if (fNode instanceof IDOMNode) {
 			Document ownerDocument = fNode.getOwnerDocument();
 			if (ownerDocument == null && fNode instanceof Document) {
@@ -120,12 +120,15 @@
 				fCaseSensitive = adapter.getTagNameCase() == DocumentTypeAdapter.STRICT_CASE;
 			offset = ((IDOMNode)fNode).getStartOffset() + ("" + fNode.getNodeName()).length(); //$NON-NLS-1$
 		}
-		processor = valueHelper.isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor();
-		processor.createContext(getTextViewer(), offset);
-        pageContext = processor.getContext();
-		kbQuery = createKbQuery(processor);
-		kbQuery.setMask(true); 
-		kbQueryAttr = createKbQuery(processor);
+
+		if(fNode instanceof Node) {
+			processor = valueHelper.isFacetets() ? new FaceletPageContectAssistProcessor() : new JspContentAssistProcessor();
+			processor.createContext(getTextViewer(), offset);
+			pageContext = processor.getContext();
+			kbQuery = createKbQuery(processor);
+			kbQuery.setMask(true); 
+			kbQueryAttr = createKbQuery(processor);
+		}
 	}
 	
 	//TODO move to helper