[jbosstools-commits] JBoss Tools SVN: r9797 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor and 4 other directories.

Author: mareshkau Date: 2008-08-19 10:00:46 -0400 (Tue, 19 Aug 2008) New Revision: 9797 Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionException.java Removed: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 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/template/VpeAbstractCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAttributeCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeElementCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlPseudoContentCreator.java 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/VpeIncludeTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLabeledFormCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateConditionSet.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAndOperation.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeEqualOperation.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpression.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunction.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionAttrPresent.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasInParents.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionIif.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsfValue.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionNot.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentAttrValue.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeOrOperation.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpePlusOperation.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeValue.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml Log: JBIDE-1280 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -68,9 +68,8 @@ public static void reportProblem(Exception throwable) { if (VpeDebug.USE_PRINT_STACK_TRACE) { throwable.printStackTrace(); - } else { - ProblemReportingHelper.reportProblem(PLUGIN_ID, throwable); - } + } + ProblemReportingHelper.reportProblem(PLUGIN_ID, throwable); } public String getResourcePath(String resourceName) { 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 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -67,6 +67,7 @@ import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.template.VpeToggableTemplate; import org.jboss.tools.vpe.editor.template.dnd.VpeDnd; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.util.ElService; import org.jboss.tools.vpe.editor.util.FaceletUtil; import org.jboss.tools.vpe.editor.util.HTML; @@ -440,7 +441,7 @@ VpeTemplate defTemplate = templateManager.getDefTemplate(); creationData = defTemplate.create(getPageContext(), sourceNode, getVisualDocument()); - } + } getPageContext().setCurrentVisualNode(null); @@ -770,9 +771,14 @@ containerTemplate.setPseudoContent(pageContext, sourceContainer, visualContainer, visualDocument); } else { - VpeDefaultPseudoContentCreator.getInstance().setPseudoContent( - pageContext, sourceContainer, visualContainer, - visualDocument); + try { + VpeDefaultPseudoContentCreator.getInstance().setPseudoContent( + pageContext, sourceContainer, visualContainer, + visualDocument); + } catch (VpeExpressionException ex) { + VpeExpressionException exception = new VpeExpressionException("Error for source node"+sourceContainer.toString(),ex); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + } } // if (isEmptyElement(visualContainer)) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -15,6 +15,7 @@ import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -35,7 +36,7 @@ * @param visualNodeMap Is used for a storage padding information. * @return The information on the created node of the visual tree. */ - public abstract VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap); + public abstract VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap)throws VpeExpressionException ; /** * Is invoked after construction of all child nodes of the current visual node. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -33,6 +33,7 @@ import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; import org.jboss.tools.vpe.editor.template.dnd.VpeDnd; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.resize.VpeResizer; import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData; import org.jboss.tools.vpe.editor.util.ElService; @@ -1245,6 +1246,7 @@ public void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) { + try{ if (pseudoContentCreator != null) { pseudoContentCreator.setPseudoContent(pageContext, sourceContainer, visualContainer, visualDocument); @@ -1253,6 +1255,11 @@ pageContext, sourceContainer, visualContainer, visualDocument); } + } catch (VpeExpressionException ex) { + + VpeExpressionException exception = new VpeExpressionException(sourceContainer+" ",ex); + VpePlugin.reportProblem(exception); + } } /** Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -21,6 +21,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -185,7 +186,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); VpeCreatorInfo creatorInfo = new VpeCreatorInfo(div); @@ -224,7 +225,7 @@ return creatorInfo; } - private void setStyles(VpePageContext pageContext, Node sourceNode, nsIDOMElement div, nsIDOMElement span) { + private void setStyles(VpePageContext pageContext, Node sourceNode, nsIDOMElement div, nsIDOMElement span) throws VpeExpressionException { boolean display = true; boolean displayBlock = true; @@ -289,9 +290,16 @@ private String getExprValue(VpePageContext pageContext, VpeExpression expr, Node sourceNode) { String value; if (expr != null) { - value = expr.exec(pageContext, sourceNode).stringValue(); + try { + value = expr.exec(pageContext, sourceNode).stringValue(); + } catch (VpeExpressionException e) { + + VpeExpressionException exception = new VpeExpressionException(sourceNode.toString()+" "+expr.toString(),e); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + value=""; //$NON-NLS-1$ + } } else { - value = ""; + value = ""; //$NON-NLS-1$ } return value; } @@ -300,7 +308,12 @@ Object elements = visualNodeMap.get(this); if (elements != null && elements instanceof VisualElements) { VisualElements o = (VisualElements)elements; - setStyles(pageContext, sourceElement, o.div, o.span); + try { + setStyles(pageContext, sourceElement, o.div, o.span); + } catch (VpeExpressionException e) { + VpeExpressionException exception = new VpeExpressionException(sourceElement.toString()+" "+name+" "+value,e); //$NON-NLS-1$ //$NON-NLS-2$ + VpePlugin.reportProblem(exception) ; + } } } @@ -308,7 +321,12 @@ Object elements = visualNodeMap.get(this); if (elements != null && elements instanceof VisualElements) { VisualElements o = (VisualElements)elements; - setStyles(pageContext, sourceElement, o.div, o.span); + try { + setStyles(pageContext, sourceElement, o.div, o.span); + } catch (VpeExpressionException e) { + VpeExpressionException exception = new VpeExpressionException(sourceElement.toString()+" "+name,e); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAttributeCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAttributeCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAttributeCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.mozilla.interfaces.nsIDOMAttr; @@ -46,7 +47,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { if (expression != null) { if (visualNodeMap != null) { @@ -71,6 +72,7 @@ } private void setValue(VpePageContext pageContext, Element sourceElement, Map visualNodeMap) { + try{ if (expression != null) { nsIDOMElement visualElement = (nsIDOMElement) visualNodeMap.get(this); VpeValue vpeValue = expression.exec(pageContext, sourceElement); @@ -80,5 +82,9 @@ visualElement.removeAttribute(this.name); } } + } catch(VpeExpressionException ex) { + VpeExpressionException exception = new VpeExpressionException(sourceElement.toString()+" "+expression.toString(),ex); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -88,7 +89,7 @@ public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, - Map visualNodeMap) { + Map visualNodeMap) throws VpeExpressionException { nsIDOMElement visualNewElement = visualDocument .createElement(sourceNode.getNodeName()); visualNodeMap.put(this, visualNewElement); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -15,6 +15,7 @@ import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -35,7 +36,7 @@ * @param visualNodeMap Is used for a storage padding information. * @return The information on the created node of the visual tree. */ - VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map<VpeTemplate,?> visualNodeMap); + VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map<VpeTemplate,?> visualNodeMap) throws VpeExpressionException ; /** * Is invoked after construction of all child nodes of the current visual node. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -22,6 +22,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMAttr; @@ -145,9 +146,10 @@ } + @Override public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, - Map visualNodeMap) { + Map visualNodeMap) throws VpeExpressionException { SourceDataTableElements sourceElements = new SourceDataTableElements( sourceNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeElementCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeElementCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeElementCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -22,6 +22,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.mozilla.interfaces.nsIDOMDocument; @@ -49,7 +50,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { if (expression != null) { visualNodeMap.put(this, visualElement); VpeValue vpeValue = expression.exec(pageContext, sourceNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -20,6 +20,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -83,7 +84,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { boolean layoutHorizontal = true; if (layoutExpr != null) { VpeValue vpeValue = layoutExpr.exec(pageContext, sourceNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -15,6 +15,7 @@ import java.util.Map; import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -78,7 +79,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { nsIDOMElement visualNewElement = visualDocument.createElement(name); if (attrs != null) { for (int i = 0; i < attrs.length; i++) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlPseudoContentCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlPseudoContentCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlPseudoContentCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -14,6 +14,7 @@ import java.util.List; import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -65,7 +66,8 @@ } } - public void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) { + @Override + public void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) throws VpeExpressionException { nsIDOMElement visualNewElement = visualDocument.createElement(name); setPseudoAttribute(visualNewElement); if (attrs != null) { 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-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -22,6 +22,7 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.selection.VpeSourceSelection; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -189,8 +190,14 @@ if (creator == null) { return null; } - - VpeCreatorInfo elementInfo = creator.create(pageContext, sourceElement, visualDocument, visualParent, visualNodeMap); + VpeCreatorInfo elementInfo =null; + try { + elementInfo = creator.create(pageContext, sourceElement, visualDocument, visualParent, visualNodeMap); + } catch(VpeExpressionException ex) { + + VpeExpressionException exception = new VpeExpressionException("Exception on processing node "+sourceElement.toString(), ex); //$NON-NLS-1$ + VpePlugin.reportProblem(exception); + } if (elementInfo != null) { nsIDOMElement visualElement = (nsIDOMElement)elementInfo.getVisualNode(); if (visualElement != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -18,6 +18,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.FileUtil; import org.jboss.tools.vpe.editor.util.HTML; @@ -31,9 +32,10 @@ import org.w3c.dom.NodeList; public class VpeIncludeTemplate extends VpeAbstractTemplate { - private static final String ATTR_FILE = "file"; + private static final String ATTR_FILE = "file"; //$NON-NLS-1$ private VpeExpression fileNameExpression; + @Override protected void init(Element templateElement) { modify = false; Attr fileAttr = ((Element)templateElement).getAttributeNode(ATTR_FILE); @@ -50,7 +52,9 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { String fileName = null; if (fileNameExpression != null) { - VpeValue vpeValue = fileNameExpression.exec(pageContext, sourceNode); + VpeValue vpeValue; + try { + vpeValue = fileNameExpression.exec(pageContext, sourceNode); if (vpeValue != null && vpeValue.stringValue().length() > 0) { fileName = vpeValue.stringValue(); VpeIncludeInfo info = pageContext.getVisualBuilder().getCurrentIncludeInfo(); @@ -76,6 +80,11 @@ } } } + } catch (VpeExpressionException e) { + VpeExpressionException exception = new VpeExpressionException( + sourceNode.toString(),e); + VpePlugin.reportProblem(exception); + } } VpeCreationData creationData = createStub(fileName, visualDocument); @@ -131,9 +140,15 @@ public void openIncludeEditor(VpePageContext pageContext, Element sourceElement, Object data) { if (sourceElement != null && fileNameExpression != null) { - VpeValue vpeValue = fileNameExpression.exec(pageContext, sourceElement); - if (vpeValue != null && vpeValue.stringValue().length() > 0) { - pageContext.openIncludeFile(vpeValue.stringValue()); + VpeValue vpeValue; + try { + vpeValue = fileNameExpression.exec(pageContext, sourceElement); + if (vpeValue != null && vpeValue.stringValue().length() > 0) { + pageContext.openIncludeFile(vpeValue.stringValue()); + } + } catch (VpeExpressionException e) { + + VpePlugin.reportProblem(e); } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLabeledFormCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLabeledFormCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLabeledFormCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -20,6 +20,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -78,7 +79,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { String labelAttrName = VpeTemplateManager.ATTR_LABELED_FORM_DEFAULT_LABEL; if (labelNameExpr != null) { VpeValue vpeValue = labelNameExpr.exec(pageContext, sourceNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -18,6 +18,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -112,9 +113,14 @@ private String getExprValue(VpePageContext pageContext, VpeExpression expr, Node sourceNode) { String value; if (expr != null) { - value = expr.exec(pageContext, sourceNode).stringValue(); + try { + value = expr.exec(pageContext, sourceNode).stringValue(); + } catch (VpeExpressionException ex) { + VpePlugin.reportProblem(ex); + value=""; //$NON-NLS-1$ + } } else { - value = ""; + value = ""; //$NON-NLS-1$ } return value; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -26,6 +26,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -78,7 +79,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { String strValue=null; int listSize = 0; if (layoutExpr != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -19,6 +19,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.HTML; @@ -188,7 +189,7 @@ public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, - Map visualNodeMap) { + Map visualNodeMap) throws VpeExpressionException { int tableSize = 1; if (tableSizeExpr != null) { VpeValue vpeValue = tableSizeExpr.exec(pageContext, sourceNode); @@ -417,7 +418,7 @@ } private List getClasses(VpeExpression expression, Node sourceNode, - VpePageContext pageContext) { + VpePageContext pageContext) throws VpeExpressionException { List b = new ArrayList(); if (expression != null && sourceNode != null) { String classes = expression.exec(pageContext, sourceNode) @@ -435,7 +436,7 @@ private void makeSpecial(Node header, nsIDOMElement visualHead, nsIDOMDocument visualDocument, int tableSize, VpeCreatorInfo creatorInfo, String cellTag, - VpeExpression headerClassExpr, VpePageContext pageContext) { + VpeExpression headerClassExpr, VpePageContext pageContext) throws VpeExpressionException { if (header != null && visualHead != null) { nsIDOMElement visualRow = visualDocument.createElement(HTML.TAG_TR); visualHead.appendChild(visualRow); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -11,6 +11,7 @@ package org.jboss.tools.vpe.editor.template; import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -20,7 +21,7 @@ public abstract class VpePseudoContentCreator { private static final String PSEUDO_CONTENT_ATTR = "vpe:pseudo-element"; - public abstract void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument); + public abstract void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) throws VpeExpressionException; public static void setPseudoAttribute(nsIDOMElement visualPseudoElement) { visualPseudoElement.setAttribute(PSEUDO_CONTENT_ATTR, "yes"); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateConditionSet.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateConditionSet.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateConditionSet.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -19,6 +19,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; @@ -54,10 +55,17 @@ if (expression == null) { return false; } - VpeValue value = expression.exec(pageContext, sourceNode); - if (value == null) { + try { + VpeValue value = expression.exec(pageContext, sourceNode); + + if (value == null) { + return false; + } + return value.booleanValue(); + } catch (VpeExpressionException e) { + + VpePlugin.reportProblem(e); return false; } - return value.booleanValue(); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -18,6 +18,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -28,7 +29,7 @@ import org.w3c.dom.Node; public class VpeValueCreator extends VpeAbstractCreator implements VpeOutputAttributes { - public static final String SIGNATURE_VPE_VALUE = ":vpe:value"; + public static final String SIGNATURE_VPE_VALUE = ":vpe:value"; //$NON-NLS-1$ private VpeExpression expression; private String outputAttrName; @@ -51,7 +52,7 @@ } } - public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { + public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) throws VpeExpressionException { String value; if (expression != null) { value = expression.exec(pageContext, sourceNode).stringValue(); @@ -78,9 +79,14 @@ private void setValue(VpePageContext pageContext, Element sourceElement, Map<?,?> visualNodeMap) { String value; if (expression != null) { - value = expression.exec(pageContext, sourceElement).stringValue(); + try { + value = expression.exec(pageContext, sourceElement).stringValue(); + } catch (VpeExpressionException ex) { + VpePlugin.reportProblem(ex); + value=""; //$NON-NLS-1$ + } } else { - value = ""; + value = ""; //$NON-NLS-1$ } nsIDOMNode valueNode = (nsIDOMNode) visualNodeMap.get(this); valueNode.setNodeValue(value); @@ -110,8 +116,14 @@ public boolean isEditabledAtribute(VpePageContext pageContext, Element sourceElement, Map visualNodeMap) { if (outputAttrName != null && expression != null) { String attrValue = sourceElement.getAttribute(outputAttrName); - String exprValue = expression.exec(pageContext, sourceElement).stringValue(); - return exprValue.equals(attrValue); + String exprValue; + try { + exprValue = expression.exec(pageContext, sourceElement).stringValue(); + return exprValue.equals(attrValue); + } catch (VpeExpressionException ex) { + VpePlugin.reportProblem(ex); + } + } return false; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeVisualLinkCreator.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMDocument; @@ -113,7 +114,7 @@ } public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, - Map visualNodeMap) { + Map visualNodeMap) throws VpeExpressionException { nsIDOMElement a = visualDocument.createElement(HTML.TAG_A); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAndOperation.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAndOperation.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAndOperation.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,11 +16,12 @@ public class VpeAndOperation extends VpeOperation { + @Override int getPriority() { return PRIORITY_OPERATION_AND; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { VpeValue leftValue = getLeftOperand().exec(pageContext, sourceNode); VpeValue rightValue = getRightOperand().exec(pageContext, sourceNode); return leftValue.and(rightValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -21,9 +21,9 @@ this.expressions = expressions; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { if (expressions == null) { - return new VpeValue(""); + return new VpeValue(""); //$NON-NLS-1$ } StringBuffer result = new StringBuffer(); for (int i = 0; i < expressions.length; i++) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeEqualOperation.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeEqualOperation.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeEqualOperation.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,11 +16,12 @@ public class VpeEqualOperation extends VpeOperation { + @Override int getPriority() { return PRIORITY_OPERATION_EQUAL; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { VpeValue leftValue = getLeftOperand().exec(pageContext, sourceNode); VpeValue rightValue = getRightOperand().exec(pageContext, sourceNode); return leftValue.equal(rightValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpression.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpression.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpression.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -15,5 +15,5 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; public interface VpeExpression { - VpeValue exec(VpePageContext pageContext, Node sourceNode); + VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException; } Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.editor.template.expression; - -public class VpeExpressionError extends Error { - - VpeExpressionError(String message) { - super(message); - } -} Copied: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionException.java (from rev 9737, trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionError.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionException.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeExpressionException.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.editor.template.expression; +/** + * + * Expression parsing Exception + * + */ +public class VpeExpressionException extends Exception { + + private static final long serialVersionUID = 3620963302559253556L; + + public VpeExpressionException(String message) { + super(message); + } + + public VpeExpressionException(String message, Throwable throwable) { + super(message, throwable); + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunction.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunction.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunction.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -24,13 +24,14 @@ this.paramertes = paramertes; } + @Override int getPriority() { return PRIORITY_OPERAND; } - VpeOperand getParameter(int index) { + VpeOperand getParameter(int index) throws VpeExpressionException { if (paramertes == null || paramertes.length < index) { - throw new VpeExpressionError(ERROR_PARAMETER_INCORRECT); + throw new VpeExpressionException(ERROR_PARAMETER_INCORRECT); } return paramertes[index]; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionAttrPresent.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionAttrPresent.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionAttrPresent.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,7 +17,7 @@ public class VpeFunctionAttrPresent extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { boolean present = false; NamedNodeMap attrs = sourceNode.getAttributes(); if (attrs != null) { @@ -30,6 +30,7 @@ return new VpeValue(present); } + @Override String[] getSignatures() { return new String[] {VpeExpressionBuilder.SIGNATURE_ANY_ATTR}; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasInParents.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasInParents.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHasInParents.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -20,7 +20,7 @@ public class VpeFunctionHasInParents extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String prm = getParameter(0).exec(pageContext, sourceNode) .stringValue(); Node parentNode = sourceNode.getParentNode(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -21,15 +21,18 @@ import org.jboss.tools.vpe.editor.context.VpePageContext; public class VpeFunctionHref extends VpeFunctionSrc { - protected String getUnresolved() { + @Override + protected String getUnresolved() { return ""; //$NON-NLS-1$ } - String[] getSignatures() { + @Override + String[] getSignatures() { return new String[] {VpeExpressionBuilder.SIGNATURE_ANY_ATTR}; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + @Override + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String tagValue = getParameter(0).exec(pageContext, sourceNode).stringValue(); tagValue = resolveEL(pageContext,tagValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionIif.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionIif.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionIif.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,7 +16,7 @@ public class VpeFunctionIif extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { if (getParameter(0).exec(pageContext, sourceNode).booleanValue()) { return getParameter(1).exec(pageContext, sourceNode); } else { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsfValue.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsfValue.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsfValue.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -18,7 +18,7 @@ public class VpeFunctionJsfValue extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String value = getParameter(0).exec(pageContext, sourceNode).stringValue(); BundleMap bundle = pageContext.getBundle(); int offset = pageContext.getVisualBuilder().getCurrentMainIncludeOffset(); @@ -27,6 +27,7 @@ return new VpeValue(jsfValue != null ? jsfValue : value); } + @Override String[] getSignatures() { return new String[] {VpeExpressionBuilder.SIGNATURE_JSF_VALUE}; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionNot.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionNot.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionNot.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,7 +16,7 @@ public class VpeFunctionNot extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { return getParameter(0).exec(pageContext, sourceNode).not(); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentAttrValue.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentAttrValue.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentAttrValue.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,8 +16,8 @@ public class VpeFunctionParentAttrValue extends VpeFunction { - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { - String prm = getParameter(0).exec(pageContext, sourceNode).stringValue(); + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { + Node parentNode = sourceNode.getParentNode(); if (parentNode != null) { String a = getParameter(0).exec(pageContext, parentNode).stringValue(); @@ -26,6 +26,6 @@ return new VpeValue(attr.getNodeValue()); } } - return new VpeValue(""); + return new VpeValue(""); //$NON-NLS-1$ } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -43,7 +43,7 @@ static final String IMG_UNRESOLVED = "unresolved.gif"; //$NON-NLS-1$ static final String IMG_PREFIX = "file:///"; //$NON-NLS-1$ - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { String tagValue = getParameter(0).exec(pageContext, sourceNode) .stringValue(); tagValue = resolveEL(pageContext,tagValue); @@ -186,8 +186,8 @@ return IMG_PREFIX; } - String processValue(VpePageContext pageContext, Node sourceNode, - String tagValue) { + private String processValue(VpePageContext pageContext, Node sourceNode, + String tagValue) throws VpeExpressionException { String attrName = null; if (getParameter(0) instanceof VpeAttributeOperand) { attrName = ((VpeAttributeOperand) getParameter(0)).getAttributeName(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -69,7 +69,7 @@ private static final String MAX_VERSION_KEYWORD="max";//$NON-NLS-1$ - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { //gets function parameter String tagValue = getParameter(0).exec(pageContext, sourceNode) Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeOrOperation.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeOrOperation.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeOrOperation.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,11 +16,12 @@ public class VpeOrOperation extends VpeOperation { + @Override int getPriority() { return PRIORITY_OPERATION_OR; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { VpeValue leftValue = getLeftOperand().exec(pageContext, sourceNode); VpeValue rightValue = getRightOperand().exec(pageContext, sourceNode); return leftValue.or(rightValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpePlusOperation.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpePlusOperation.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpePlusOperation.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -16,11 +16,12 @@ public class VpePlusOperation extends VpeOperation { + @Override int getPriority() { return PRIORITY_OPERATION_PLUS; } - public VpeValue exec(VpePageContext pageContext, Node sourceNode) { + public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException { VpeValue leftValue = getLeftOperand().exec(pageContext, sourceNode); VpeValue rightValue = getRightOperand().exec(pageContext, sourceNode); return leftValue.plus(rightValue); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeValue.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeValue.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeValue.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -37,11 +37,11 @@ return type; } - public boolean booleanValue() { + public boolean booleanValue() throws VpeExpressionException { if (type == BOOLEAN_VALUE) { return booleanValue; } else { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -56,9 +56,9 @@ } } - VpeValue equal(VpeValue other) { + VpeValue equal(VpeValue other) throws VpeExpressionException { if (type != other.type()) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$//$NON-NLS-2$ } boolean value; switch (type) { @@ -75,31 +75,31 @@ return new VpeValue(value); } - VpeValue not() { + VpeValue not() throws VpeExpressionException{ if (type != BOOLEAN_VALUE) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$//$NON-NLS-2$ } return new VpeValue(!booleanValue); } - VpeValue and(VpeValue other) { + VpeValue and(VpeValue other) throws VpeExpressionException { if (type != BOOLEAN_VALUE || other.type() != BOOLEAN_VALUE) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$ //$NON-NLS-2$ } return new VpeValue(booleanValue && other.booleanValue()); } - VpeValue or(VpeValue other) { + VpeValue or(VpeValue other) throws VpeExpressionException{ if (type != BOOLEAN_VALUE || other.type() != BOOLEAN_VALUE) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$ //$NON-NLS-2$ } return new VpeValue(booleanValue || other.booleanValue()); } - VpeValue plus(VpeValue other) { + VpeValue plus(VpeValue other) throws VpeExpressionException{ if (type != STRING_VALUE || other.type() != STRING_VALUE) { - throw new VpeExpressionError(ERROR_TYPE_CONVERSION); + throw new VpeExpressionException(ERROR_TYPE_CONVERSION+" for["+stringValue+"]"); //$NON-NLS-1$//$NON-NLS-2$ } return new VpeValue(stringValue + other.stringValue()); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java 2008-08-19 14:00:46 UTC (rev 9797) @@ -17,6 +17,7 @@ import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionInfo; import org.jboss.tools.vpe.editor.template.expression.VpeValue; import org.jboss.tools.vpe.editor.util.SourceDomUtil; @@ -139,6 +140,9 @@ }catch(VpeExpressionBuilderException ex){ VpePlugin.reportProblem(ex); resizeData = resizeData.getNext(); + } catch (VpeExpressionException ex) { + VpePlugin.reportProblem(ex); + resizeData = resizeData.getNext(); } }else{ setSize(resizeData, sourceElement, absolute, position, size); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml 2008-08-19 13:10:25 UTC (rev 9796) +++ trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml 2008-08-19 14:00:46 UTC (rev 9797) @@ -1,4 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> - <vpe:templates> + <vpe:tag case-sensitive="no" name=""> + <vpe:template children="no" modify="no"> + <vpe:any background-color="blue" border="yes" border-color="white" + display="tag-name1" icon="yes" value="tag-value" + value-background-color="green" value-color="red"/> + </vpe:template> + </vpe:tag> + <vpe:tag case-sensitive="no" name=""> + <vpe:template children="no" modify="no"> + <vpe:any background-color="blue" border="yes" border-color="white" + display="tag-name2" icon="yes" value="tag-value" + value-background-color="green" value-color="red"/> + </vpe:template> + </vpe:tag> </vpe:templates>