Author: dmaliarevich Date: 2012-02-15 04:36:25 -0500 (Wed, 15 Feb 2012) New Revision: 38739 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java Log: https://issues.jboss.org/browse/JBIDE-9790 - instanceOf check was added. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2012-02-15 07:48:04 UTC (rev 38738) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2012-02-15 09:36:25 UTC (rev 38739) @@ -914,9 +914,13 @@ } Element sourceElement = (Element) sourceNode; - VpeElementMapping elementMapping = (VpeElementMapping) domMapping - .getNodeMapping(sourceElement); - if (elementMapping != null) { + VpeElementMapping elementMapping = (VpeElementMapping) + domMapping.getNodeMapping(sourceElement); + /* + * https://issues.jboss.org/browse/JBIDE-9790 + */ + if ((elementMapping != null) && + (elementMapping.getTemplate() instanceof VpeTemplateSafeWrapper)) { VpeToggableTemplate toggableTemplate = (VpeToggableTemplate) ((VpeTemplateSafeWrapper) elementMapping.getTemplate()).getAdapter(VpeToggableTemplate.class); if (toggableTemplate != null) { @@ -979,7 +983,7 @@ ? sourceNode : sourceNode.getParentNode()); /* - * Fixes JBIDE-1823 author dmaliarevich + * Fixes JBIDE-1823 * Template is looked according to <code>selectedElem</code> * so <code>toggleLookupAttr</code> should be retrieved * from this element @@ -990,27 +994,36 @@ if (attr != null) { toggleLookup = "true".equalsIgnoreCase(attr.getNodeValue()); //$NON-NLS-1$ } - } - // end of fix + } // end of fix JBIDE-1823 if (elementMapping != null) { - VpeToggableTemplate toggableTemplate = (VpeToggableTemplate) ((VpeTemplateSafeWrapper) - elementMapping.getTemplate()).getAdapter(VpeToggableTemplate.class); + VpeToggableTemplate toggableTemplate = null; + /* + * https://issues.jboss.org/browse/JBIDE-9790 + */ + if (elementMapping.getTemplate() instanceof VpeTemplateSafeWrapper) { + toggableTemplate = (VpeToggableTemplate) ((VpeTemplateSafeWrapper) + elementMapping.getTemplate()).getAdapter(VpeToggableTemplate.class); + } // End of fix JBIDE-9790 while (toggleLookup && (sourceElement != null) && (toggableTemplate == null)) { sourceElement = (Element) sourceElement.getParentNode(); if (sourceElement == null) { break; } - // Fixes JBIDE-1823 author dmaliarevich + // Fixes JBIDE-1823 nodeMapping = domMapping.getNodeMapping(sourceElement); if (nodeMapping instanceof VpeElementMapping) { elementMapping = (VpeElementMapping) nodeMapping; - } - // end of fix + } // end of fix JBIDE-1823 if (elementMapping == null) { continue; } - toggableTemplate = (VpeToggableTemplate) ((VpeTemplateSafeWrapper) - elementMapping.getTemplate()).getAdapter(VpeToggableTemplate.class); + /* + * https://issues.jboss.org/browse/JBIDE-9790 + */ + if (elementMapping.getTemplate() instanceof VpeTemplateSafeWrapper) { + toggableTemplate = (VpeToggableTemplate) ((VpeTemplateSafeWrapper) + elementMapping.getTemplate()).getAdapter(VpeToggableTemplate.class); + } // End of fix JBIDE-9790 } if (toggableTemplate != null) { toggableTemplate.toggle(this, sourceElement, toggleId);