Author: vrubezhny
Date: 2008-09-04 14:31:40 -0400 (Thu, 04 Sep 2008)
New Revision: 10068
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2420 Exception appears on
"<ctrl>+z" combination in jsp page.
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-09-04
18:17:00 UTC (rev 10067)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-09-04
18:31:40 UTC (rev 10068)
@@ -147,7 +147,10 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
Map<VpeTemplate, ModifyInfo> visualNodeMap = new HashMap<VpeTemplate,
ModifyInfo> ();
- VpeCreatorInfo creatorInfo = createVisualElement(pageContext, (Element)sourceNode,
visualDocument, null, visualNodeMap);
+ VpeCreatorInfo creatorInfo = null;
+ if (sourceNode instanceof Element) {
+ creatorInfo = createVisualElement(pageContext, (Element)sourceNode, visualDocument,
null, visualNodeMap);
+ }
nsIDOMElement newVisualElement = null;
if (creatorInfo != null) {
newVisualElement = (nsIDOMElement)creatorInfo.getVisualNode();
@@ -166,8 +169,9 @@
}
@Override
public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument
visualDocument, VpeCreationData creationdata) {
- validateVisualElement(pageContext, (Element)sourceNode, visualDocument, null,
creationdata.getNode()==null?null:
- (nsIDOMElement)(creationdata.getNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)),
(Map<VpeTemplate,ModifyInfo>)creationdata.getData());
+ if (sourceNode instanceof Element)
+ validateVisualElement(pageContext, (Element)sourceNode, visualDocument, null,
creationdata.getNode()==null?null:
+ (nsIDOMElement)(creationdata.getNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)),
(Map<VpeTemplate,ModifyInfo>)creationdata.getData());
}
@Override
public void setAttribute(VpePageContext pageContext, Element sourceElement,
nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name, String
value) {
@@ -179,7 +183,8 @@
}
@Override
public void beforeRemove(VpePageContext pageContext, Node sourceNode, nsIDOMNode
visualNode, Object data) {
- removeElement(pageContext, (Element)sourceNode, (Map<VpeTemplate,?>) data);
+ if (sourceNode instanceof Element)
+ removeElement(pageContext, (Element)sourceNode, (Map<VpeTemplate,?>) data);
}
@Override
public boolean isChildren() {