[jbosstools-commits] JBoss Tools SVN: r6822 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf: src/org/jboss/tools/jsf/vpe/jsf/template and 2 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Mon Mar 10 14:59:27 EDT 2008


Author: dsakovich
Date: 2008-03-10 14:59:27 -0400 (Mon, 10 Mar 2008)
New Revision: 6822

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/JsfTemplatePlugin.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputLabelTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/ComponentUtil.java
   trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
Log:
Code adjustment http://jira.jboss.org/jira/browse/JBIDE-1720

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/JsfTemplatePlugin.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/JsfTemplatePlugin.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/JsfTemplatePlugin.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -1,6 +1,11 @@
 package org.jboss.tools.jsf.vpe.jsf;
 
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
 import org.jboss.tools.common.log.BaseUIPlugin;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -13,7 +18,7 @@
 
 	// The shared instance
 	private static JsfTemplatePlugin plugin;
-	
+
 	/**
 	 * The constructor
 	 */
@@ -22,6 +27,7 @@
 
 	/*
 	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
 	public void start(BundleContext context) throws Exception {
@@ -31,6 +37,7 @@
 
 	/*
 	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
 	public void stop(BundleContext context) throws Exception {
@@ -40,7 +47,7 @@
 
 	/**
 	 * Returns the shared instance
-	 *
+	 * 
 	 * @return the shared instance
 	 */
 	public static JsfTemplatePlugin getDefault() {

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/AbstractOutputJsfTemplate.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -47,36 +47,6 @@
 	}
 
 	/**
-	 * get bundle
-	 * 
-	 * @param pageContext
-	 * @param attr
-	 * @return
-	 */
-	protected String getBundleValue(VpePageContext pageContext, Attr attr) {
-
-		return getBundleValue(pageContext, attr.getNodeValue(),
-				((IDOMAttr) attr).getValueRegionStartOffset());
-
-	}
-
-	/**
-	 * 
-	 * @param pageContext
-	 * @param value
-	 * @param offfset
-	 * @return
-	 */
-	protected String getBundleValue(VpePageContext pageContext, String value,
-			int offfset) {
-
-		BundleMap bundle = pageContext.getBundle();
-
-		return bundle.getBundleValue(value, offfset);
-
-	}
-
-	/**
 	 * copy outputAttributes
 	 * 
 	 * @param visualElement

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -1,15 +1,16 @@
 /*******************************************************************************
-  * Copyright (c) 2007-2008 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
-  *
-  * Contributor:
-  *     Red Hat, Inc. - initial API and implementation
-  ******************************************************************************/
+ * Copyright (c) 2007-2008 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
+ *
+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
 package org.jboss.tools.jsf.vpe.jsf.template;
 
+import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
 import org.jboss.tools.jsf.vpe.jsf.template.util.NodeProxyUtil;
 import org.jboss.tools.vpe.editor.VpeSourceDomBuilder;
 import org.jboss.tools.vpe.editor.context.VpePageContext;
@@ -19,6 +20,7 @@
 import org.jboss.tools.vpe.editor.util.HTML;
 import org.mozilla.interfaces.nsIDOMDocument;
 import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMText;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -26,47 +28,54 @@
 
 /**
  * @author dmaliarevich
- *
+ * 
  */
 public class JsfOptionSelectItemTemplate extends VpeAbstractTemplate {
 
+	public static final String ITEM_DISABLED = "itemDisabled";
+
 	private static final String CLASS = "class";
 	private static final String ITEM_LABEL = "itemLabel";
-	
+
 	private static final String DISABLED = "disabled";
 	private static final String ENABLED_CLASS = "enabledClass";
 	private static final String DISABLED_CLASS = "disabledClass";
-	
+
 	/* "escape" attribute of f:selectItem */
 	private static final String ESCAPE = "escape";
-	
+
 	private String escape;
 	private String disabled;
 	private String enabledClass;
 	private String disabledClass;
-	
+
 	/**
 	 * 
 	 */
 	public JsfOptionSelectItemTemplate() {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext,
+	 *      org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
 	 */
 	public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
 			nsIDOMDocument visualDocument) {
-		
+
 		readParentAttributes(sourceNode.getParentNode());
 		readAttributes(sourceNode);
 		Element element = (Element) sourceNode;
-		
+		boolean disabledItem = ComponentUtil.string2boolean(ComponentUtil
+				.getAttribute(element, ITEM_DISABLED));
 		nsIDOMElement option = visualDocument.createElement(HTML.TAG_OPTION);
-		nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
-		option.appendChild(span);
-		
+		// nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
+		// option.appendChild(span);
+		if (disabledItem)
+			option.setAttribute(DISABLED, "true");
 		VpeCreationData creationData = new VpeCreationData(option);
-		
+
 		if (attrPresents(disabled) && "true".equalsIgnoreCase(disabled)) {
 			option.setAttribute(CLASS, disabledClass);
 		} else if (attrPresents(enabledClass)) {
@@ -82,10 +91,21 @@
 			if (null == escape || "true".equalsIgnoreCase(escape)) {
 				// show text as is
 				String itemLabel = attr.getNodeValue();
-				span.appendChild(visualDocument.createTextNode(itemLabel));
+				String bundleValue = ComponentUtil.getBundleValue(pageContext,
+						attr);
+				nsIDOMText text;
+				// if bundleValue differ from value then will be represent
+				// bundleValue, but text will be not edit
+				if (!itemLabel.equals(bundleValue)) {
+					text = visualDocument.createTextNode(bundleValue);
+
+				} else {
+					text = visualDocument.createTextNode(itemLabel);
+				}
+				option.appendChild(text);
 			} else {
 				// show formatted text
-				VpeChildrenInfo spanInfo = new VpeChildrenInfo(span);
+				VpeChildrenInfo spanInfo = new VpeChildrenInfo(option);
 				// re-parse attribute's value
 				NodeList list = NodeProxyUtil.reparseAttributeValue(attr);
 				// add children to info
@@ -97,25 +117,27 @@
 				creationData.addChildrenInfo(spanInfo);
 			}
 		}
-		
+
 		return creationData;
 	}
-	
+
 	/**
 	 * Checks is attribute presents.
 	 * 
-	 * @param attr the attribute
+	 * @param attr
+	 *            the attribute
 	 * 
 	 * @return true, if successful
 	 */
 	private boolean attrPresents(String attr) {
 		return ((null != attr) && (!"".equals(attr)));
 	}
-	
+
 	/**
 	 * Read attributes from the h:SelectManyCheckbox element.
 	 * 
-	 * @param sourceNode the source node
+	 * @param sourceNode
+	 *            the source node
 	 */
 	private void readParentAttributes(Node sourceNode) {
 		if (null == sourceNode) {
@@ -130,7 +152,8 @@
 	/**
 	 * Read attributes from the source element.
 	 * 
-	 * @param sourceNode the source node
+	 * @param sourceNode
+	 *            the source node
 	 */
 	private void readAttributes(Node sourceNode) {
 		if (null == sourceNode) {
@@ -140,11 +163,11 @@
 		escape = source.getAttribute(ESCAPE);
 	}
 
-	@Override
-	public void setSourceAttributeSelection(VpePageContext pageContext,
-			Element sourceElement, int offset, int length, Object data) {
-		VpeSourceDomBuilder sourceBuilder = pageContext.getSourceBuilder();
-		sourceBuilder.setSelection(sourceElement, 0, 0);
-	}
+	/*
+	 * @Override public void setSourceAttributeSelection(VpePageContext
+	 * pageContext, Element sourceElement, int offset, int length, Object data) {
+	 * VpeSourceDomBuilder sourceBuilder = pageContext.getSourceBuilder();
+	 * sourceBuilder.setSelection(sourceElement, 0, 0); }
+	 */
 
 }

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputFormatTemplate.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -16,6 +16,7 @@
 import java.util.regex.Pattern;
 
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
+import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
 import org.jboss.tools.jsf.vpe.jsf.template.util.NodeProxyUtil;
 import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.jboss.tools.vpe.editor.mapping.VpeAttributeData;
@@ -111,7 +112,7 @@
 							.getAttribute(ESCAPE_ATTR_NAME))) {
 
 				// get bundle value
-				newValue = getBundleValue(pageContext, newValue, offset);
+				newValue = ComponentUtil.getBundleValue(pageContext, newValue, offset);
 
 				nsIDOMText text;
 				// if bundleValue differ from value then will be represent

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputLabelTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputLabelTemplate.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputLabelTemplate.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.jboss.tools.jsf.vpe.jsf.template;
 
+import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
 import org.jboss.tools.jsf.vpe.jsf.template.util.NodeProxyUtil;
 import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.jboss.tools.vpe.editor.mapping.VpeAttributeData;
@@ -75,7 +76,7 @@
 				String value = attr.getNodeValue();
 
 				// get bundle value
-				String bundleValue = getBundleValue(pageContext, attr);
+				String bundleValue = ComponentUtil.getBundleValue(pageContext, attr);
 
 				nsIDOMText text;
 				// if bundleValue differ from value then will be represent

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOutputTextTemplate.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.jboss.tools.jsf.vpe.jsf.template;
 
+import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
 import org.jboss.tools.jsf.vpe.jsf.template.util.NodeProxyUtil;
 import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.jboss.tools.vpe.editor.mapping.VpeAttributeData;
@@ -68,7 +69,7 @@
 				String value = attr.getNodeValue();
 
 				// get bundle value
-				String bundleValue = getBundleValue(pageContext, attr);
+				String bundleValue = ComponentUtil.getBundleValue(pageContext, attr);
 
 				nsIDOMText text;
 				// if bundleValue differ from value then will be represent

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfRadioSelectItemTemplate.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -1,16 +1,17 @@
 /******************************************************************************* 
-* Copyright (c) 2007 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:
-*     Red Hat, Inc. - initial API and implementation
-******************************************************************************/
+ * Copyright (c) 2007 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:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
 package org.jboss.tools.jsf.vpe.jsf.template;
 
 import org.eclipse.wst.xml.core.internal.document.ElementImpl;
+import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
 import org.jboss.tools.jsf.vpe.jsf.template.util.NodeProxyUtil;
 import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
@@ -34,6 +35,9 @@
  */
 public class JsfRadioSelectItemTemplate extends VpeAbstractTemplate {
 
+	/* "itemDisabled" attribute of f:selectItem */
+	public static final String ITEM_DISABLED = "itemDisabled";
+
 	// type of input tag
 	private static final String ATTR_TYPE_VALUE = "radio"; //$NON-NLS-1$
 
@@ -45,16 +49,16 @@
 
 	/* "itemLabel" attribute of f:selectItem */
 	private static final String ITEM_LABEL = "itemLabel";
-	
+
 	/* "escape" attribute of f:selectItem */
 	private static final String ESCAPE = "escape";
-	
+
 	/* "dir" attribute of f:selectSelectOneRadio */
 	private static final String DIR = "dir";
-	
+
 	private String dir;
 	private String escape;
-	
+
 	/**
 	 * 
 	 */
@@ -74,29 +78,36 @@
 
 		Element element = (Element) sourceNode;
 
-		// create span element
-		nsIDOMElement span = visualDocument.createElement(HTML.TAG_TABLE);
+		// create table element
+		nsIDOMElement table = visualDocument.createElement(HTML.TAG_TABLE);
+		boolean disabledItem = ComponentUtil.string2boolean(ComponentUtil
+				.getAttribute(element, ITEM_DISABLED));
+
 		// add title attribute to span
-		span.setAttribute(HTML.ATTR_TITLE, getTitle(sourceNode));
+		table.setAttribute(HTML.ATTR_TITLE, getTitle(sourceNode));
 		nsIDOMElement radio = visualDocument.createElement(HTML.TAG_INPUT);
+		if (disabledItem)
+			radio.setAttribute(ITEM_DISABLED, "true");
 		nsIDOMElement label = visualDocument.createElement(HTML.TAG_LABEL);
-		span.appendChild(radio);
-		span.appendChild(label);
+		if (disabledItem)
+			label.setAttribute(ITEM_DISABLED, "true");
+		table.appendChild(radio);
+		table.appendChild(label);
 
 		if (null != element) {
 			escape = element.getAttribute(ESCAPE);
 			dir = element.getAttribute(DIR);
 		}
-		
-		VpeCreationData creationData = new VpeCreationData(span);
 
+		VpeCreationData creationData = new VpeCreationData(table);
+
 		// set attributes
-		span.setAttribute(HTML.ATTR_STYLE, SPAN_STYLE_VALUE);
+		table.setAttribute(HTML.ATTR_STYLE, SPAN_STYLE_VALUE);
 		radio.setAttribute(HTML.ATTR_TYPE, ATTR_TYPE_VALUE);
 		radio.setAttribute(HTML.ATTR_TITLE, getTitle(sourceNode));
 		radio.setAttribute(HTML.ATTR_NAME, ATTR_NAME_VALUE
 				+ getNameSuffix(sourceNode));
-		
+
 		if (attrPresents(dir)) {
 			radio.setAttribute(HTML.ATTR_DIR, dir);
 		}
@@ -109,8 +120,24 @@
 		if (null != attr) {
 			if (null == escape || "true".equalsIgnoreCase(escape)) {
 				// show text as is
+
 				String itemLabel = attr.getNodeValue();
-				label.appendChild(visualDocument.createTextNode(itemLabel));
+				String bundleValue = ComponentUtil.getBundleValue(pageContext,
+						attr);
+
+				nsIDOMText text;
+				// if bundleValue differ from value then will be represent
+				// bundleValue, but text will be not edit
+				if (!itemLabel.equals(bundleValue)) {
+
+					text = visualDocument.createTextNode(bundleValue);
+
+				} else {
+
+					text = visualDocument.createTextNode(itemLabel);
+
+				}
+				label.appendChild(text);
 			} else {
 				// show formatted text
 				VpeChildrenInfo labelSpanInfo = new VpeChildrenInfo(label);
@@ -166,7 +193,7 @@
 		Node parent = sourceNode.getParentNode();
 
 		if (parent.getNodeType() == Node.ELEMENT_NODE) {
-			
+
 			ElementImpl element = (ElementImpl) parent;
 
 			// get start position of parent
@@ -176,11 +203,12 @@
 		return name_suffix;
 
 	}
-	
+
 	/**
 	 * Checks is attribute presents.
 	 * 
-	 * @param attr the attribute
+	 * @param attr
+	 *            the attribute
 	 * 
 	 * @return true, if successful
 	 */

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneListbox.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -101,10 +101,11 @@
 			// add attribute to "select"
 			if (attr != null) {
 				if (attributeName.equalsIgnoreCase(HTML.ATTR_DISABLED)) {
-					if (attr.equalsIgnoreCase("true")) {
-						select.setAttribute(ATTR_LIST_COPY.get(attributeName),
-								"disabled");
-					}
+					/*
+					 * if (attr.equalsIgnoreCase("true")) {
+					 * select.setAttribute(ATTR_LIST_COPY.get(attributeName),
+					 * "disabled"); }
+					 */
 					continue;
 				}
 				select.setAttribute(ATTR_LIST_COPY.get(attributeName), attr);
@@ -181,12 +182,29 @@
 			nsIDOMElement element = (nsIDOMElement) node
 					.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
 			disabled = ComponentUtil.string2boolean(ComponentUtil.getAttribute(
-					sourceElement, HTML.ATTR_DISABLED));
+					sourceElement, HTML.ATTR_DISABLED))
+					|| ComponentUtil.string2boolean(ATTR_LIST_COPY
+							.get(HTML.ATTR_DISABLED));
 			if (node.getNodeName().equalsIgnoreCase(HTML.TAG_OPTION)) {
-				element.setAttribute(HTML.ATTR_CLASS, disabled ? ComponentUtil
-						.getAttribute(sourceElement, ATTR_DISABLED_CLASS)
-						: ComponentUtil.getAttribute(sourceElement,
-								ATTR_ENABLED_CLASS));
+				if (disabled) {
+					element
+							.setAttribute(HTML.ATTR_DISABLED,
+									HTML.ATTR_DISABLED);
+					element.setAttribute(HTML.ATTR_STYLE, sourceElement.getAttribute(HTML.ATTR_STYLE));
+				}
+					element
+							.setAttribute(
+									HTML.ATTR_CLASS,
+									(disabled || ComponentUtil
+											.string2boolean(ComponentUtil
+													.getAttribute(element,
+															HTML.ATTR_DISABLED))) ? ComponentUtil
+											.getAttribute(sourceElement,
+													ATTR_DISABLED_CLASS)
+											: ComponentUtil.getAttribute(
+													sourceElement,
+													ATTR_ENABLED_CLASS));
+				
 			}
 			for (int i = 0; i < list.getLength(); i++) {
 				applyChildAttributes(sourceElement, list.item(i));

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfSelectOneRadioTemplate.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -143,20 +143,39 @@
 						.setAttribute(
 								HTML.ATTR_DIR,
 								(ComponentUtil.getAttribute(sourceElement,
-										HTML.ATTR_DIR) == ATTR_DIR_LEFT_TO_RIGHT) ? ATTR_DIR_LEFT_TO_RIGHT
-										: ATTR_DIR_RIGHT_TO_LEFT);
+										HTML.ATTR_DIR).trim()
+										.equalsIgnoreCase(ATTR_DIR_RIGHT_TO_LEFT)) ? ATTR_DIR_RIGHT_TO_LEFT
+										: ((ComponentUtil.getAttribute(
+												sourceElement, HTML.ATTR_DIR)
+												.trim()
+												.equalsIgnoreCase(ATTR_DIR_LEFT_TO_RIGHT)) ? ATTR_DIR_LEFT_TO_RIGHT
+												: ""));
 				element.setAttribute(HTML.ATTR_SIZE, ComponentUtil
 						.getAttribute(sourceElement, HTML.ATTR_SIZE));
-				if (disabled)
+				if (disabled
+						|| ComponentUtil
+								.string2boolean(ComponentUtil
+										.getAttribute(
+												element,
+												JsfRadioSelectItemTemplate.ITEM_DISABLED)))
 					element.setAttribute(HTML.ATTR_DISABLED,
 							ATTR_DISABLED_VALUE);
 
 			}
 			if (node.getNodeName().equalsIgnoreCase(HTML.TAG_LABEL)) {
-				element.setAttribute(HTML.ATTR_CLASS, disabled ? ComponentUtil
-						.getAttribute(sourceElement, ATTR_DISABLED_CLASS)
-						: ComponentUtil.getAttribute(sourceElement,
-								ATTR_ENABLED_CLASS));
+				element
+						.setAttribute(
+								HTML.ATTR_CLASS,
+								(disabled || ComponentUtil
+										.string2boolean(ComponentUtil
+												.getAttribute(
+														element,
+														JsfRadioSelectItemTemplate.ITEM_DISABLED))) ? ComponentUtil
+										.getAttribute(sourceElement,
+												ATTR_DISABLED_CLASS)
+										: ComponentUtil.getAttribute(
+												sourceElement,
+												ATTR_ENABLED_CLASS));
 			}
 
 			if (node.getNodeName().equalsIgnoreCase(HTML.TAG_TABLE)) {

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/ComponentUtil.java	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/ComponentUtil.java	2008-03-10 18:59:27 UTC (rev 6822)
@@ -10,7 +10,16 @@
  ******************************************************************************/
 package org.jboss.tools.jsf.vpe.jsf.template.util;
 
+import java.io.File;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
+import org.jboss.tools.jsf.vpe.jsf.JsfTemplatePlugin;
+import org.jboss.tools.vpe.editor.bundle.BundleMap;
+import org.jboss.tools.vpe.editor.context.VpePageContext;
 import org.mozilla.interfaces.nsIDOMElement;
+import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 
 /**
@@ -73,4 +82,34 @@
 		}
 		return false;
 	}
+
+	/**
+	 * get bundle
+	 * 
+	 * @param pageContext
+	 * @param attr
+	 * @return
+	 */
+	public static String getBundleValue(VpePageContext pageContext, Attr attr) {
+
+		return getBundleValue(pageContext, attr.getNodeValue(),
+				((IDOMAttr) attr).getValueRegionStartOffset());
+
+	}
+
+	/**
+	 * 
+	 * @param pageContext
+	 * @param value
+	 * @param offfset
+	 * @return
+	 */
+	public static String getBundleValue(VpePageContext pageContext,
+			String value, int offfset) {
+
+		BundleMap bundle = pageContext.getBundle();
+
+		return bundle.getBundleValue(value, offfset);
+
+	}
 }

Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml	2008-03-10 18:36:15 UTC (rev 6821)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml	2008-03-10 18:59:27 UTC (rev 6822)
@@ -1,1154 +1,1210 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<vpe:templates>
-	<vpe:template-taglib uri="http://java.sun.com/jsf/html" prefix="h"/>
-	<vpe:template-taglib uri="http://java.sun.com/jsf/core" prefix="f"/>
-
-    <vpe:tag name="f:loadBundle" case-sensitive="yes">
-	    <vpe:template children="no" modify="no">
-			<vpe:load-bundle/>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="f:verbatim" case-sensitive="yes">
-	    <vpe:template children="yes" modify="yes">
-			<span title="{tagstring()}" />
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes"/>
-			</vpe:dnd>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:inputText" case-sensitive="yes">
-	    <vpe:template children="no" modify="no">
-			<input type="text" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}" size="{@size}" dir="{@dir}"/>
-			<vpe:resize>
-				<vpe:width width-attr="style.width" />
-				<vpe:height height-attr="style.height" />
-			</vpe:resize>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes">
-					<vpe:container-child tag-name="converter" />
-					<vpe:container-child tag-name="convertNumber" />
-					<vpe:container-child tag-name="convertDateTime" />
-					<vpe:container-child tag-name="validator" />
-					<vpe:container-child tag-name="validateDoubleRange" />
-					<vpe:container-child tag-name="validateLongRange" />
-					<vpe:container-child tag-name="validateLength" />
-				</vpe:drop>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:inputTextarea" case-sensitive="yes">
-	    <vpe:template children="yes" modify="no">
-			<textarea class="{@styleClass}" style="{@style}" rows="{@rows}" cols="{@cols}" title="{tagstring()}"  dir="{@dir}">
-				<vpe:value expr="{jsfvalue(@value)}"/>
-			</textarea>
-			<vpe:resize>
-				<vpe:width width-attr="style.width" />
-				<vpe:height height-attr="style.height" />
-			</vpe:resize>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:inputSecret" case-sensitive="yes">
-	    <vpe:template children="no" modify="no">
-			<input type="password" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}" size="{@size}" dir="{@dir}" />
-			<vpe:resize>
-				<vpe:width width-attr="style.width" />
-				<vpe:height height-attr="style.height" />
-			</vpe:resize>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes">
-					<vpe:container-child tag-name="converter" />
-					<vpe:container-child tag-name="convertNumber" />
-					<vpe:container-child tag-name="convertDateTime" />
-					<vpe:container-child tag-name="validator" />
-					<vpe:container-child tag-name="validateDoubleRange" />
-					<vpe:container-child tag-name="validateLongRange" />
-					<vpe:container-child tag-name="validateLength" />
-				</vpe:drop>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:inputHidden" case-sensitive="yes">
-	    <vpe:template children="no" modify="no">
-			<input type="text" value="{jsfvalue(@value)}" title="{tagstring()}"/>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes">
-					<vpe:container-child tag-name="converter" />
-					<vpe:container-child tag-name="convertNumber" />
-					<vpe:container-child tag-name="convertDateTime" />
-					<vpe:container-child tag-name="validator" />
-					<vpe:container-child tag-name="validateDoubleRange" />
-					<vpe:container-child tag-name="validateLongRange" />
-					<vpe:container-child tag-name="validateLength" />
-				</vpe:drop>
-			</vpe:dnd>
-		</vpe:template>
-    </vpe:tag>
-    
-    <vpe:tag name="h:outputText" case-sensitive="yes">
-    	<vpe:template children="yes" modify="no"
-    		class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputTextTemplate">
-    		<vpe:dnd>
-    			<vpe:drag start-enable="yes" />
-    			<vpe:drop container="yes">
-    				<vpe:container-child tag-name="converter" />
-    				<vpe:container-child tag-name="convertNumber" />
-    				<vpe:container-child tag-name="convertDateTime" />
-    				<vpe:container-child tag-name="validator" />
-    				<vpe:container-child tag-name="validateDoubleRange" />
-    				<vpe:container-child tag-name="validateLongRange" />
-    				<vpe:container-child tag-name="validateLength" />
-    			</vpe:drop>
-    		</vpe:dnd>
-    		<vpe:textFormating>
-    			<vpe:format type="UnderlineFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BoldFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ItalicFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontNameFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontSizeFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BackgroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ForegroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    		</vpe:textFormating>
-    	</vpe:template>
-    </vpe:tag>
-    
-    <vpe:tag name="h:outputFormat" case-sensitive="yes">
-    	<vpe:template children="yes" modify="yes"
-    		class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputFormatTemplate">
-    		<vpe:dnd>
-    			<vpe:drag start-enable="yes" />
-    		</vpe:dnd>
-    		<vpe:textFormating>
-    			<vpe:format type="UnderlineFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BoldFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ItalicFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontNameFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontSizeFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BackgroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ForegroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    		</vpe:textFormating>
-    	</vpe:template>
-    </vpe:tag>
-    <vpe:tag name="h:graphicImage" case-sensitive="yes">
-		<vpe:if test="attrpresent('value')">
-			<vpe:template children="no" modify="yes">
-				<img src="{src(jsfvalue(@value))}" width="{@width}" height="{@height}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
-				<vpe:dnd>
-					<vpe:drag start-enable="yes"/>
-				</vpe:dnd>
-				<vpe:resize>
-					<vpe:width width-attr="width" />
-					<vpe:height height-attr="height" />
-				</vpe:resize>
-			</vpe:template>
-		</vpe:if>
-		<vpe:template children="no" modify="yes">
-			<img src="{src(jsfvalue(@url))}" width="{@width}" height="{@height}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
-			<vpe:resize>
-				<vpe:width width-attr="width" />
-				<vpe:height height-attr="height" />
-			</vpe:resize>
-		</vpe:template>
-    </vpe:tag>
-
-<!-- Проблема с адресацией от приложения (30 of 4) -->
-    <vpe:tag name="h:commandButton" case-sensitive="yes">
-		<vpe:if test="not(attrpresent('image'))">
-			<vpe:if test="@type=''">
-				<vpe:template children="no" modify="no">
-					<input type="submit" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
-					<vpe:resize>
-						<vpe:width width-attr="style.width" />
-						<vpe:height height-attr="style.height" />
-					</vpe:resize>
-					<vpe:dnd>
-						<vpe:drag start-enable="yes"/>
-					</vpe:dnd>
-					<vpe:textFormating>
-						<vpe:format type="UnderlineFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="BoldFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="ItalicFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="FontNameFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="FontSizeFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="BackgroundColorFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="ForegroundColorFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-					</vpe:textFormating>
-				</vpe:template>
-			</vpe:if>
-			<vpe:if test="(@type='button')|(@type='reset')|(@type='submit')">
-				<vpe:template children="no" modify="no">
-					<input type="{@type}" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
-					<vpe:resize>
-						<vpe:width width-attr="style.width" />
-						<vpe:height height-attr="style.height" />
-					</vpe:resize>
-					<vpe:dnd>
-						<vpe:drag start-enable="yes"/>
-					</vpe:dnd>
-					<vpe:textFormating>
-						<vpe:format type="UnderlineFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="BoldFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="ItalicFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="FontNameFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="FontSizeFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="BackgroundColorFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-						<vpe:format type="ForegroundColorFormat">
-							<vpe:formatAttribute type="style"/>
-						</vpe:format>
-					</vpe:textFormating>
-				</vpe:template>
-			</vpe:if>
-		</vpe:if>
-		<vpe:if test="attrpresent('image')">
-			<vpe:template children="no" modify="no">
-				<input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
-				<vpe:resize>
-					<vpe:width width-attr="style.width" />
-					<vpe:height height-attr="style.height" />
-				</vpe:resize>
-				<vpe:textFormating>
-					<vpe:format type="UnderlineFormat">
-						<vpe:formatAttribute type="style"/>
-					</vpe:format>
-					<vpe:format type="BoldFormat">
-						<vpe:formatAttribute type="style"/>
-					</vpe:format>
-					<vpe:format type="ItalicFormat">
-						<vpe:formatAttribute type="style"/>
-					</vpe:format>
-					<vpe:format type="FontNameFormat">
-						<vpe:formatAttribute type="style"/>
-					</vpe:format>
-					<vpe:format type="FontSizeFormat">
-						<vpe:formatAttribute type="style"/>
-					</vpe:format>
-					<vpe:format type="BackgroundColorFormat">
-						<vpe:formatAttribute type="style"/>
-					</vpe:format>
-					<vpe:format type="ForegroundColorFormat">
-						<vpe:formatAttribute type="style"/>
-					</vpe:format>
-				</vpe:textFormating>
-			</vpe:template>
-		</vpe:if>
-    </vpe:tag>
-
-<!-- Проблема с вложенным параметром (31 of 4) -->
-    <vpe:tag name="h:commandLink" case-sensitive="yes">
-	    <vpe:template children="yes" modify="yes">
-			<span class="{@styleClass}" style="color:blue;text-decoration:underline;{@style}" title="{tagstring()}">
-				<vpe:value expr="{jsfvalue(@value)}"/>
-			</span>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes">
-					<vpe:container-child tag-name="outputText"/>
-				</vpe:drop>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-			<vpe:pseudoContent/>
-		</vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:outputLink" case-sensitive="yes">
-    	<vpe:if test="(@disabled='true')">
-    		<vpe:template children="yes" modify="yes">
-    			<span class="{@styleClass}"
-    				style="{@style}" dir="{@dir}">
-	 			</span>
-    			<vpe:textFormating>
-    				<vpe:format type="UnderlineFormat"
-    					setDefault="true">
-    					<vpe:formatAttribute type="style" />
-    				</vpe:format>
-    				<vpe:format type="BoldFormat">
-    					<vpe:formatAttribute type="style" />
-    				</vpe:format>
-    				<vpe:format type="ItalicFormat">
-    					<vpe:formatAttribute type="style" />
-    				</vpe:format>
-    				<vpe:format type="FontNameFormat">
-    					<vpe:formatAttribute type="style" />
-    				</vpe:format>
-    				<vpe:format type="FontSizeFormat">
-    					<vpe:formatAttribute type="style" />
-    				</vpe:format>
-    				<vpe:format type="BackgroundColorFormat">
-    					<vpe:formatAttribute type="style" />
-    				</vpe:format>
-    				<vpe:format type="ForegroundColorFormat">
-    					<vpe:formatAttribute type="style" />
-    				</vpe:format>
-    			</vpe:textFormating>
-    		</vpe:template>
-    	</vpe:if>
-    	<vpe:template children="yes" modify="yes">
-    		<a href="javascript:return false;" class="{@styleClass}"
-    			style="{@style}" dir="{@dir}"  />
-    		<vpe:textFormating>
-    			<vpe:format type="UnderlineFormat" setDefault="true">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BoldFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ItalicFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontNameFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontSizeFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BackgroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ForegroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    		</vpe:textFormating>
-    	</vpe:template>
+<?xml version="1.0" encoding="UTF-8"?>
 
-    </vpe:tag>
+<vpe:templates>
+	<vpe:template-taglib uri="http://java.sun.com/jsf/html" prefix="h" />
+	<vpe:template-taglib uri="http://java.sun.com/jsf/core" prefix="f" />
 
-    <vpe:tag name="h:outputLabel" case-sensitive="yes">
-    	<vpe:template children="yes" modify="yes"
-    		class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputLabelTemplate">
-    		<vpe:dnd>
-    			<vpe:drag start-enable="yes" />
-    			<vpe:drop container="yes">
-    				<vpe:container-child tag-name="outputText" />
-    			</vpe:drop>
-    		</vpe:dnd>
-    		<vpe:textFormating>
-    			<vpe:format type="UnderlineFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BoldFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ItalicFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontNameFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontSizeFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BackgroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ForegroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    		</vpe:textFormating>
-    	</vpe:template>
-    </vpe:tag>
+	<vpe:tag name="f:loadBundle" case-sensitive="yes">
+		<vpe:template children="no" modify="no">
+			<vpe:load-bundle />
+		</vpe:template>
+	</vpe:tag>
 
-    <vpe:tag name="h:selectBooleanCheckbox" case-sensitive="yes">
-		<vpe:if test="@disabled='on'">   <!-- Gavr --><!-- added x: 15.02.05 -->
-		    <vpe:template children="no" modify="no">
-				<input type="checkbox" disabled="on" checked="{@value}" class="{@styleClass}" style="{@style}" border="{@border}" title="{tagstring()}"/>
-				<vpe:dnd>
-					<vpe:drag start-enable="yes"/>
-					<vpe:drop container="yes">
-						<vpe:container-child tag-name="selectItem"/>
-						<vpe:container-child tag-name="selectItems"/>
-					</vpe:drop>
-				</vpe:dnd>
-		    </vpe:template>
-		</vpe:if>
-		<vpe:template children="no" modify="no">
-			<input type="checkbox"  checked="{@value}" class="{@styleClass}" style="{@style}" border="{@border}" title="{tagstring()}"/>
-	    </vpe:template>
-    </vpe:tag>
-
-<!--
-	Проблема с вложенными f:selectItem (42 of 4) и f:selectItems (50 of 4)
-	Возможна проблема с нечувствительностью к регистру lineDirection/pageDirection (44 of 4)
--->
-    <vpe:tag name="h:selectManyCheckbox" case-sensitive="yes">
-		<vpe:template children="yes" modify="yes"
-		class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectManyCheckbox">
-
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes">
-						<vpe:container-child tag-name="selectItem"/>
-						<vpe:container-child tag-name="selectItems"/>
-				</vpe:drop>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-					</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-		</vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:selectOneRadio" case-sensitive="yes">
-		<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectOneRadioTemplate">
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes">
-						<vpe:container-child tag-name="selectItem"/>
-						<vpe:container-child tag-name="selectItems"/>
-				</vpe:drop>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-					</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-		</vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:selectOneListbox" case-sensitive="yes">
-    	<vpe:template
-    		class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectOneListbox"
-    		children="yes" modify="yes">
-    		<vpe:dnd>
-    			<vpe:drag start-enable="yes" />
-    			<vpe:drop container="yes">
-    				<vpe:container-child tag-name="selectItem" />
-    				<vpe:container-child tag-name="selectItems" />
-    			</vpe:drop>
-    		</vpe:dnd>
-    		<vpe:textFormating>
-    			<vpe:format type="UnderlineFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BoldFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ItalicFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontNameFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontSizeFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BackgroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ForegroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    		</vpe:textFormating>
-    	</vpe:template>
-    </vpe:tag>
+	<vpe:tag name="f:verbatim" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes">
+			<span title="{tagstring()}" />
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes" />
+			</vpe:dnd>
+		</vpe:template>
+	</vpe:tag>
 
-    <vpe:tag name="h:selectManyListbox" case-sensitive="yes">
-    	<vpe:template children="yes" modify="yes"
-    		class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectManyListbox">
-    		<vpe:dnd>
-    			<vpe:drag start-enable="yes" />
-    			<vpe:drop container="yes">
-    				<vpe:container-child tag-name="selectItem" />
-    				<vpe:container-child tag-name="selectItems" />
-    			</vpe:drop>
-    		</vpe:dnd>
-    		<vpe:textFormating>
-    			<vpe:format type="UnderlineFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BoldFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ItalicFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontNameFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="FontSizeFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="BackgroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    			<vpe:format type="ForegroundColorFormat">
-    				<vpe:formatAttribute type="style" />
-    			</vpe:format>
-    		</vpe:textFormating>
-    	</vpe:template>
-    </vpe:tag>
+	<vpe:tag name="h:inputText" case-sensitive="yes">
+		<vpe:template children="no" modify="no">
+			<input type="text" value="{jsfvalue(@value)}"
+				class="{@styleClass}" style="{@style}" title="{tagstring()}"
+				size="{@size}" dir="{@dir}" />
+			<vpe:resize>
+				<vpe:width width-attr="style.width" />
+				<vpe:height height-attr="style.height" />
+			</vpe:resize>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="converter" />
+					<vpe:container-child tag-name="convertNumber" />
+					<vpe:container-child tag-name="convertDateTime" />
+					<vpe:container-child tag-name="validator" />
+					<vpe:container-child tag-name="validateDoubleRange" />
+					<vpe:container-child tag-name="validateLongRange" />
+					<vpe:container-child tag-name="validateLength" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
 
-    <vpe:tag name="h:selectOneMenu" case-sensitive="yes">
-		<vpe:template class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectOneMenuTemplate"
-    		children="yes" modify="yes">
-			<vpe:resize>
-				<vpe:width width-attr="style.width" />
-				<vpe:height height-attr="style.height" />
-			</vpe:resize>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes">
-						<vpe:container-child tag-name="selectItem"/>
-						<vpe:container-child tag-name="selectItems"/>
-				</vpe:drop>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-					</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-		</vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:selectManyMenu" case-sensitive="yes">
-		<vpe:template children="yes" modify="yes">
-			<select style="{@style}" multiple="multiple"  class="{@styleClass}" title="{tagstring()}" size="1" dir="{@dir}"/>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes">
-						<vpe:container-child tag-name="selectItem"/>
-						<vpe:container-child tag-name="selectItems"/>
-				</vpe:drop>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-					</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-		</vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="f:selectItem" case-sensitive="yes">
-    	<vpe:if test="hasinparents('h:selectManyCheckbox')">
-    		<vpe:template children="yes" modify="yes"
-    			class="org.jboss.tools.jsf.vpe.jsf.template.JsfCheckboxSelectItemTemplate">
-    		</vpe:template>
-    	</vpe:if>
-    	<vpe:if
-    		test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')">
-    		<vpe:template children="yes" modify="yes"
-    			class="org.jboss.tools.jsf.vpe.jsf.template.JsfOptionSelectItemTemplate">
-    		</vpe:template>
-    	</vpe:if>
-    	<vpe:if
-    		test="hasinparents('h:selectOneRadio')|hasinparents('x:selectOneRadio')">
-    		<vpe:template children="yes" modify="yes"
-    			class="org.jboss.tools.jsf.vpe.jsf.template.JsfRadioSelectItemTemplate">
-    		</vpe:template>
-    	</vpe:if>
-    	<vpe:if
-    		test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
-    		<vpe:template children="no" modify="yes">
-    			<span title="{tagstring()}">
-    				<input type="checkbox" />
-    				<vpe:value expr="{jsfvalue(@itemLabel)}" />
-    			</span>
-    			<vpe:dnd>
-    				<vpe:drag start-enable="yes" />
-    			</vpe:dnd>
-    			<vpe:breaker type="selectItem" />
-    		</vpe:template>
-    	</vpe:if>
-    	<vpe:if
-    		test="hasinparents('h:selectOneListbox')|
-						hasinparents('h:selectOneMenu')|
-						hasinparents('t:selectManyMenu')|
+	<vpe:tag name="h:inputTextarea" case-sensitive="yes">
+		<vpe:template children="yes" modify="no">
+			<textarea class="{@styleClass}" style="{@style}"
+				rows="{@rows}" cols="{@cols}" title="{tagstring()}" dir="{@dir}">
+				<vpe:value expr="{jsfvalue(@value)}" />
+			</textarea>
+			<vpe:resize>
+				<vpe:width width-attr="style.width" />
+				<vpe:height height-attr="style.height" />
+			</vpe:resize>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:inputSecret" case-sensitive="yes">
+		<vpe:template children="no" modify="no">
+			<input type="password" value="{jsfvalue(@value)}"
+				class="{@styleClass}" style="{@style}" title="{tagstring()}"
+				size="{@size}" dir="{@dir}" />
+			<vpe:resize>
+				<vpe:width width-attr="style.width" />
+				<vpe:height height-attr="style.height" />
+			</vpe:resize>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="converter" />
+					<vpe:container-child tag-name="convertNumber" />
+					<vpe:container-child tag-name="convertDateTime" />
+					<vpe:container-child tag-name="validator" />
+					<vpe:container-child tag-name="validateDoubleRange" />
+					<vpe:container-child tag-name="validateLongRange" />
+					<vpe:container-child tag-name="validateLength" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:inputHidden" case-sensitive="yes">
+		<vpe:template children="no" modify="no">
+			<input type="text" value="{jsfvalue(@value)}"
+				title="{tagstring()}" />
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="converter" />
+					<vpe:container-child tag-name="convertNumber" />
+					<vpe:container-child tag-name="convertDateTime" />
+					<vpe:container-child tag-name="validator" />
+					<vpe:container-child tag-name="validateDoubleRange" />
+					<vpe:container-child tag-name="validateLongRange" />
+					<vpe:container-child tag-name="validateLength" />
+				</vpe:drop>
+			</vpe:dnd>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:outputText" case-sensitive="yes">
+		<vpe:template children="yes" modify="no"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputTextTemplate">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="converter" />
+					<vpe:container-child tag-name="convertNumber" />
+					<vpe:container-child tag-name="convertDateTime" />
+					<vpe:container-child tag-name="validator" />
+					<vpe:container-child tag-name="validateDoubleRange" />
+					<vpe:container-child tag-name="validateLongRange" />
+					<vpe:container-child tag-name="validateLength" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:outputFormat" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputFormatTemplate">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+	<vpe:tag name="h:graphicImage" case-sensitive="yes">
+		<vpe:if test="attrpresent('value')">
+			<vpe:template children="no" modify="yes">
+				<img src="{src(jsfvalue(@value))}" width="{@width}"
+					height="{@height}" class="{@styleClass}" style="{@style}"
+					title="{tagstring()}" />
+				<vpe:dnd>
+					<vpe:drag start-enable="yes" />
+				</vpe:dnd>
+				<vpe:resize>
+					<vpe:width width-attr="width" />
+					<vpe:height height-attr="height" />
+				</vpe:resize>
+			</vpe:template>
+		</vpe:if>
+		<vpe:template children="no" modify="yes">
+			<img src="{src(jsfvalue(@url))}" width="{@width}"
+				height="{@height}" class="{@styleClass}" style="{@style}"
+				title="{tagstring()}" />
+			<vpe:resize>
+				<vpe:width width-attr="width" />
+				<vpe:height height-attr="height" />
+			</vpe:resize>
+		</vpe:template>
+	</vpe:tag>
+
+	<!-- Проблема с адресацией от приложения (30 of 4) -->
+	<vpe:tag name="h:commandButton" case-sensitive="yes">
+		<vpe:if test="not(attrpresent('image'))">
+			<vpe:if test="@type=''">
+				<vpe:template children="no" modify="no">
+					<input type="submit" value="{jsfvalue(@value)}"
+						class="{@styleClass}" style="{@style}" title="{tagstring()}" />
+					<vpe:resize>
+						<vpe:width width-attr="style.width" />
+						<vpe:height height-attr="style.height" />
+					</vpe:resize>
+					<vpe:dnd>
+						<vpe:drag start-enable="yes" />
+					</vpe:dnd>
+					<vpe:textFormating>
+						<vpe:format type="UnderlineFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="BoldFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="ItalicFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="FontNameFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="FontSizeFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="BackgroundColorFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="ForegroundColorFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+					</vpe:textFormating>
+				</vpe:template>
+			</vpe:if>
+			<vpe:if
+				test="(@type='button')|(@type='reset')|(@type='submit')">
+				<vpe:template children="no" modify="no">
+					<input type="{@type}" value="{jsfvalue(@value)}"
+						class="{@styleClass}" style="{@style}" title="{tagstring()}" />
+					<vpe:resize>
+						<vpe:width width-attr="style.width" />
+						<vpe:height height-attr="style.height" />
+					</vpe:resize>
+					<vpe:dnd>
+						<vpe:drag start-enable="yes" />
+					</vpe:dnd>
+					<vpe:textFormating>
+						<vpe:format type="UnderlineFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="BoldFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="ItalicFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="FontNameFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="FontSizeFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="BackgroundColorFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+						<vpe:format type="ForegroundColorFormat">
+							<vpe:formatAttribute type="style" />
+						</vpe:format>
+					</vpe:textFormating>
+				</vpe:template>
+			</vpe:if>
+		</vpe:if>
+		<vpe:if test="attrpresent('image')">
+			<vpe:template children="no" modify="no">
+				<input type="image" src="{src(@image)}"
+					class="{@styleClass}" style="{@style}" title="{tagstring()}" />
+				<vpe:resize>
+					<vpe:width width-attr="style.width" />
+					<vpe:height height-attr="style.height" />
+				</vpe:resize>
+				<vpe:textFormating>
+					<vpe:format type="UnderlineFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="BoldFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="ItalicFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="FontNameFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="FontSizeFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="BackgroundColorFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="ForegroundColorFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+				</vpe:textFormating>
+			</vpe:template>
+		</vpe:if>
+	</vpe:tag>
+
+	<!-- Проблема с вложенным параметром (31 of 4) -->
+	<vpe:tag name="h:commandLink" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes">
+			<span class="{@styleClass}"
+				style="color:blue;text-decoration:underline;{@style}"
+				title="{tagstring()}">
+				<vpe:value expr="{jsfvalue(@value)}" />
+			</span>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="outputText" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+			<vpe:pseudoContent />
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:outputLink" case-sensitive="yes">
+		<vpe:if test="(@disabled='true')">
+			<vpe:template children="yes" modify="yes">
+				<span class="{@styleClass}" style="{@style}"
+					dir="{@dir}">
+				</span>
+				<vpe:textFormating>
+					<vpe:format type="UnderlineFormat"
+						setDefault="true">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="BoldFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="ItalicFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="FontNameFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="FontSizeFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="BackgroundColorFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+					<vpe:format type="ForegroundColorFormat">
+						<vpe:formatAttribute type="style" />
+					</vpe:format>
+				</vpe:textFormating>
+			</vpe:template>
+		</vpe:if>
+		<vpe:template children="yes" modify="yes">
+			<a href="javascript:return false;" class="{@styleClass}"
+				style="{@style}" dir="{@dir}" />
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat" setDefault="true">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+
+	</vpe:tag>
+
+	<vpe:tag name="h:outputLabel" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputLabelTemplate">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="outputText" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:selectBooleanCheckbox" case-sensitive="yes">
+		<vpe:if test="@disabled='on'"><!-- Gavr --><!-- added x: 15.02.05 -->
+			<vpe:template children="no" modify="no">
+				<input type="checkbox" disabled="on" checked="{@value}"
+					class="{@styleClass}" style="{@style}" border="{@border}"
+					title="{tagstring()}" />
+				<vpe:dnd>
+					<vpe:drag start-enable="yes" />
+					<vpe:drop container="yes">
+						<vpe:container-child tag-name="selectItem" />
+						<vpe:container-child tag-name="selectItems" />
+					</vpe:drop>
+				</vpe:dnd>
+			</vpe:template>
+		</vpe:if>
+		<vpe:template children="no" modify="no">
+			<input type="checkbox" checked="{@value}"
+				class="{@styleClass}" style="{@style}" border="{@border}"
+				title="{tagstring()}" />
+		</vpe:template>
+	</vpe:tag>
+
+	<!--
+		Проблема с вложенными f:selectItem (42 of 4) и f:selectItems (50 of 4)
+		Возможна проблема с нечувствительностью к регистру lineDirection/pageDirection (44 of 4)
+	-->
+	<vpe:tag name="h:selectManyCheckbox" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectManyCheckbox">
+
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="selectItem" />
+					<vpe:container-child tag-name="selectItems" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:selectOneRadio" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectOneRadioTemplate">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="selectItem" />
+					<vpe:container-child tag-name="selectItems" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:selectOneListbox" case-sensitive="yes">
+		<vpe:template
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectOneListbox"
+			children="yes" modify="yes">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="selectItem" />
+					<vpe:container-child tag-name="selectItems" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:selectManyListbox" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectManyListbox">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="selectItem" />
+					<vpe:container-child tag-name="selectItems" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:selectOneMenu" case-sensitive="yes">
+		<vpe:template
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectOneMenuTemplate"
+			children="yes" modify="yes">
+			<vpe:resize>
+				<vpe:width width-attr="style.width" />
+				<vpe:height height-attr="style.height" />
+			</vpe:resize>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="selectItem" />
+					<vpe:container-child tag-name="selectItems" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:selectManyMenu" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes">
+			<select style="{@style}" multiple="multiple"
+				class="{@styleClass}" title="{tagstring()}" size="1" dir="{@dir}" />
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="selectItem" />
+					<vpe:container-child tag-name="selectItems" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="f:selectItem" case-sensitive="yes">
+		<vpe:if test="hasinparents('h:selectManyCheckbox')">
+			<vpe:template children="yes" modify="yes"
+				class="org.jboss.tools.jsf.vpe.jsf.template.JsfCheckboxSelectItemTemplate">
+			</vpe:template>
+		</vpe:if>
+		<vpe:if
+			test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')|hasinparents('h:selectOneListbox')|hasinparents('h:selectOneMenu')">
+			<vpe:template children="yes" modify="yes"
+				class="org.jboss.tools.jsf.vpe.jsf.template.JsfOptionSelectItemTemplate">
+			</vpe:template>
+		</vpe:if>
+		<vpe:if
+			test="hasinparents('h:selectOneRadio')|hasinparents('x:selectOneRadio')">
+			<vpe:template children="yes" modify="yes"
+				class="org.jboss.tools.jsf.vpe.jsf.template.JsfRadioSelectItemTemplate">
+			</vpe:template>
+		</vpe:if>
+		<vpe:if
+			test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
+			<vpe:template children="no" modify="yes">
+				<span title="{tagstring()}">
+					<input type="checkbox" />
+					<vpe:value expr="{jsfvalue(@itemLabel)}" />
+				</span>
+				<vpe:dnd>
+					<vpe:drag start-enable="yes" />
+				</vpe:dnd>
+				<vpe:breaker type="selectItem" />
+			</vpe:template>
+		</vpe:if>
+		<vpe:if
+			test="hasinparents('t:selectManyMenu')|
 						hasinparents('x:selectOneRadio')|
 						hasinparents('x:selectOneMenu')">
-<!-- Gavr --><!-- added x: 8.02.05 -->
-    		<vpe:template children="no" modify="yes">
-    			<option value="{@itemValue}" title="{tagstring()}">
-    				<vpe:value expr="{jsfvalue(@itemLabel)}" />
-    			</option>
-    		</vpe:template>
-    	</vpe:if>
-    </vpe:tag>
-
-    <vpe:tag name="f:selectItems" case-sensitive="yes">
-		<vpe:if test="hasinparents('h:selectManyCheckbox')|hasinparents('x:selectManyCheckbox')"> <!-- added x: 8.02.05 --><!-- Gavr -->
+			<!-- Gavr --><!-- added x: 8.02.05 -->
 			<vpe:template children="no" modify="yes">
-				<span title="{tagstring()}">
-					<input type="checkbox"/>
-					<vpe:value expr="{jsfvalue(@itemLabel)}"/>
-				</span>
-				<vpe:dnd>
-					<vpe:drag start-enable="yes"/>
-				</vpe:dnd>
+				<option value="{@itemValue}" title="{tagstring()}">
+					<vpe:value expr="{jsfvalue(@itemLabel)}" />
+				</option>
 			</vpe:template>
 		</vpe:if>
-		<vpe:if test="hasinparents('h:selectOneRadio')">
-			<vpe:template children="no" modify="yes">
-				<span title="{tagstring()}">
-					<input type="radio"/>
-					<vpe:value expr="{jsfvalue(@itemLabel)}"/>
-				</span>
-				<vpe:dnd>
-					<vpe:drag start-enable="yes"/>
-				</vpe:dnd>
-			</vpe:template>
-		</vpe:if>
-		<vpe:if test="hasinparents('h:selectOneListbox')|
+	</vpe:tag>
+
+	<vpe:tag name="f:selectItems" case-sensitive="yes">
+		<vpe:if
+			test="hasinparents('h:selectManyCheckbox')|hasinparents('x:selectManyCheckbox')">
+<!-- added x: 8.02.05 --><!-- Gavr -->
+			<vpe:template children="no" modify="yes">
+				<span title="{tagstring()}">
+					<input type="checkbox" />
+					<vpe:value expr="{jsfvalue(@itemLabel)}" />
+				</span>
+				<vpe:dnd>
+					<vpe:drag start-enable="yes" />
+				</vpe:dnd>
+			</vpe:template>
+		</vpe:if>
+		<vpe:if test="hasinparents('h:selectOneRadio')">
+			<vpe:template children="no" modify="yes">
+				<span title="{tagstring()}">
+					<input type="radio" />
+					<vpe:value expr="{jsfvalue(@itemLabel)}" />
+				</span>
+				<vpe:dnd>
+					<vpe:drag start-enable="yes" />
+				</vpe:dnd>
+			</vpe:template>
+		</vpe:if>
+		<vpe:if
+			test="hasinparents('h:selectOneListbox')|
 						hasinparents('h:selectManyListbox')|
 						hasinparents('h:selectOneMenu')|
 						hasinparents('h:selectManyMenu')|
-						hasinparents('x:selectOneMenu')">   <!-- Gavr -->
+						hasinparents('x:selectOneMenu')">
+<!-- Gavr -->
 			<vpe:template children="no" modify="yes">
 				<option value="{@itemValue}" title="{tagstring()}">
-					<vpe:value expr="{jsfvalue(@value)}"/>
+					<vpe:value expr="{jsfvalue(@value)}" />
 				</option>
 			</vpe:template>
 		</vpe:if>
-    </vpe:tag>
+	</vpe:tag>
 
-    <vpe:tag name="h:selectOneMenu" case-sensitive="yes">
-	    <vpe:template children="yes" modify="no">
-			<select  >
-			</select>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-			</vpe:dnd>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:panelGroup" case-sensitive="yes">
-		<vpe:template children="yes" modify="yes">
-			<span style="{@style}" class="{@styleClass}" title="{tagstring()}"/>
-			<vpe:breaker type="ignore"/>
-		</vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:panelGrid" case-sensitive="yes">
-		<vpe:template children="yes" modify="yes">
-			<vpe:panelgrid border="{iif(@border='','0','@border')}" style="{@style}" class="{@styleClass}" width="{@width}" frame="{@frame}" rules="{@rules}"
-						columnClasses="{@columnClasses}" footerClass="{@footerClass}" headerClass="{@headerClass}" rowClasses="{@rowClasses}"
-						cellspacing="{@cellspacing}" cellpadding="{@cellpadding}" bgcolor="{@bgcolor}" title="{tagstring()}"
-						table-size="{@columns}"/>
-			<vpe:resize>
-				<vpe:width width-attr="width" />
-			</vpe:resize>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes"/>
-			</vpe:dnd>
-			<vpe:breaker type="ignore"/>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-			<vpe:pseudoContent defaultText="yes"/>
-		</vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:dataTable" case-sensitive="yes">
+	<vpe:tag name="h:selectOneMenu" case-sensitive="yes">
 		<vpe:template children="yes" modify="no">
-			<vpe:datatable width="{@width}" bgcolor="{@bgcolor}" border="{@border}"
-							cellpadding="{@cellpadding}" cellspacing="{@cellspacing}"
-							columnClasses="{@columnClasses}" footerClass="{@footerClass}" headerClass="{@headerClass}"
-							rowClasses="{@rowClasses}"
-							frame="{@frame}" rules="{@rules}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
-			<vpe:resize>
-				<vpe:width width-attr="style.width" />
-				<vpe:height height-attr="style.height" />
-			</vpe:resize>
+			<select></select>
 			<vpe:dnd>
 				<vpe:drag start-enable="yes" />
-				<vpe:drop container="yes">
-					<vpe:container-child tag-name="column"/>
-				</vpe:drop>
 			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="BlockFormat" addChildren="deny"/>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-			<vpe:pseudoContent defaultText="yes"/>
 		</vpe:template>
-    </vpe:tag>
+	</vpe:tag>
 
-    <vpe:tag name="h:column" case-sensitive="yes">
-		<vpe:if test="parentname()='h:dataTable'|parentname()='x:dataTable'|parentname()='t:dataTable'|parentname()='t:newspaperTable'|parentname()='t:tree'">  <!-- Gavr --><!-- added x: 8.02.05 -->
-			<vpe:template children="yes" modify="yes">
-				<vpe:column title="{tagstring()}"/>
-			</vpe:template>
-		</vpe:if>
-		<vpe:if  test="parentname()='rich:columnGroup'|parentname()='rich:dataTable'|parentname()='rich:orderingList'|parentname()='rich:listShuttle'"> 
-			<vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.richfaces" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesColumnTemplate">
-			</vpe:template>
-		</vpe:if>
-    </vpe:tag>
+	<vpe:tag name="h:panelGroup" case-sensitive="yes">
 
-    <vpe:tag name="f:facet" case-sensitive="yes">
-		<vpe:if test="@name='popup'">
+		<vpe:if test="@layout='block'">
 			<vpe:template children="yes" modify="yes">
-			</vpe:template>
-		</vpe:if>
-		<vpe:if test="parentname()='h:dataTable'|parentname()='t:tree'">
-			<vpe:template children="yes" modify="yes">
-				<vpe:facet/>
-			</vpe:template>
-		</vpe:if>
-		<vpe:template children="yes" modify="yes">
-			<div/>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes"/>
-			</vpe:dnd>
-			<vpe:pseudoContent defaultText="yes" attrName="name"/>
-		</vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="f:view" case-sensitive="yes">
-	    <vpe:template children="yes" modify="yes" haveVisualPreview="no"
-	    class="org.jboss.tools.jsf.vpe.jsf.template.JsfView">
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes"/>
-			</vpe:dnd>
-			<vpe:pseudoContent defaultText="yes"/>
-			<vpe:textFormating>
-				<vpe:format type="BlockFormat" addParent="deny" addChildren="allow"
-					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
-				<vpe:format type="BoldFormat" addParent="deny" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BoldFormatHandler" />
-				<vpe:format type="ItalicFormat" addParent="deny" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.ItalicFormatHandler" />
-				<vpe:format type="UnderlineFormat" addParent="deny" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.UnderlineFormatHandler" />
-			</vpe:textFormating>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="f:subview" case-sensitive="yes">
-    	<vpe:template children="yes" modify="yes" haveVisualPreview="no"
-    	class="org.jboss.tools.jsf.vpe.jsf.template.JsfSubView">
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes"/>
-			</vpe:dnd>
-			<vpe:pseudoContent defaultText="yes"/>
-			<vpe:textFormating>
-				<vpe:format type="BlockFormat" addParent="deny" addChildren="allow"
-					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
-				<vpe:format type="BoldFormat" addParent="deny" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BoldFormatHandler" />
-				<vpe:format type="ItalicFormat" addParent="deny" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.ItalicFormatHandler" />
-				<vpe:format type="UnderlineFormat" addParent="deny" addChildren="allow" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.UnderlineFormatHandler" />
-			</vpe:textFormating>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:form" case-sensitive="yes">
-    	<vpe:template children="yes" modify="yes" haveVisualPreview="no"
-    	class="org.jboss.tools.jsf.vpe.jsf.template.JsfForm">
-			<vpe:dnd>
-				<vpe:drag start-enable="yes"/>
-				<vpe:drop container="yes"/>
-			</vpe:dnd>
-		<vpe:textFormating>
+				<div style="{@style}" class="{@styleClass}"
+					title="{tagstring()}" />
+				<vpe:breaker type="ignore" />
+			</vpe:template>
+		</vpe:if>
+		<vpe:template children="yes" modify="yes">
+			<span style="{@style}" class="{@styleClass}"
+				title="{tagstring()}" />
+			<vpe:breaker type="ignore" />
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:panelGrid" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes">
+			<vpe:panelgrid border="{iif(@border='','0','@border')}"
+				style="{@style}" class="{@styleClass}" width="{@width}"
+				frame="{@frame}" rules="{@rules}" columnClasses="{@columnClasses}"
+				footerClass="{@footerClass}" headerClass="{@headerClass}"
+				rowClasses="{@rowClasses}" cellspacing="{@cellspacing}"
+				cellpadding="{@cellpadding}" bgcolor="{@bgcolor}"
+				title="{tagstring()}" table-size="{@columns}" />
+			<vpe:resize>
+				<vpe:width width-attr="width" />
+			</vpe:resize>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes" />
+			</vpe:dnd>
+			<vpe:breaker type="ignore" />
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
 				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
+					<vpe:formatAttribute type="style" />
 				</vpe:format>
 				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
+					<vpe:formatAttribute type="style" />
 				</vpe:format>
 				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
+					<vpe:formatAttribute type="style" />
 				</vpe:format>
 				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
+					<vpe:formatAttribute type="style" />
 				</vpe:format>
 				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
+					<vpe:formatAttribute type="style" />
 				</vpe:format>
 				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
+					<vpe:formatAttribute type="style" />
 				</vpe:format>
 			</vpe:textFormating>
-	    </vpe:template>	
-    </vpe:tag>
-
-    <vpe:tag name="f:attribute" case-sensitive="yes">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:param">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:phaseListener">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:phaseListener">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:setPropertyActionListener">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:valueChangeListener">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:convertDateTime">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:convertNumber">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:validator">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:validateDoubleRange">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:validateLength">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="f:validateLongRange">
-	    <vpe:template children="no" modify="no"/>
-    </vpe:tag>
-
-    <vpe:tag name="h:message">
-	    <vpe:template children="no" modify="no">
-		    <span class="{@styleClass}" style="{@style}">
-				Error Message
-		    </span>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes" />
-				<vpe:drop container="no"/>
-			</vpe:dnd>
-		    <vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-	    </vpe:template>
-    </vpe:tag>
-
-    <vpe:tag name="h:messages">
-	    <vpe:template children="no" modify="no">
-		    <span class="{@styleClass}" style="{@style}">
-				Error Messages
-		    </span>
-			<vpe:dnd>
-				<vpe:drag start-enable="yes" />
-				<vpe:drop container="no"/>
-			</vpe:dnd>
-			<vpe:textFormating>
-				<vpe:format type="UnderlineFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BoldFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ItalicFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontNameFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="FontSizeFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="BackgroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-				<vpe:format type="ForegroundColorFormat">
-					<vpe:formatAttribute type="style"/>
-				</vpe:format>
-			</vpe:textFormating>
-	    </vpe:template>
-    </vpe:tag>
-
-<!--
-	Проблема с селектированием элемента: в мозилле селектируется заголовок а не рамка
--->
-	<vpe:template children="yes" modify="no">
-		<vpe:any value="{name()}" title="{tagstring()}"/>
-	</vpe:template>
+			<vpe:pseudoContent defaultText="yes" />
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:dataTable" case-sensitive="yes">
+		<vpe:template children="yes" modify="no">
+			<vpe:datatable width="{@width}" bgcolor="{@bgcolor}"
+				border="{@border}" cellpadding="{@cellpadding}"
+				cellspacing="{@cellspacing}" columnClasses="{@columnClasses}"
+				footerClass="{@footerClass}" headerClass="{@headerClass}"
+				rowClasses="{@rowClasses}" frame="{@frame}" rules="{@rules}"
+				class="{@styleClass}" style="{@style}" title="{tagstring()}" />
+			<vpe:resize>
+				<vpe:width width-attr="style.width" />
+				<vpe:height height-attr="style.height" />
+			</vpe:resize>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes">
+					<vpe:container-child tag-name="column" />
+				</vpe:drop>
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="BlockFormat" addChildren="deny" />
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+			<vpe:pseudoContent defaultText="yes" />
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:column" case-sensitive="yes">
+		<vpe:if
+			test="parentname()='h:dataTable'|parentname()='x:dataTable'|parentname()='t:dataTable'|parentname()='t:newspaperTable'|parentname()='t:tree'">
+<!-- Gavr --><!-- added x: 8.02.05 -->
+			<vpe:template children="yes" modify="yes">
+				<vpe:column title="{tagstring()}" />
+			</vpe:template>
+		</vpe:if>
+		<vpe:if
+			test="parentname()='rich:columnGroup'|parentname()='rich:dataTable'|parentname()='rich:orderingList'|parentname()='rich:listShuttle'">
+			<vpe:template children="yes" modify="yes"
+				namespaceIdentifier="org.jboss.tools.jsf.vpe.richfaces"
+				class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesColumnTemplate">
+			</vpe:template>
+		</vpe:if>
+	</vpe:tag>
+
+	<vpe:tag name="f:facet" case-sensitive="yes">
+		<vpe:if test="@name='popup'">
+			<vpe:template children="yes" modify="yes"></vpe:template>
+		</vpe:if>
+		<vpe:if
+			test="parentname()='h:dataTable'|parentname()='t:tree'">
+			<vpe:template children="yes" modify="yes">
+				<vpe:facet />
+			</vpe:template>
+		</vpe:if>
+		<vpe:template children="yes" modify="yes">
+			<div />
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes" />
+			</vpe:dnd>
+			<vpe:pseudoContent defaultText="yes" attrName="name" />
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="f:view" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes" haveVisualPreview="no"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfView">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes" />
+			</vpe:dnd>
+			<vpe:pseudoContent defaultText="yes" />
+			<vpe:textFormating>
+				<vpe:format type="BlockFormat" addParent="deny"
+					addChildren="allow"
+					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
+				<vpe:format type="BoldFormat" addParent="deny"
+					addChildren="allow"
+					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BoldFormatHandler" />
+				<vpe:format type="ItalicFormat" addParent="deny"
+					addChildren="allow"
+					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.ItalicFormatHandler" />
+				<vpe:format type="UnderlineFormat" addParent="deny"
+					addChildren="allow"
+					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.UnderlineFormatHandler" />
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="f:subview" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes" haveVisualPreview="no"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfSubView">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes" />
+			</vpe:dnd>
+			<vpe:pseudoContent defaultText="yes" />
+			<vpe:textFormating>
+				<vpe:format type="BlockFormat" addParent="deny"
+					addChildren="allow"
+					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
+				<vpe:format type="BoldFormat" addParent="deny"
+					addChildren="allow"
+					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BoldFormatHandler" />
+				<vpe:format type="ItalicFormat" addParent="deny"
+					addChildren="allow"
+					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.ItalicFormatHandler" />
+				<vpe:format type="UnderlineFormat" addParent="deny"
+					addChildren="allow"
+					handler="org.jboss.tools.vpe.editor.toolbar.format.handler.UnderlineFormatHandler" />
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:form" case-sensitive="yes">
+		<vpe:template children="yes" modify="yes" haveVisualPreview="no"
+			class="org.jboss.tools.jsf.vpe.jsf.template.JsfForm">
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="yes" />
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="f:attribute" case-sensitive="yes">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:param">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:phaseListener">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:phaseListener">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:setPropertyActionListener">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:valueChangeListener">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:convertDateTime">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:convertNumber">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:validator">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:validateDoubleRange">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:validateLength">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="f:validateLongRange">
+		<vpe:template children="no" modify="no" />
+	</vpe:tag>
+
+	<vpe:tag name="h:message">
+		<vpe:template children="no" modify="no">
+			<span class="{@styleClass}" style="{@style}">
+				Error Message
+			</span>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="no" />
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<vpe:tag name="h:messages">
+		<vpe:template children="no" modify="no">
+			<span class="{@styleClass}" style="{@style}">
+				Error Messages
+			</span>
+			<vpe:dnd>
+				<vpe:drag start-enable="yes" />
+				<vpe:drop container="no" />
+			</vpe:dnd>
+			<vpe:textFormating>
+				<vpe:format type="UnderlineFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BoldFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ItalicFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontNameFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="FontSizeFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="BackgroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+				<vpe:format type="ForegroundColorFormat">
+					<vpe:formatAttribute type="style" />
+				</vpe:format>
+			</vpe:textFormating>
+		</vpe:template>
+	</vpe:tag>
+
+	<!--
+		Проблема с селектированием элемента: в мозилле селектируется заголовок а не рамка
+	-->
+	<vpe:template children="yes" modify="no">
+		<vpe:any value="{name()}" title="{tagstring()}" />
+	</vpe:template>
 </vpe:templates>
\ No newline at end of file




More information about the jbosstools-commits mailing list