JBoss Tools SVN: r9940 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dsakovich
Date: 2008-08-28 08:28:20 -0400 (Thu, 28 Aug 2008)
New Revision: 9940
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/templates/vpe-templates-myfaces.xml
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml
trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/templates/vpe-templates-struts.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
trunk/vpe/plugins/org.jboss.tools.vpe.jsp/templates/vpe-templates-jsp.xml
trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd
trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/TemplateSchemeValidateTest.java
trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test1.xml
trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test2.xml
trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test3.xml
trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test4.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-1601
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j" />
<vpe:template-taglib uri="http://richfaces.org/a4j" prefix="a4j" />
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/templates/vpe-templates-facelets.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://java.sun.com/jsf/facelets" prefix="ui"/>
<vpe:tag name="ui:composition" case-sensitive="yes" >
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-08-28 10:15:38 UTC (rev 9939)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://java.sun.com/jsf/html" prefix="h" />
<vpe:template-taglib uri="http://java.sun.com/jsf/core" prefix="f" />
@@ -745,7 +746,7 @@
</vpe:tag>
<vpe:tag name="f:converter">
- <vpe:template children="no" modify="no" invisible="yes" />
+ <vpe:template children="no" modify="no" invisible="yes"/>
</vpe:tag>
<vpe:tag name="f:convertNumber">
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/templates/vpe-templates-myfaces.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/templates/vpe-templates-myfaces.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/templates/vpe-templates-myfaces.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://myfaces.apache.org/extensions" prefix="x" />
<vpe:tag name="x:checkbox" case-sensitive="yes">
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://richfaces.org/rich" prefix="rich" />
<vpe:template-taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich" />
@@ -113,8 +114,9 @@
class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesFileUploadTemplate">
<vpe:dnd>
<vpe:drag start-enable="yes" />
- <vpe:drop container="no" />
- <vpe:container-child tag-name="f:facet" />
+ <vpe:drop container="yes" >
+ <vpe:container-child tag-name="f:facet" />
+ </vpe:drop>
</vpe:dnd>
</vpe:template>
</vpe:tag>
@@ -132,9 +134,9 @@
</vpe:template>
</vpe:tag>
<vpe:tag name="rich:pickList" case-sensitive="yes">
- <vpe:copy attrs="style" />
<vpe:template children="yes" modify="yes"
class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPickListTemplate">
+ <vpe:copy attrs="style" />
<vpe:dnd>
<vpe:drag start-enable="yes" />
<vpe:drop container="yes">
@@ -401,8 +403,10 @@
<vpe:width width-attr="style.width" />
<vpe:height height-attr="style.height" />
</vpe:resize>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="yes"/>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="yes"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
@@ -412,15 +416,19 @@
<vpe:width width-attr="width" />
<vpe:height height-attr="height" />
</vpe:resize>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="no"/>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="no"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
<vpe:tag name="rich:panelBarItem" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPanelItemTemplate">
+ <vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="yes"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
@@ -430,8 +438,10 @@
<vpe:width width-attr="width" />
<vpe:height height-attr="height" />
</vpe:resize>
+ <vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="yes"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
@@ -441,15 +451,19 @@
<vpe:width width-attr="style.width" />
<vpe:height height-attr="style.height" />
</vpe:resize>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="yes"/>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="yes"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
<vpe:tag name="rich:toggleControl" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesToggleControlTemplate">
+ <vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="yes"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
@@ -459,15 +473,19 @@
<vpe:width width-attr="width" />
<vpe:height height-attr="height" />
</vpe:resize>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="no"/>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="no"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
<vpe:tag name="rich:tab" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesTabTemplate">
+ <vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="yes"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
@@ -611,7 +629,7 @@
</vpe:tag>
- <vpe:tag name="rich:insert" case-sensetive="yes">
+ <vpe:tag name="rich:insert" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesInsertTemplate">
<vpe:dnd>
<vpe:drag start-enable="yes" />
@@ -650,8 +668,10 @@
<vpe:tag name="rich:panelMenuItem" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPanelMenuItemTemplate">
+ <vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="yes"/>
+ </vpe:dnd>
<vpe:textFormatting use-default-formats="yes">
</vpe:textFormatting>
</vpe:template>
@@ -659,8 +679,10 @@
<vpe:tag name="rich:panelMenuGroup" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPanelMenuGroupTemplate">
+ <vpe:dnd>
<vpe:drag start-enable="yes"/>
<vpe:drop container="yes"/>
+ </vpe:dnd>
<vpe:textFormatting use-default-formats="yes">
</vpe:textFormatting>
</vpe:template>
@@ -672,15 +694,17 @@
<vpe:width width-attr="width" />
<vpe:height height-attr="style.height" />
</vpe:resize>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="yes"/>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="yes"/>
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
<vpe:tag name="rich:listShuttle" case-sensitive="yes">
- <vpe:copy attrs="style" />
<vpe:template children="yes" modify="yes"
class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesListShuttleTemplate">
+ <vpe:copy attrs="style" />
<vpe:dnd>
<vpe:drag start-enable="yes" />
<vpe:drop container="yes">
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://jboss.com/products/seam/taglib"
prefix="s" />
Modified: trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/templates/vpe-templates-struts.xml
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/templates/vpe-templates-struts.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/templates/vpe-templates-struts.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://struts.apache.org/tags-html"
prefix="html" />
<vpe:template-taglib
@@ -288,7 +289,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:tag>
@@ -319,7 +320,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:if>
<vpe:template children="no" modify="yes">
@@ -333,7 +334,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:if>
<vpe:template children="no" modify="yes">
@@ -347,7 +348,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:tag>
@@ -364,7 +365,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="yes" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:tag>
@@ -382,7 +383,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:if>
<vpe:template children="no" modify="yes">
@@ -396,7 +397,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:if>
<vpe:template children="no" modify="yes">
@@ -410,7 +411,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:tag>
@@ -428,7 +429,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:if>
<vpe:template children="no" modify="yes">
@@ -442,7 +443,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:tag>
@@ -461,7 +462,7 @@
<vpe:drag start-enable="yes" />
<vpe:drop container="no" />
</vpe:dnd>
- <textFormatting use-default-formats="yes"/>
+ <vpe:textFormatting use-default-formats="yes"/>
</vpe:template>
</vpe:tag>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/docbook.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates>
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--vpe:template-taglib uri="-//OASIS//DTD DocBook XML V4.3CR3//EN"/-->
<vpe:tag name="chapter" case-sensitive="yes">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/templates/xinclude.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates>
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:template-taglib uri="http://www.w3.org/2001/XInclude" prefix="xi" />
<vpe:tag name="xi:include" case-sensitive="yes">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:tag name="a" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:a class="{@class}" style="{@style}"/>
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/templates/vpe-templates-jsp.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/templates/vpe-templates-jsp.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/templates/vpe-templates-jsp.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<vpe:tag name="jsp:declaration" case-sensitive="yes">
<vpe:template children="no" modify="no">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/scheme/scheme.xsd 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,516 +1,562 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/2001/XMLSchema-instance" xmlns:vpe="http://www.w3.org/2001/XMLSchema-instance">
- <xs:element name="templates">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="vpe:template-taglib"/>
- <xs:element maxOccurs="unbounded" ref="vpe:tag"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="template-taglib">
- <xs:complexType>
- <xs:attribute name="prefix" use="required" type="xs:NCName"/>
- <xs:attribute name="uri" use="required" type="xs:anyURI"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="tag">
- <xs:complexType>
- <xs:sequence>
- <xs:choice>
- <xs:element ref="vpe:copy"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="vpe:if"/>
- </xs:choice>
- <xs:element minOccurs="0" ref="vpe:template"/>
- </xs:sequence>
- <xs:attribute name="case-sensetive" type="xs:NCName"/>
- <xs:attribute name="case-sensitive" type="xs:NCName"/>
- <xs:attribute name="haveVisualPreview" type="xs:NCName"/>
- <xs:attribute name="name" use="required" type="xs:anyURI"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="copy">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" ref="vpe:attribute"/>
- </xs:sequence>
- <xs:attribute name="attrs"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="attribute">
- <xs:complexType>
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- <xs:attribute name="value" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="if">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="vpe:if"/>
- <xs:element minOccurs="0" ref="vpe:template"/>
- <xs:element minOccurs="0" ref="vpe:textFormatting"/>
- </xs:sequence>
- <xs:attribute name="test" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="template">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="span" form="unqualified">
- <xs:complexType mixed="true">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:group ref="vpe:input"/>
- <xs:element ref="vpe:value"/>
- </xs:choice>
- <xs:attribute name="class"/>
- <xs:attribute name="dir"/>
- <xs:attribute name="style" type="xs:anyURI"/>
- <xs:attribute name="title"/>
- </xs:complexType>
- </xs:element>
- <xs:choice minOccurs="0">
- <xs:element ref="vpe:jsproot"/>
- <xs:element ref="vpe:taglib"/>
- </xs:choice>
- <xs:choice minOccurs="0">
- <xs:element name="button" form="unqualified">
- <xs:complexType mixed="true">
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="vpe:value"/>
- </xs:sequence>
- <xs:attribute name="class" use="required"/>
- <xs:attribute name="style" use="required"/>
- <xs:attribute name="title" use="required"/>
- <xs:attribute name="value"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="label" form="unqualified">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="vpe:value"/>
- </xs:sequence>
- <xs:attribute name="class" use="required"/>
- <xs:attribute name="for" use="required"/>
- <xs:attribute name="style" use="required"/>
- <xs:attribute name="title" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:element minOccurs="0" ref="vpe:grid"/>
- <xs:choice minOccurs="0">
- <xs:group ref="vpe:td"/>
- <xs:element ref="vpe:copy"/>
- <xs:element ref="vpe:panelgrid"/>
- </xs:choice>
- <xs:choice minOccurs="0">
- <xs:group ref="vpe:option"/>
- <xs:element ref="vpe:style"/>
- </xs:choice>
- <xs:choice minOccurs="0">
- <xs:group ref="vpe:textarea"/>
- <xs:element name="nobr" form="unqualified">
- <xs:complexType>
- <xs:choice>
- <xs:element ref="vpe:value"/>
- <xs:group maxOccurs="unbounded" ref="vpe:input"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:choice minOccurs="0">
- <xs:element ref="vpe:any"/>
- <xs:element ref="vpe:load-bundle"/>
- </xs:choice>
- <xs:element minOccurs="0" name="img" form="unqualified">
- <xs:complexType>
- <xs:attribute name="alt"/>
- <xs:attribute name="border"/>
- <xs:attribute name="class"/>
- <xs:attribute name="height"/>
- <xs:attribute name="src" use="required"/>
- <xs:attribute name="style"/>
- <xs:attribute name="title"/>
- <xs:attribute name="width"/>
- </xs:complexType>
- </xs:element>
- <xs:choice minOccurs="0">
- <xs:element ref="vpe:column"/>
- <xs:element ref="vpe:link"/>
- </xs:choice>
- <xs:group minOccurs="0" ref="vpe:select"/>
- <xs:element minOccurs="0" ref="vpe:panellayout"/>
- <xs:element minOccurs="0" ref="vpe:a"/>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:group ref="vpe:div"/>
- <xs:group ref="vpe:input"/>
- <xs:element ref="vpe:datatable"/>
- <xs:element ref="vpe:dnd"/>
- <xs:element ref="vpe:resize"/>
- </xs:choice>
- <xs:choice minOccurs="0">
- <xs:group ref="vpe:table"/>
- <xs:element name="textFormatting" form="unqualified">
- <xs:complexType>
- <xs:attribute name="use-default-formats" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:choice minOccurs="0">
- <xs:element ref="vpe:breaker"/>
- <xs:element ref="vpe:list"/>
- <xs:sequence>
- <xs:element ref="vpe:drag"/>
- <xs:element ref="vpe:drop"/>
- </xs:sequence>
- </xs:choice>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="vpe:textFormatting"/>
- <xs:element ref="vpe:pseudoContent"/>
- </xs:choice>
- </xs:sequence>
- <xs:attribute name="children" type="xs:NCName"/>
- <xs:attribute name="class"/>
- <xs:attribute name="file"/>
- <xs:attribute name="hasImaginaryBorder" type="xs:NCName"/>
- <xs:attribute name="modify" type="xs:NCName"/>
- <xs:attribute name="namespaceIdentifier"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="jsproot">
- <xs:complexType/>
- </xs:element>
- <xs:element name="taglib">
- <xs:complexType/>
- </xs:element>
- <xs:element name="grid">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" ref="vpe:value"/>
- <xs:group minOccurs="0" ref="vpe:input"/>
- </xs:sequence>
- <xs:attribute name="border"/>
- <xs:attribute name="class"/>
- <xs:attribute name="disabled" type="xs:boolean"/>
- <xs:attribute name="layout"/>
- <xs:attribute name="style"/>
- <xs:attribute name="title" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="panelgrid">
- <xs:complexType>
- <xs:attribute name="bgcolor" use="required"/>
- <xs:attribute name="border" use="required"/>
- <xs:attribute name="captionClass" use="required"/>
- <xs:attribute name="captionStyle" use="required"/>
- <xs:attribute name="cellpadding" use="required"/>
- <xs:attribute name="cellspacing" use="required"/>
- <xs:attribute name="class" use="required"/>
- <xs:attribute name="columnClasses" use="required"/>
- <xs:attribute name="dir" use="required"/>
- <xs:attribute name="footerClass" use="required"/>
- <xs:attribute name="frame" use="required"/>
- <xs:attribute name="headerClass" use="required"/>
- <xs:attribute name="rowClasses" use="required"/>
- <xs:attribute name="rules" use="required"/>
- <xs:attribute name="style" use="required"/>
- <xs:attribute name="table-size" use="required"/>
- <xs:attribute name="title" use="required"/>
- <xs:attribute name="width" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="style">
- <xs:complexType/>
- </xs:element>
- <xs:element name="any">
- <xs:complexType>
- <xs:attribute name="display" use="required" type="xs:NCName"/>
- <xs:attribute name="title" use="required"/>
- <xs:attribute name="value" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="load-bundle">
- <xs:complexType/>
- </xs:element>
- <xs:element name="column">
- <xs:complexType>
- <xs:attribute name="title" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="link">
- <xs:complexType>
- <xs:attribute name="href" use="required"/>
- <xs:attribute name="rel" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="panellayout">
- <xs:complexType/>
- </xs:element>
- <xs:element name="a">
- <xs:complexType>
- <xs:attribute name="class" use="required"/>
- <xs:attribute name="dir"/>
- <xs:attribute name="style" use="required"/>
- <xs:attribute name="title" use="optional"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="datatable">
- <xs:complexType>
- <xs:attribute name="bgcolor" use="required"/>
- <xs:attribute name="border" use="required"/>
- <xs:attribute name="cellpadding" use="required"/>
- <xs:attribute name="cellspacing" use="required"/>
- <xs:attribute name="class" use="required"/>
- <xs:attribute name="columnClasses" use="required"/>
- <xs:attribute name="dir"/>
- <xs:attribute name="footerClass" use="required"/>
- <xs:attribute name="frame" use="required"/>
- <xs:attribute name="headerClass" use="required"/>
- <xs:attribute name="height"/>
- <xs:attribute name="rowClasses" use="required"/>
- <xs:attribute name="rules" use="required"/>
- <xs:attribute name="style" use="required"/>
- <xs:attribute name="title" use="required"/>
- <xs:attribute name="width"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="dnd">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" ref="vpe:drag"/>
- <xs:element minOccurs="0" ref="vpe:drop"/>
- <xs:element minOccurs="0" ref="vpe:container-child"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="resize">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="vpe:width"/>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="vpe:height"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="width">
- <xs:complexType>
- <xs:attribute name="disable-absolute-position" type="xs:NCName"/>
- <xs:attribute name="width-attr" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="height">
- <xs:complexType>
- <xs:attribute name="disable-absolute-position" type="xs:NCName"/>
- <xs:attribute name="height-attr" use="required" type="xs:NCName"/>
- <xs:attribute name="tag-xpath" type="xs:NCName"/>
- <xs:attribute name="test"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="breaker">
- <xs:complexType>
- <xs:attribute name="type" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="list">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="vpe:value"/>
- </xs:sequence>
- <xs:attribute name="class" use="required"/>
- <xs:attribute name="ordered" use="required"/>
- <xs:attribute name="style" use="required"/>
- <xs:attribute name="title" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="pseudoContent">
- <xs:complexType>
- <xs:attribute name="attrName" type="xs:NCName"/>
- <xs:attribute name="defaultText" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="textFormatting">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="vpe:format"/>
- </xs:sequence>
- <xs:attribute name="use-default-formats" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="format">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" ref="vpe:formatAttribute"/>
- </xs:sequence>
- <xs:attribute name="addChildren" type="xs:NCName"/>
- <xs:attribute name="addParent" type="xs:NCName"/>
- <xs:attribute name="handler"/>
- <xs:attribute name="setDefault" type="xs:boolean"/>
- <xs:attribute name="type" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="formatAttribute">
- <xs:complexType>
- <xs:attribute name="type" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:group name="input">
- <xs:sequence>
- <xs:element name="input" form="unqualified">
- <xs:complexType>
- <xs:attribute name="border"/>
- <xs:attribute name="checked"/>
- <xs:attribute name="class"/>
- <xs:attribute name="dir"/>
- <xs:attribute name="disabled" type="xs:NCName"/>
- <xs:attribute name="size"/>
- <xs:attribute name="src"/>
- <xs:attribute name="style"/>
- <xs:attribute name="title"/>
- <xs:attribute name="type"/>
- <xs:attribute name="value"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:element name="value">
- <xs:complexType>
- <xs:attribute name="expr" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:group name="td">
- <xs:sequence>
- <xs:element name="td" form="unqualified">
- <xs:complexType mixed="true">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="vpe:value"/>
- <xs:element name="a" form="unqualified">
- <xs:complexType mixed="true">
- <xs:attribute name="href" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:attribute name="class"/>
- <xs:attribute name="colspan" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:group name="option">
- <xs:sequence>
- <xs:element name="option" form="unqualified">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" ref="vpe:value"/>
- </xs:sequence>
- <xs:attribute name="title"/>
- <xs:attribute name="value" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:group name="textarea">
- <xs:sequence>
- <xs:element name="textarea" form="unqualified">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="vpe:value"/>
- </xs:sequence>
- <xs:attribute name="class" use="required"/>
- <xs:attribute name="cols"/>
- <xs:attribute name="disabled" type="xs:boolean"/>
- <xs:attribute name="rows" use="required"/>
- <xs:attribute name="style" use="required"/>
- <xs:attribute name="title" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:group name="select">
- <xs:sequence>
- <xs:element name="select" form="unqualified">
- <xs:complexType>
- <xs:choice minOccurs="0">
- <xs:group ref="vpe:option"/>
- <xs:element ref="vpe:value"/>
- </xs:choice>
- <xs:attribute name="class"/>
- <xs:attribute name="dir"/>
- <xs:attribute name="disabled" type="xs:boolean"/>
- <xs:attribute name="multiple" type="xs:NCName"/>
- <xs:attribute name="size"/>
- <xs:attribute name="style"/>
- <xs:attribute name="title"/>
- <xs:attribute name="value"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:element name="drag">
- <xs:complexType>
- <xs:attribute name="start-enable" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="drop">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" ref="vpe:container-child"/>
- </xs:sequence>
- <xs:attribute name="container" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="container-child">
- <xs:complexType>
- <xs:attribute name="tag-name" use="required" type="xs:anyURI"/>
- </xs:complexType>
- </xs:element>
- <xs:group name="div">
- <xs:sequence>
- <xs:element name="div" form="unqualified">
- <xs:complexType mixed="true">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:group ref="vpe:div"/>
- <xs:group ref="vpe:input"/>
- <xs:group ref="vpe:select"/>
- <xs:group ref="vpe:table"/>
- <xs:group ref="vpe:textarea"/>
- <xs:element ref="vpe:value"/>
- <xs:element name="b" form="unqualified">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="vpe:value"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:choice>
- <xs:attribute name="action"/>
- <xs:attribute name="bgcolor"/>
- <xs:attribute name="border"/>
- <xs:attribute name="class"/>
- <xs:attribute name="cols"/>
- <xs:attribute name="onclick"/>
- <xs:attribute name="rendered"/>
- <xs:attribute name="rows"/>
- <xs:attribute name="size"/>
- <xs:attribute name="style"/>
- <xs:attribute name="title"/>
- <xs:attribute name="width"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:group>
- <xs:group name="table">
- <xs:sequence>
- <xs:element name="table" form="unqualified">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" maxOccurs="unbounded" name="tr" form="unqualified">
- <xs:complexType>
- <xs:group maxOccurs="unbounded" ref="vpe:td"/>
- <xs:attribute name="class"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="cellspacing" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:group>
-</xs:schema>
+<!--
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+-->
+<xsd:schema
+ targetNamespace="http://org.jboss.org/tools/vpe/template"
+ xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ version="1.0.0"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified">
+
+<!-- -->
+ <xsd:element name="templates" type="vpe:TEMPLATES"/>
+
+
+<!-- -->
+ <xsd:complexType name="TEMPLATES">
+ <xsd:sequence>
+ <xsd:element minOccurs="0" maxOccurs="unbounded" name="template-taglib" type="vpe:TEMPLATE-TAGLIB"/>
+ <xsd:element maxOccurs="unbounded" name="tag" type="vpe:TAG"/>
+ </xsd:sequence>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="TAG">
+ <xsd:sequence>
+ <xsd:element name="if" type="vpe:IF" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="template" type="vpe:TEMPLATE" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="case-sensitive" type="vpe:VPE-BOOLEAN" use="optional"/>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="haveVisualPreview" use="optional" type="vpe:VPE-BOOLEAN"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="TEMPLATE">
+ <xsd:choice maxOccurs="unbounded">
+ <!-- HTML tags -->
+ <xsd:element minOccurs="0" name="nobr" type="vpe:HTML_NOBR" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="span" type="vpe:HTML_SPAN" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="input" type="vpe:HTML_INPUT" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="div" type="vpe:HTML_DIV" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="img" type="vpe:HTML_IMG" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="select" type="vpe:HTML_SELECT" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="option" type="vpe:HTML_OPTION" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="table" type="vpe:HTML_TABLE" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="textarea" type="vpe:HTML_TEXTAREA" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="td" type="vpe:HTML_TD" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="label" type="vpe:HTML_LABEL" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="button" type="vpe:HTML_BUTTON" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="tr" type="vpe:HTML_TR" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h0" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h1" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h2" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h3" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h4" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h5" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h6" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="hr" type="vpe:HTML_HR" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="a" type="vpe:HTML_A" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="p" type="vpe:HTML_P" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="ul" type="vpe:HTML_UL" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="li" type="vpe:HTML_LI" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="pre" type="vpe:HTML_PRE" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="em" type="vpe:HTML_EM" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="i" type="vpe:HTML_I" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="ol" type="vpe:HTML_OL" form="unqualified" maxOccurs="unbounded"/>
+
+ <!-- VPE tags -->
+ <xsd:element minOccurs="0" name="panellayout" type="vpe:PANELLAYOT"/>
+ <xsd:element minOccurs="0" name="list" type="vpe:LIST"/>
+ <xsd:element minOccurs="0" name="datatable" type="vpe:DATATABLE"/>
+ <xsd:element minOccurs="0" name="grid" type="vpe:GRID"/>
+ <xsd:element minOccurs="0" name="panelgrid" type="vpe:PANELGRID"/>
+ <xsd:element minOccurs="0" name="column" type="vpe:COLUMN"/>
+ <xsd:element minOccurs="0" name="a" type="vpe:A" />
+ <xsd:element minOccurs="0" name="any" type="vpe:ANY"/>
+ <xsd:element minOccurs="0" name="copy" type="vpe:COPY"/>
+ <xsd:element minOccurs="0" name="taglib" type="vpe:TAGLIB"/>
+ <xsd:element minOccurs="0" name="jsproot" type="vpe:JSPROOT"/>
+ <xsd:element minOccurs="0" name="resize" type="vpe:RESIZE"/>
+ <xsd:element minOccurs="0" name="dnd" type="vpe:DND"/>
+ <xsd:element minOccurs="0" name="load-bundle" type="vpe:LOAD-BUNDLE"/>
+ <xsd:element minOccurs="0" name="link" type="vpe:LINK"/>
+ <xsd:element minOccurs="0" name="textFormatting" type="vpe:TEXT-FORMATING" />
+ <xsd:element minOccurs="0" name="pseudoContent" type="vpe:PSEUDO-CONTENT"/>
+ <xsd:element minOccurs="0" name="style" type="vpe:STYLE" />
+ <xsd:element minOccurs="0" name="breaker" type="vpe:BREAKER" />
+ <xsd:element minOccurs="0" name="facet" type="vpe:FACET" />
+ </xsd:choice>
+ <xsd:attribute name="children" type="vpe:VPE-BOOLEAN"/>
+ <xsd:attribute name="modify" type="vpe:VPE-BOOLEAN"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional" />
+ <xsd:attribute name="file" type="xsd:string" use="optional"/>
+ <xsd:attribute name="namespaceIdentifier" type="xsd:string" use="optional"/>
+ <xsd:attribute name="invisible" type="vpe:VPE-BOOLEAN" use="optional"/>
+ <xsd:attribute name="hasImaginaryBorder" type="vpe:VPE-BOOLEAN" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+
+ <xsd:complexType name="ATTRIBUTE">
+ <xsd:attribute name="name" use="required" type="xsd:NCName"/>
+ <xsd:attribute name="value" use="required" type="xsd:string"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="TEMPLATE-TAGLIB">
+ <xsd:attribute name="prefix" use="required" type="xsd:NCName"/>
+ <xsd:attribute name="uri" use="required" type="xsd:anyURI"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="RESIZE">
+ <xsd:choice maxOccurs="unbounded" >
+ <xsd:element minOccurs="0" name="height" type="vpe:HEIGHT"/>
+ <xsd:element minOccurs="0" name="width" type="vpe:WIDTH"/>
+ </xsd:choice>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="WIDTH">
+ <xsd:attribute name="width-attr" use="required" type="xsd:string"/>
+ <xsd:attribute name="disable-absolute-position" use="optional" type="vpe:VPE-BOOLEAN"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HEIGHT">
+ <xsd:attribute name="height-attr" use="required" type="xsd:string"/>
+ <xsd:attribute name="tag-xpath" use="optional" type="xsd:string"/>
+ <xsd:attribute name="test" use="optional" type="xsd:string"/>
+ <xsd:attribute name="disable-absolute-position" use="optional" type="vpe:VPE-BOOLEAN"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="DRAG" >
+ <xsd:attribute name="start-enable" use="required" type="vpe:VPE-BOOLEAN" />
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="DROP">
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="container-child" type="vpe:CONTAINER-CHILD"/>
+ </xsd:sequence>
+ <xsd:attribute name="container" use="required" type="vpe:VPE-BOOLEAN"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="DND">
+ <xsd:sequence>
+ <xsd:element name="drag" type="vpe:DRAG" minOccurs="0"/>
+ <xsd:element name="drop" type="vpe:DROP" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="COPY">
+ <xsd:sequence>
+ <xsd:element name="attribute" type="vpe:ATTRIBUTE" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="attrs" type="xsd:string" />
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="CONTAINER-CHILD" >
+ <xsd:attribute name="tag-name" use="required" type="xsd:string"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="LOAD-BUNDLE"/>
+<!-- -->
+ <xsd:complexType name="LINK">
+ <xsd:attribute name="rel" type="xsd:string" use="required"/>
+ <xsd:attribute name="href" type="xsd:string" use="required"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="IF">
+ <xsd:sequence>
+ <xsd:element name="if" type="vpe:IF" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="template" type="vpe:TEMPLATE" minOccurs="0"/>
+ <xsd:element name="textFormatting" type="vpe:TEXT-FORMATING" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="test" use="required" type="xsd:string"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="A">
+ <xsd:attribute name="style" use="required" type="xsd:string"/>
+ <xsd:attribute name="class" use="required" type="xsd:string"/>
+ <xsd:attribute name="dir" use="optional" type="xsd:string"/>
+ <xsd:attribute name="title" use="optional" type="xsd:string"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="TEXT-FORMATING">
+ <xsd:sequence>
+ <xsd:element name="format" minOccurs="0" maxOccurs="unbounded" type="vpe:FORMAT"/>
+ </xsd:sequence>
+ <xsd:attribute name="use-default-formats" type="vpe:VPE-BOOLEAN" use="optional"/>
+ </xsd:complexType>
+ <!-- -->
+ <xsd:complexType name="FORMAT">
+ <xsd:sequence>
+ <xsd:element name="formatAttribute" minOccurs="0" type="vpe:FORMAT-ATTRIBUTE"/>
+ </xsd:sequence>
+ <xsd:attribute name="type" type="vpe:FORMAT-TYPE" use="required"/>
+ <xsd:attribute name="addChildren" type="vpe:CHILDREN-FORMAT" use="optional"/>
+ <xsd:attribute name="addParent" type="vpe:CHILDREN-FORMAT" use="optional"/>
+ <xsd:attribute name="setDefault" type="xsd:boolean" use="optional"/>
+ <xsd:attribute name="handler" type="xsd:string" use="optional" />
+ </xsd:complexType>
+ <!-- -->
+ <xsd:complexType name="FORMAT-ATTRIBUTE">
+ <xsd:attribute name="type" type="xsd:string" use="required"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="PSEUDO-CONTENT">
+ <xsd:attribute name="defaultText" type="vpe:VPE-BOOLEAN" use="optional"/>
+ <xsd:attribute name="attrName" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="STYLE"/>
+<!-- -->
+ <xsd:complexType name="BREAKER">
+ <xsd:attribute name="type" use="required" type="xsd:string"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="FACET"/>
+<!-- -->
+ <xsd:complexType name="PANELGRID">
+ <xsd:attribute name="bgcolor" use="optional"/>
+ <xsd:attribute name="border" use="optional"/>
+ <xsd:attribute name="captionClass" use="optional"/>
+ <xsd:attribute name="captionStyle" use="optional"/>
+ <xsd:attribute name="cellpadding" use="optional"/>
+ <xsd:attribute name="cellspacing" use="optional"/>
+ <xsd:attribute name="class" use="optional"/>
+ <xsd:attribute name="columnClasses" use="optional"/>
+ <xsd:attribute name="dir" use="optional"/>
+ <xsd:attribute name="footerClass" use="optional"/>
+ <xsd:attribute name="frame" use="optional"/>
+ <xsd:attribute name="headerClass" use="optional"/>
+ <xsd:attribute name="rowClasses" use="optional"/>
+ <xsd:attribute name="rules" use="optional"/>
+ <xsd:attribute name="style" use="optional"/>
+ <xsd:attribute name="table-size" use="optional"/>
+ <xsd:attribute name="title" use="optional"/>
+ <xsd:attribute name="width" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="DATATABLE">
+ <xsd:attribute name="bgcolor" use="optional"/>
+ <xsd:attribute name="border" use="optional"/>
+ <xsd:attribute name="cellpadding" use="optional"/>
+ <xsd:attribute name="cellspacing" use="optional"/>
+ <xsd:attribute name="class" use="optional"/>
+ <xsd:attribute name="columnClasses" use="optional"/>
+ <xsd:attribute name="dir" use="optional"/>
+ <xsd:attribute name="footerClass" use="optional"/>
+ <xsd:attribute name="frame" use="optional"/>
+ <xsd:attribute name="headerClass" use="optional"/>
+ <xsd:attribute name="height" use="optional"/>
+ <xsd:attribute name="rowClasses" use="optional"/>
+ <xsd:attribute name="rules" use="optional"/>
+ <xsd:attribute name="style" use="optional"/>
+ <xsd:attribute name="title" use="optional"/>
+ <xsd:attribute name="width" use="optional"/>
+ </xsd:complexType>
+ <!-- -->
+ <xsd:complexType name="COLUMN">
+ <xsd:attribute name="title" use="optional" type="xsd:string" />
+ </xsd:complexType>
+ <!-- -->
+ <xsd:complexType name="ANY">
+ <xsd:attribute name="value" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="display" type="xsd:string" use="optional"/>
+ <xsd:attribute name="icon" type="vpe:VPE-BOOLEAN" use="optional"/>
+ <xsd:attribute name="background-color" type="xsd:string" use="optional"/>
+ <xsd:attribute name="border" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="TAGLIB"/>
+<!-- -->
+ <xsd:complexType name="JSPROOT" />
+<!-- -->
+ <xsd:complexType name="GRID">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="input" type="vpe:HTML_INPUT" minOccurs="0" form="unqualified"/>
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ </xsd:choice>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="disabled" use="optional" type="xsd:boolean"/>
+ <xsd:attribute name="layout" type="xsd:string" use="optional"/>
+ <xsd:attribute name="border" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+ <!-- -->
+ <xsd:complexType name="VALUE">
+ <xsd:attribute name="expr" use="required" type="xsd:string"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="LIST">
+ <xsd:sequence>
+ <xsd:element minOccurs="0" name="value" type="vpe:VALUE" />
+ </xsd:sequence>
+ <xsd:attribute name="style" use="optional" type="xsd:string" />
+ <xsd:attribute name="class" use="optional" type="xsd:string" />
+ <xsd:attribute name="ordered" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional" />
+ </xsd:complexType>
+ <!-- -->
+ <xsd:complexType name="PANELLAYOT"/>
+<!-- -->
+ <xsd:complexType name="HTML_NOBR">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ <xsd:element name="input" type="vpe:HTML_INPUT" minOccurs="0" form="unqualified"/>
+ <xsd:element name="copy" type="vpe:COPY" minOccurs="0"/>
+ </xsd:choice>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_SPAN" mixed="true">
+ <xsd:choice maxOccurs="unbounded">
+
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ <xsd:element name="copy" type="vpe:COPY" minOccurs="0"/>
+ <xsd:element name="input" type="vpe:HTML_INPUT" minOccurs="0" form="unqualified" />
+ </xsd:choice>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="dir" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_INPUT">
+ <xsd:attribute name="type" type="xsd:string" use="optional"/>
+ <xsd:attribute name="value" type="xsd:string" use="optional"/>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="src" type="xsd:string" use="optional"/>
+ <xsd:attribute name="size" type="xsd:string" use="optional"/>
+ <xsd:attribute name="dir" type="xsd:string" use="optional"/>
+ <xsd:attribute name="checked" type="xsd:string" use="optional"/>
+ <xsd:attribute name="border" type="xsd:string" use="optional"/>
+ <xsd:attribute name="disabled" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_DIV" mixed="true">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="select" minOccurs="0" type="vpe:HTML_SELECT" form="unqualified"/>
+ <xsd:element name="input" type="vpe:HTML_INPUT" form="unqualified"/>
+ <xsd:element name="div" minOccurs="0" type="vpe:HTML_DIV" form="unqualified"/>
+ <xsd:element name="table" minOccurs="0" type="vpe:HTML_TABLE" form="unqualified"/>
+ <xsd:element name="b" minOccurs="0" type="vpe:HTML_B" form="unqualified"/>
+ <xsd:element name="textarea" minOccurs="0" type="vpe:HTML_TEXTAREA" form="unqualified"/>
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ <xsd:element minOccurs="0" name="h0" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h1" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h2" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h3" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h4" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h5" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="h6" type="vpe:HTML_H" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="img" type="vpe:HTML_IMG" form="unqualified" maxOccurs="unbounded"/>
+ <xsd:element minOccurs="0" name="hr" type="vpe:HTML_HR" form="unqualified" maxOccurs="unbounded"/>
+
+
+ </xsd:choice>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="action" type="xsd:string" use="optional"/>
+ <xsd:attribute name="size" type="xsd:string" use="optional"/>
+ <xsd:attribute name="rows" type="xsd:string" use="optional"/>
+ <xsd:attribute name="cols" type="xsd:string" use="optional"/>
+ <xsd:attribute name="onclick" type="xsd:string" use="optional"/>
+ <xsd:attribute name="rendered" type="xsd:string" use="optional"/>
+ <xsd:attribute name="width" type="xsd:string" use="optional"/>
+ <xsd:attribute name="border" type="xsd:string" use="optional"/>
+ <xsd:attribute name="bgcolor" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_IMG">
+ <xsd:attribute name="src" type="xsd:string" use="optional"/>
+ <xsd:attribute name="width" type="xsd:string" use="optional"/>
+ <xsd:attribute name="height" type="xsd:string" use="optional"/>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="alt" type="xsd:string" use="optional"/>
+ <xsd:attribute name="border" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_SELECT">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="option" type="vpe:HTML_OPTION" minOccurs="0" form="unqualified"/>
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ </xsd:choice>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="multiple" type="xsd:string" use="optional"/>
+ <xsd:attribute name="size" type="xsd:string" use="optional"/>
+ <xsd:attribute name="dir" type="xsd:string" use="optional"/>
+ <xsd:attribute name="disabled" type="xsd:string" use="optional"/>
+ <xsd:attribute name="value" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_OPTION">
+ <xsd:sequence>
+ <xsd:element name="value" minOccurs="0" type="vpe:VALUE" />
+ </xsd:sequence>
+ <xsd:attribute name="value" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_TABLE">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="tr" type="vpe:HTML_TR" minOccurs="0" form="unqualified" />
+ </xsd:choice>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="cellpadding" type="xsd:string" use="optional"/>
+ <xsd:attribute name="cellspacing" type="xsd:string" use="optional"/>
+ <xsd:attribute name="border" type="xsd:string" use="optional"/>
+ <xsd:attribute name="align" type="xsd:string" use="optional"/>
+ <xsd:attribute name="valign" type="xsd:string" use="optional"/>
+ <xsd:attribute name="width" type="xsd:string" use="optional"/>
+ <xsd:attribute name="height" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_TR">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="td" minOccurs="0" type="vpe:HTML_TD" form="unqualified"/>
+ </xsd:choice>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="height" type="xsd:string" use="optional"/>
+ <xsd:attribute name="align" type="xsd:string" use="optional"/>
+ <xsd:attribute name="valign" type="xsd:string" use="optional"/>
+ <xsd:attribute name="width" type="xsd:string" use="optional"/>
+ <xsd:attribute name="rowspan" type="xsd:string" use="optional"/>
+ <xsd:attribute name="nowrap" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_TD" mixed="true">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="a" type="vpe:HTML_A" minOccurs="0" form="unqualified"/>
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ </xsd:choice>
+ <xsd:attribute name="colspan" type="xsd:string" use="optional"/>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="height" type="xsd:string" use="optional"/>
+ <xsd:attribute name="align" type="xsd:string" use="optional"/>
+ <xsd:attribute name="valign" type="xsd:string" use="optional"/>
+ <xsd:attribute name="width" type="xsd:string" use="optional"/>
+ <xsd:attribute name="rowspan" type="xsd:string" use="optional"/>
+ <xsd:attribute name="nowrap" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_A" mixed="true">
+ <xsd:attribute name="href" type="xsd:string" use="optional"/>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_B">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="value" minOccurs="0" type="vpe:VALUE" />
+ </xsd:choice>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_TEXTAREA">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="value" minOccurs="0" type="vpe:VALUE"/>
+ </xsd:choice>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="disabled" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ <xsd:attribute name="rows" type="xsd:string" use="optional"/>
+ <xsd:attribute name="cols" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_LABEL">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="a" type="vpe:HTML_A" minOccurs="0" form="unqualified"/>
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ </xsd:choice>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="for" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_BUTTON" mixed="true">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ </xsd:choice>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ <xsd:attribute name="value" type="xsd:string" use="optional"/>
+ <xsd:attribute name="title" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_H">
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="value" type="vpe:VALUE" minOccurs="0"/>
+ </xsd:choice>
+ <xsd:attribute name="align" type="xsd:string" use="optional"/>
+ <xsd:attribute name="style" type="xsd:string" use="optional"/>
+ <xsd:attribute name="class" type="xsd:string" use="optional"/>
+ </xsd:complexType>
+ <!-- -->
+ <xsd:complexType name="HTML_HR">
+ <xsd:attribute name="align" use="optional" type="xsd:string"/>
+ <xsd:attribute name="width" use="optional" type="xsd:string"/>
+ <xsd:attribute name="title" use="optional" type="xsd:string"/>
+ </xsd:complexType>
+<!-- -->
+ <xsd:complexType name="HTML_OL"/>
+<!-- -->
+ <xsd:complexType name="HTML_I"/>
+<!-- -->
+ <xsd:complexType name="HTML_EM"/>
+<!-- -->
+ <xsd:complexType name="HTML_PRE"/>
+<!-- -->
+ <xsd:complexType name="HTML_LI"/>
+<!-- -->
+ <xsd:complexType name="HTML_UL"/>
+<!-- -->
+ <xsd:complexType name="HTML_P"/>
+
+<!-- VPE types -->
+ <xsd:simpleType name="CHILDREN-FORMAT">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="deny"/>
+ <xsd:enumeration value="allow"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+<!-- -->
+ <xsd:simpleType name="FORMAT-TYPE">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="BlockFormat"/>
+ <xsd:enumeration value="UnderlineFormat"/>
+ <xsd:enumeration value="BoldFormat"/>
+ <xsd:enumeration value="ItalicFormat"/>
+ <xsd:enumeration value="FontNameFormat"/>
+ <xsd:enumeration value="FontSizeFormat"/>
+ <xsd:enumeration value="BackgroundColorFormat"/>
+ <xsd:enumeration value="ForegroundColorFormat"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+<!-- -->
+ <xsd:simpleType name="VPE-BOOLEAN">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="yes"/>
+ <xsd:enumeration value="no"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+<!-- -->
+</xsd:schema>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/TemplateSchemeValidateTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/TemplateSchemeValidateTest.java 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/src/org/jboss/tools/vpe/test/TemplateSchemeValidateTest.java 2008-08-28 12:28:20 UTC (rev 9940)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.test;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
@@ -26,17 +27,26 @@
import junit.framework.TestCase;
+import org.eclipse.core.internal.registry.ExtensionRegistry;
+import org.eclipse.core.runtime.ContributorFactoryOSGi;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IContributor;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.jboss.tools.common.reporting.IProblemReporter;
+import org.jboss.tools.common.reporting.ProblemReporterFactory;
import org.jboss.tools.vpe.VpePlugin;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.osgi.framework.Bundle;
import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
/**
* JUnit Test for scheme validate template
@@ -49,69 +59,176 @@
*/
private static final String COM_REDHAT_VPE_TEMPLATES = "org.jboss.tools.vpe.templates";
+ private static final String VPE_TEST_EXTENSION = "org.jboss.tools.vpe.test";
+
private static final String SCHEME_PATH = "/scheme/scheme.xsd";
+ private static final String PLUGIN_FAILURE_NAME = "testFailure-plugin.xml";
+
+ private static Schema schema = null;
+
+ private static final String PLUGIN_OK_NAME = "testOk-plugin.xml";
+
+ private static final String SCHEME_LANGUAGE = "http://www.w3.org/2001/XMLSchema";
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ Bundle bundle = VpeTestPlugin.getDefault().getBundle();
+ URL url = null;
+ url = bundle == null ? null : FileLocator.resolve(bundle
+ .getEntry(SCHEME_PATH));
+ File schemeFile = new File(url.getPath());
+ if (!schemeFile.exists() || !schemeFile.isFile()) {
+ fail("scheme is not exist");
+ }
+ SchemaFactory factory = SchemaFactory.newInstance(SCHEME_LANGUAGE);
+ schema = factory.newSchema(schemeFile);
+ }
+
/**
* Test for load all templates
*/
- public void testParseTemplates() {
+ public void testValidationGlobalTemplates() {
//
+ assertNotNull("Schema is not exist", schema);
+ IExtensionRegistry extensionRepository = Platform
+ .getExtensionRegistry();
- Bundle bundle = VpeTestPlugin.getDefault().getBundle();
- URL url = null;
- try {
- url = bundle == null ? null : FileLocator.resolve(bundle
- .getEntry(SCHEME_PATH));
- File schemeFile = new File(url.getPath());
- if (!schemeFile.exists() || !schemeFile.isFile()) {
- fail("scheme is not exist");
+ IExtensionPoint extensionPoint = extensionRepository
+ .getExtensionPoint(COM_REDHAT_VPE_TEMPLATES);
+ IExtension[] extensions = extensionPoint.getExtensions();
+
+ // iterate for all extensions
+ for (int i = 0; i < extensions.length; i++) {
+ IExtension extension = extensions[i];
+ IConfigurationElement[] elements = extension
+ .getConfigurationElements();
+ for (int j = 0; j < elements.length; j++) {
+ String pathAttrValue = elements[j].getAttribute("path");
+ try {
+ IPath templateFile = getFullpathForConfigurationElement(
+ pathAttrValue, elements[j]);
+
+ try {
+ Validator validator = schema.newValidator();
+ Source source = new StreamSource(templateFile
+ .toOSString());
+ validator.validate(source);
+ } catch (SAXException ex) {
+ fail("Sheme " + templateFile.toFile().getName()
+ + " is not valid : " + ex.getMessage());
+ }
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
}
+ }
- IExtensionRegistry extensionRepository = Platform
- .getExtensionRegistry();
+ }
- IExtensionPoint extensionPoint = extensionRepository
- .getExtensionPoint(COM_REDHAT_VPE_TEMPLATES);
- IExtension[] extensions = extensionPoint.getExtensions();
+ public void testValidationIncorrectTemplplates() throws Exception {
- // iterate for all extensions
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension
+ assertNotNull("Schema is not exist", schema);
+ createTemplatesForTesting(PLUGIN_FAILURE_NAME);
+
+ IExtensionRegistry extensionRepository = Platform
+ .getExtensionRegistry();
+
+ IExtensionPoint extensionPoint = extensionRepository
+ .getExtensionPoint(COM_REDHAT_VPE_TEMPLATES);
+ IExtension[] extensions = extensionPoint.getExtensions();
+ for (int i = 0; i < extensions.length; i++) {
+ if (extensions[i].getNamespaceIdentifier().equals(
+ VPE_TEST_EXTENSION)) {
+ IConfigurationElement[] elements = extensions[i]
.getConfigurationElements();
for (int j = 0; j < elements.length; j++) {
String pathAttrValue = elements[j].getAttribute("path");
+ try {
+ IPath templateFile = getFullpathForConfigurationElement(
+ pathAttrValue, elements[j]);
- IPath templateFile = getFullpathForConfigurationElement(
- pathAttrValue, elements[j]);
+ try {
+ Validator validator = schema.newValidator();
+ Source source = new StreamSource(templateFile
+ .toOSString());
+ validator.validate(source);
+ } catch (SAXException ex) {
+ assertTrue("Scheme "
+ + templateFile.toFile().getName()
+ + " is not valid", true);
+ }
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+ }
+ }
+ }
+ return;
+ }
- File file = templateFile.toFile();
- if (file.exists() && file.isFile()) {
- DocumentBuilderFactory docFactory = DocumentBuilderFactory
- .newInstance();
- docFactory.setNamespaceAware(true);
- DocumentBuilder parser = docFactory
- .newDocumentBuilder();
+ public void testValidationCorrectTemplplates() throws Exception {
- Document document = parser.parse(file);
- SchemaFactory factory = SchemaFactory
- .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ assertNotNull("Schema is not exist", schema);
+ createTemplatesForTesting(PLUGIN_OK_NAME);
- Source schemaFile = new StreamSource(schemeFile);
- Schema schema = factory.newSchema(schemaFile);
- Validator validator = schema.newValidator();
- validator.validate(new DOMSource(document));
+ IExtensionRegistry extensionRepository = Platform
+ .getExtensionRegistry();
+
+ IExtensionPoint extensionPoint = extensionRepository
+ .getExtensionPoint(COM_REDHAT_VPE_TEMPLATES);
+ IExtension[] extensions = extensionPoint.getExtensions();
+ for (int i = 0; i < extensions.length; i++) {
+ if (extensions[i].getNamespaceIdentifier().equals(
+ VPE_TEST_EXTENSION)) {
+ IConfigurationElement[] elements = extensions[i]
+ .getConfigurationElements();
+ for (int j = 0; j < elements.length; j++) {
+ String pathAttrValue = elements[j].getAttribute("path");
+ try {
+ IPath templateFile = getFullpathForConfigurationElement(
+ pathAttrValue, elements[j]);
+
+ try {
+ Validator validator = schema.newValidator();
+ Source source = new StreamSource(templateFile
+ .toOSString());
+ validator.validate(source);
+ } catch (SAXException ex) {
+ fail("Sheme " + templateFile.toFile().getName()
+ + " is not valid : " + ex.getMessage());
+ }
+ } catch (IOException e) {
+ fail(e.getMessage());
}
-
}
}
+ }
- } catch (Exception exception) {
- fail(exception.getMessage());
- }
+ return;
}
/**
+ * Tests possible template
+ *
+ * @throws Exception
+ */
+ private void createTemplatesForTesting(String pluginXmlFileName)
+ throws Exception {
+ IPath iPath = getFullpathForConfigurationElement(pluginXmlFileName,
+ null);
+ File file = iPath.toFile();
+ FileInputStream is = new FileInputStream(file);
+ IExtensionRegistry registry = RegistryFactory.getRegistry();
+ Object key = ((ExtensionRegistry) registry).getTemporaryUserToken();
+ Bundle bundle = VpeTestPlugin.getDefault().getBundle();
+ IContributor contributor = ContributorFactoryOSGi
+ .createContributor(bundle);
+ registry.addContribution(is, contributor, false, null, null, key);
+ }
+
+ /**
* Get a full path for IConfigurationElement
*
* @param fileName
@@ -124,8 +241,7 @@
*/
private static IPath getFullpathForConfigurationElement(String name,
IConfigurationElement confElement) throws IOException {
- // 1. get a shared instance
- VpePlugin plugin = VpePlugin.getDefault();
+ VpeTestPlugin plugin = VpeTestPlugin.getDefault();
Bundle bundle = null;
@@ -142,4 +258,29 @@
return path;
}
+ /**
+ * Removing extensions from eclipse
+ *
+ * @param extensionPointId
+ * @param extensionId
+ */
+ private void removeExtension(String extensionPointId, String extensionId) {
+ IExtensionRegistry extensionRepository = Platform
+ .getExtensionRegistry();
+
+ Object token = ((ExtensionRegistry) extensionRepository).getTemporaryUserToken();
+ IExtensionPoint extensionPoint = extensionRepository
+ .getExtensionPoint(extensionPointId);
+ IExtension[] extensions = extensionPoint.getExtensions();
+ for (int i = 0; i < extensions.length; i++) {
+ if (extensions[i].getNamespaceIdentifier().equals(extensionId))
+ extensionRepository.removeExtension(extensions[i], token);
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ removeExtension(COM_REDHAT_VPE_TEMPLATES, VPE_TEST_EXTENSION);
+ super.tearDown();
+ }
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test1.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test1.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test1.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates>
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- there contains incorrect templates. Just for testing -->
<vpe:template-taglib uri="http://xmlns.oracle.com/adf/faces/EA10/html" prefix="afh"/>
<vpe:template-taglib uri="http://xmlns.oracle.com/adf/faces/EA10" prefix="af"/>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test2.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test2.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test2.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates>
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- there contains incorrect templates. Just for testing -->
<vpe:tag name="a" case-sensitive="no">
<vpe:template children="yes" modify="yes">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test3.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test3.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test3.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates>
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- This class contains valid template expressions -->
<vpe:template-taglib uri="http://java.sun.com/jsf/html" prefix="h"/>
<vpe:template-taglib uri="http://java.sun.com/jsf/core" prefix="f"/>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test4.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test4.xml 2008-08-28 10:15:38 UTC (rev 9939)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/templates/test4.xml 2008-08-28 12:28:20 UTC (rev 9940)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<vpe:templates>
+<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- This class contains invalid template expressions -->
<vpe:template-taglib uri="http://myfaces.apache.org/extensions"
prefix="x" />
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9939 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-08-28 06:15:38 -0400 (Thu, 28 Aug 2008)
New Revision: 9939
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/InvisibleTemplate.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1805
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta 2008-08-28 10:15:09 UTC (rev 9938)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_eclipse_option.meta 2008-08-28 10:15:38 UTC (rev 9939)
@@ -1193,6 +1193,13 @@
</Constraint>
<Editor name="CheckBox"/>
</XModelAttribute>
+ <XModelAttribute default="no" name="show invisible tags" xmlname="show_invisible_tags">
+ <Constraint loader="List">
+ <value name="yes"/>
+ <value name="no"/>
+ </Constraint>
+ <Editor name="CheckBox"/>
+ </XModelAttribute>
<XModelAttribute default="no"
name="show resource bundles usage as EL expressions" xmlname="show_resource_bundles_usage_as_el_expressions">
<Constraint loader="List">
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-08-28 10:15:09 UTC (rev 9938)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-08-28 10:15:38 UTC (rev 9939)
@@ -101,9 +101,10 @@
</vpe:tag>
<vpe:tag name="h:inputHidden" case-sensitive="yes">
- <vpe:template children="no" modify="no">
+ <vpe:template children="no" modify="no" invisible="yes" >
<input type="text" value="{jsfvalue(@value)}"
title="{tagstring()}" />
+
<vpe:dnd>
<vpe:drag start-enable="yes" />
<vpe:drop container="yes">
@@ -720,55 +721,51 @@
</vpe:tag>
<vpe:tag name="f:attribute" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:param">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:phaseListener">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</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:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:valueChangeListener">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:convertDateTime">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:converter">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:convertNumber">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:validator">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:validateDoubleRange">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:validateLength">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="f:validateLongRange">
- <vpe:template children="no" modify="no" />
+ <vpe:template children="no" modify="no" invisible="yes" />
</vpe:tag>
<vpe:tag name="h:message">
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2008-08-28 10:15:09 UTC (rev 9938)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2008-08-28 10:15:38 UTC (rev 9939)
@@ -207,7 +207,7 @@
</vpe:tag>
<vpe:tag name="rich:modalPanel" case-sensitive="yes">
- <vpe:template children="no" modify="yes">
+ <vpe:template children="no" modify="yes" invisible="yes" >
<div style="display:none">
</div>
</vpe:template>
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java 2008-08-28 10:15:09 UTC (rev 9938)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java 2008-08-28 10:15:38 UTC (rev 9939)
@@ -24,6 +24,7 @@
public static String ATT_SOURCE_VISUAL_EDITORS_WEIGHTS = "Size of Visual Editor pane 0-100%";
public static String ATT_SHOW_SELECTION_TAG_BAR = "show selection tag bar";
public static String ATT_ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT="always hide selection bar without prompt";
+ public static String ATT_SHOW_INVISIBLE_TAGS="show invisible tags";
public static String SHOW_COMMENTS_VALUE;
public static String VPE_EDITOR_PATH = "%Options%/Struts Studio/Editors/Visual Page Editor"; //$NON-NLS-1$
public static final Preference SHOW_COMMENTS = new VpePreference(VPE_EDITOR_PATH, ATT_SHOW_COMMENTS);
@@ -37,6 +38,7 @@
public static final Preference SOURCE_VISUAL_EDITORS_WEIGHTS= new VpePreference(VPE_EDITOR_PATH, ATT_SOURCE_VISUAL_EDITORS_WEIGHTS);
public static final Preference SHOW_SELECTION_TAG_BAR = new VpePreference(VPE_EDITOR_PATH,ATT_SHOW_SELECTION_TAG_BAR);
public static final Preference ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT = new VpePreference(VPE_EDITOR_PATH,ATT_ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT);
+ public static final Preference SHOW_INVISIBLE_TAGS = new VpePreference(VPE_EDITOR_PATH,ATT_SHOW_INVISIBLE_TAGS);
static {
SHOW_COMMENTS_VALUE =SHOW_COMMENTS.getValue();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-08-28 10:15:09 UTC (rev 9938)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-08-28 10:15:38 UTC (rev 9939)
@@ -1557,6 +1557,9 @@
}
});
}
+
+ manager.add(new Separator());
+ manager.add(new ShowInvisbleTagAction());
if (VpeDebug.VISUAL_CONTEXTMENU_DUMP_SOURCE) {
manager.add(new Action("Dump Source") { //$NON-NLS-1$
@@ -3317,5 +3320,20 @@
public VpeSourceDomBuilder getSourceBuilder() {
return sourceBuilder;
}
+
+ class ShowInvisbleTagAction extends Action{
+
+ public ShowInvisbleTagAction() {
+ super("Show Invisible Tags", AS_CHECK_BOX);
+ setChecked(visualBuilder.isShowInvisibleTags());
+ }
+
+ public void run() {
+ visualBuilder.setShowInvisibleTags(isChecked());
+ visualRefresh();
+ }
+
+ }
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-28 10:15:09 UTC (rev 9938)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-08-28 10:15:38 UTC (rev 9939)
@@ -55,6 +55,7 @@
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.jboss.tools.vpe.editor.mozilla.MozillaEditor;
import org.jboss.tools.vpe.editor.template.IEditableTemplate;
+import org.jboss.tools.vpe.editor.template.InvisibleTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.template.VpeCreatorUtil;
@@ -66,6 +67,7 @@
import org.jboss.tools.vpe.editor.template.VpeToggableTemplate;
import org.jboss.tools.vpe.editor.template.dnd.VpeDnd;
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.ElService;
import org.jboss.tools.vpe.editor.util.FaceletUtil;
import org.jboss.tools.vpe.editor.util.HTML;
@@ -168,10 +170,12 @@
private VpeDnd dropper;
private Map<IFile, Document> includeDocuments = new HashMap<IFile, Document>();
+ private boolean showInvisibleTags;
public VpeVisualDomBuilder(VpeDomMapping domMapping,
INodeAdapter sorceAdapter, VpeTemplateManager templateManager,
MozillaEditor visualEditor, VpePageContext pageContext) {
+
super(domMapping, sorceAdapter, templateManager);
this.visualEditor = visualEditor;
xulRunnerEditor = visualEditor.getXulRunnerEditor();
@@ -188,6 +192,9 @@
} else {
faceletFile = false;
}
+
+ this.showInvisibleTags = Constants.YES_STRING
+ .equals(VpePreference.SHOW_INVISIBLE_TAGS.getValue());
}
@@ -206,6 +213,7 @@
.getSourceBuilder().getSourceDocument()));
}
}
+
pageContext.refreshConnector();
pageContext.installIncludeElements();
if (isFacelet()) {
@@ -523,6 +531,13 @@
visualDocument, creationData);
getPageContext().setCurrentVisualNode(null);
+ // if showInvisibleTags mode
+ if (isShowInvisibleTags() && (visualNewNode != null)
+ && (sourceNode.getNodeType() == Node.ELEMENT_NODE)) {
+ // add invisible children to node
+ visualNewNode = addInvisibleChildren(sourceNode, visualNewNode);
+ }
+
if (border != null)
return border;
else
@@ -573,7 +588,8 @@
int childrenCount = 0;
for (int i = 0; i < len; i++) {
Node sourceNode = sourceNodes.item(i);
- if (addNode(sourceNode, null, visualContainer)) {
+ if ((!isInvisibleNode(sourceNode))
+ && (addNode(sourceNode, null, visualContainer))) {
if (Node.ELEMENT_NODE == sourceNode.getNodeType()) {
}
childrenCount++;
@@ -598,10 +614,12 @@
int childrenCount = 0;
if (sourceChildren != null) {
for (int j = 0; j < sourceChildren.size(); j++) {
- if (addNode((Node) sourceChildren.get(j), null,
- visualParent)) {
- childrenCount++;
- }
+ Node child = (Node) sourceChildren.get(j);
+ if ((!isInvisibleNode(child))
+ && addNode((Node) sourceChildren.get(j), null,
+ visualParent)) {
+ childrenCount++;
+ }
}
}
if (childrenCount == 0 && childrenInfoList.size() == 0) {
@@ -610,7 +628,61 @@
}
}
}
+
+ /**
+ *
+ * @param containerTemplate
+ * @param sourceContainer
+ * @param visualContainer
+ */
+ protected nsIDOMNode addInvisibleChildren(Node sourceContainer,
+ nsIDOMNode visualContainer) {
+ nsIDOMElement wrapper = null;
+ int count = 0;
+ // node is not null
+ if (visualContainer != null) {
+ // wrap node to span
+ wrapper = visualDocument.createElement(HTML.TAG_SPAN);
+ wrapper.appendChild(visualContainer);
+
+ // add all invisible tags to wrapper
+ NodeList sourceNodes = sourceContainer.getChildNodes();
+
+
+ for (int i = 0; i < sourceNodes.getLength(); i++) {
+
+ Node child = sourceNodes.item(i);
+
+ if (isInvisibleNode(child)) {
+ addNode(child, null, wrapper);
+ count++ ;
+ }
+ }
+ }
+
+ return count > 0 ? wrapper : visualContainer;
+
+ }
+
+ /**
+ *
+ * @param node
+ * @return
+ */
+ private boolean isInvisibleNode(Node node) {
+
+ // get template
+ Set<Node> ifDependencySet = new HashSet<Node>();
+ VpeTemplate template = templateManager.getTemplate(pageContext, node,
+ ifDependencySet);
+ // check if invisible tag
+ if (template.isInvisible())
+ return true;
+ return false;
+
+ }
+
// /////////////////////////////////////////////////////////////////////////
public nsIDOMNode addStyleNodeToHead(String styleText) {
nsIDOMNode newStyle = visualDocument
@@ -2335,4 +2407,12 @@
public nsIDOMNode getHeadNode() {
return visualEditor.getHeadNode();
}
+
+ public boolean isShowInvisibleTags() {
+ return showInvisibleTags;
+ }
+
+ public void setShowInvisibleTags(boolean showInvisibleTags) {
+ this.showInvisibleTags = showInvisibleTags;
+ }
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/InvisibleTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/InvisibleTemplate.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/InvisibleTemplate.java 2008-08-28 10:15:38 UTC (rev 9939)
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * 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.vpe.editor.template;
+
+import org.jboss.tools.vpe.editor.context.VpePageContext;
+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.Node;
+
+/**
+ * @author Sergey Dzmitrovich
+ *
+ */
+public class InvisibleTemplate extends VpeAbstractTemplate {
+
+ /*
+ * (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) #0037FF #ACBECE
+ */
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+
+ nsIDOMElement div = visualDocument.createElement(HTML.TAG_SPAN);
+
+ div.setAttribute(HTML.TAG_STYLE,
+ "border: solid 1px #0037FF;color:#0037FF;font-size:12px;");
+
+ nsIDOMText text = visualDocument.createTextNode(sourceNode
+ .getNodeName());
+
+ div.appendChild(text);
+
+ return new VpeCreationData(div);
+ }
+
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-08-28 10:15:09 UTC (rev 9938)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2008-08-28 10:15:38 UTC (rev 9939)
@@ -36,6 +36,7 @@
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException;
import org.jboss.tools.vpe.editor.template.resize.VpeResizer;
import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.ElService;
import org.jboss.tools.vpe.editor.util.NodesManagingUtil;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
@@ -70,6 +71,9 @@
/** The has imaginary border. */
protected boolean hasImaginaryBorder;
+
+ /** the invisible */
+ protected boolean invisible;
/** a resizer instance. */
private VpeResizer resizer;
@@ -230,15 +234,16 @@
*/
public void init(Element templateElement, boolean caseSensitive) {
this.caseSensitive = caseSensitive;
- children = "yes".equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CHILDREN)); //$NON-NLS-1$
- modify = "yes".equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_MODIFY)); //$NON-NLS-1$
+ children = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CHILDREN)); //$NON-NLS-1$
+ modify = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_MODIFY)); //$NON-NLS-1$
+ invisible = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_INVISIBLE)); //$NON-NLS-1$
String strHasImaginaryBorder = templateElement
.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_HAS_IMAGINARY_BORDER);
if (strHasImaginaryBorder != null
&& strHasImaginaryBorder.length() != 0) {
- hasImaginaryBorder = "yes".equalsIgnoreCase(strHasImaginaryBorder); //$NON-NLS-1$
+ hasImaginaryBorder = Constants.YES_STRING.equalsIgnoreCase(strHasImaginaryBorder); //$NON-NLS-1$
} else {
hasImaginaryBorder = false;
}
@@ -1518,4 +1523,13 @@
}
}
+
+ public boolean isInvisible() {
+ return invisible;
+ }
+
+ public void setInvisible(boolean invisible) {
+ this.invisible = invisible;
+ }
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2008-08-28 10:15:09 UTC (rev 9938)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2008-08-28 10:15:38 UTC (rev 9939)
@@ -486,4 +486,6 @@
VpeElementMapping elementMapping, int focusPosition,
int anchorPosition, VpeDomMapping domMapping);
+ public boolean isInvisible();
+
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-08-28 10:15:09 UTC (rev 9938)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-08-28 10:15:38 UTC (rev 9939)
@@ -31,6 +31,7 @@
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.XmlUtil;
import org.osgi.framework.Bundle;
@@ -135,6 +136,8 @@
static final String ATTR_TEMPLATE_MODIFY = "modify"; //$NON-NLS-1$
static final String ATTR_TEMPLATE_HAS_IMAGINARY_BORDER = "hasImaginaryBorder"; //$NON-NLS-1$
+
+ static final String ATTR_TEMPLATE_INVISIBLE = "invisible"; //$NON-NLS-1$
static final String ATTR_COPY_ATTRS = "attrs"; //$NON-NLS-1$
@@ -863,32 +866,42 @@
@SuppressWarnings("unchecked")
private VpeTemplate createTemplate(Element templateElement,IConfigurationElement confElement, boolean caseSensitive) {
VpeTemplate template = null;
- String templateClassName = templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CLASS);
- String nameSpaceIdentifyer = templateElement.getAttribute(VpeTemplateManager.NAMESPACE_IDENTIFIER_ATTRIBUTE);
+ String templateClassName = templateElement
+ .getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CLASS);
+ String nameSpaceIdentifyer = templateElement
+ .getAttribute(VpeTemplateManager.NAMESPACE_IDENTIFIER_ATTRIBUTE);
+ String isInvisibleTemplate = templateElement
+ .getAttribute(VpeTemplateManager.ATTR_TEMPLATE_INVISIBLE);
if (templateClassName != null && templateClassName.length() > 0) {
try {
Bundle bundle;
- if(nameSpaceIdentifyer==null||nameSpaceIdentifyer.length()==0) {
+ if (nameSpaceIdentifyer == null
+ || nameSpaceIdentifyer.length() == 0) {
nameSpaceIdentifyer = confElement.getNamespaceIdentifier();
}
bundle = Platform.getBundle(nameSpaceIdentifyer);
-
+
Class templateClass = bundle.loadClass(templateClassName);
- template = (VpeTemplate)templateClass.newInstance();
+ template = (VpeTemplate) templateClass.newInstance();
} catch (ClassNotFoundException e) {
template = handleTemplateClassLoadException(template,
templateClassName, nameSpaceIdentifyer, e);
- } catch(IllegalAccessException e) {
+ } catch (IllegalAccessException e) {
template = handleTemplateClassLoadException(template,
templateClassName, nameSpaceIdentifyer, e);
- } catch(InstantiationException e) {
+ } catch (InstantiationException e) {
template = handleTemplateClassLoadException(template,
templateClassName, nameSpaceIdentifyer, e);
}
+ } else if (isInvisibleTemplate != null
+ && Constants.YES_STRING.equalsIgnoreCase(isInvisibleTemplate)) {
+
+ template = new InvisibleTemplate();
+
} else {
template = new VpeHtmlTemplate();
}
- if(template!=null) {
+ if (template != null) {
template.init(templateElement, caseSensitive);
}
return template;
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9938 - trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-08-28 06:15:09 -0400 (Thu, 28 Aug 2008)
New Revision: 9938
Modified:
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
Log:
https://jira.jboss.org/jira/browse/JBDS-336 - updating xsl
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-08-28 10:14:29 UTC (rev 9937)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-08-28 10:15:09 UTC (rev 9938)
@@ -58,6 +58,65 @@
<xsl:apply-templates select="." mode="head.keywords.content"/>
</xsl:template>
+
+ <!-- Overriding toc.line -->
+ <xsl:template name="toc.line">
+ <xsl:param name="toc-context" select="."/>
+ <xsl:param name="depth" select="1"/>
+ <xsl:param name="depth.from.context" select="8"/>
+
+ <span>
+ <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute>
+
+ <!-- * if $autotoc.label.in.hyperlink is zero, then output the label -->
+ <!-- * before the hyperlinked title (as the DSSSL stylesheet does) -->
+ <xsl:if test="$autotoc.label.in.hyperlink = 0">
+ <xsl:variable name="label">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:copy-of select="$label"/>
+ <xsl:if test="$label != ''">
+ <xsl:value-of select="$autotoc.label.separator"/>
+ </xsl:if>
+ </xsl:if>
+
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="context" select="$toc-context"/>
+ <xsl:with-param name="toc-context" select="$toc-context"/>
+ </xsl:call-template>
+ </xsl:attribute>
+
+ <xsl:choose>
+ <xsl:when test="@role='new'">
+ <xsl:attribute name="class">
+ <xsl:value-of select="@role"/>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:when test="@role='updated'">
+ <xsl:attribute name="class">
+ <xsl:value-of select="@role"/>
+ </xsl:attribute>
+ </xsl:when>
+ </xsl:choose>
+
+ <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label -->
+ <!-- * as part of the hyperlinked title -->
+ <xsl:if test="not($autotoc.label.in.hyperlink = 0)">
+ <xsl:variable name="label">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:copy-of select="$label"/>
+ <xsl:if test="$label != ''">
+ <xsl:value-of select="$autotoc.label.separator"/>
+ </xsl:if>
+ </xsl:if>
+
+ <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+ </a>
+ </span>
+ </xsl:template>
<!-- XHTML and PDF -->
</xsl:stylesheet>
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9937 - trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-08-28 06:14:29 -0400 (Thu, 28 Aug 2008)
New Revision: 9937
Modified:
trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css
Log:
https://jira.jboss.org/jira/browse/JBDS-336 - updating common style sheet
Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css
===================================================================
--- trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-08-28 10:13:55 UTC (rev 9936)
+++ trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-08-28 10:14:29 UTC (rev 9937)
@@ -31,4 +31,13 @@
width: 57em;
! height:40px;
display:block;
+}
+
+a.new {
+background:transparent url(../images/new.png) no-repeat scroll right top;
+padding-right:70px;
+}
+a.updated {
+background:transparent url(../images/updated.png) no-repeat scroll right top;
+padding-right:70px;
}
\ No newline at end of file
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9936 - trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-08-28 06:13:55 -0400 (Thu, 28 Aug 2008)
New Revision: 9936
Modified:
trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css
Log:
https://jira.jboss.org/jira/browse/JBDS-336 - updating common style sheet
Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css
===================================================================
--- trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css 2008-08-28 10:07:00 UTC (rev 9935)
+++ trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css 2008-08-28 10:13:55 UTC (rev 9936)
@@ -22,7 +22,7 @@
#title a.site_href, #title a.doc_href{
display:block;
-height:60px;
+height:100px;
}
#title a.site_href {
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9935 - trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-08-28 06:07:00 -0400 (Thu, 28 Aug 2008)
New Revision: 9935
Modified:
trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl
Log:
https://jira.jboss.org/jira/browse/JBDS-336 - updating xsl
Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl
===================================================================
--- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-08-28 09:24:41 UTC (rev 9934)
+++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-08-28 10:07:00 UTC (rev 9935)
@@ -59,6 +59,75 @@
<xsl:apply-templates select="." mode="head.keywords.content"/>
</xsl:template>
+
+ <!-- Overriding toc.line -->
+ <xsl:template name="toc.line">
+ <xsl:param name="toc-context" select="."/>
+ <xsl:param name="depth" select="1"/>
+ <xsl:param name="depth.from.context" select="8"/>
+
+ <span>
+ <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute>
+
+ <!-- * if $autotoc.label.in.hyperlink is zero, then output the label -->
+ <!-- * before the hyperlinked title (as the DSSSL stylesheet does) -->
+ <xsl:if test="$autotoc.label.in.hyperlink = 0">
+ <xsl:variable name="label">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:copy-of select="$label"/>
+ <xsl:if test="$label != ''">
+ <xsl:value-of select="$autotoc.label.separator"/>
+ </xsl:if>
+ </xsl:if>
+
+ <a>
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target">
+ <xsl:with-param name="context" select="$toc-context"/>
+ <xsl:with-param name="toc-context" select="$toc-context"/>
+ </xsl:call-template>
+ </xsl:attribute>
+
+ <xsl:choose>
+ <xsl:when test="@role='new'">
+ <xsl:attribute name="class">
+ <xsl:value-of select="@role"/>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:when test="@role='updated'">
+ <xsl:attribute name="class">
+ <xsl:value-of select="@role"/>
+ </xsl:attribute>
+ </xsl:when>
+ </xsl:choose>
+
+ <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label -->
+ <!-- * as part of the hyperlinked title -->
+ <xsl:if test="not($autotoc.label.in.hyperlink = 0)">
+ <xsl:variable name="label">
+ <xsl:apply-templates select="." mode="label.markup"/>
+ </xsl:variable>
+ <xsl:copy-of select="$label"/>
+ <xsl:if test="$label != ''">
+ <xsl:value-of select="$autotoc.label.separator"/>
+ </xsl:if>
+ </xsl:if>
+
+ <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+ </a>
+ </span>
+ </xsl:template>
+
+ <xsl:template match="book" mode="toc">
+ <xsl:param name="toc-context" select="."/>
+
+ <xsl:call-template name="subtoc">
+ <xsl:with-param name="toc-context" select="$toc-context"/>
+ <xsl:with-param name="nodes" select="part|reference |preface|chapter|appendix |article |bibliography|glossary|index |refentry |bridgehead[$bridgehead.in.toc != 0]"/>
+ </xsl:call-template>
+ </xsl:template>
+
<!-- XHTML and PDF -->
</xsl:stylesheet>
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9934 - workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-08-28 05:24:41 -0400 (Thu, 28 Aug 2008)
New Revision: 9934
Modified:
workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java
Log:
add a method order to add Param into the graphical info model
Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-08-28 09:23:55 UTC (rev 9933)
+++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/modelparser/SmooksConfigurationFileGenerateContext.java 2008-08-28 09:24:41 UTC (rev 9934)
@@ -10,7 +10,9 @@
******************************************************************************/
package org.jboss.tools.smooks.ui.modelparser;
+import org.jboss.tools.smooks.graphical.Param;
import org.jboss.tools.smooks.ui.gef.model.GraphRootModel;
+import org.milyn.xsd.smooks.SmooksResourceListType;
/**
* @author Dart Peng
@@ -22,6 +24,7 @@
protected String sourceDataTypeID = null;
protected String targetDataTypeID = null;
protected GraphRootModel dataMappingRootModel;
+ protected SmooksResourceListType smooksResourceListModel;
protected String smooksType = null;
/**
@@ -72,6 +75,20 @@
public void setSmooksType(String smooksType) {
this.smooksType = smooksType;
}
+ public SmooksResourceListType getSmooksResourceListModel() {
+ return smooksResourceListModel;
+ }
+ public void setSmooksResourceListModel(
+ SmooksResourceListType smooksResourceListModel) {
+ this.smooksResourceListModel = smooksResourceListModel;
+ }
+ public void addParam(String name,String value){
+
+ }
+ public void addParam(Param param){
+
+ }
+
}
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9933 - workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-08-28 05:23:55 -0400 (Thu, 28 Aug 2008)
New Revision: 9933
Modified:
workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
Log:
add a function to generate new graphical information file , and parse it
Modified: workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-08-28 02:32:39 UTC (rev 9932)
+++ workspace/dart/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-08-28 09:23:55 UTC (rev 9933)
@@ -12,14 +12,18 @@
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
import java.util.EventObject;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.ConnectionLayer;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.KeyStroke;
@@ -75,8 +79,12 @@
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.Section;
+import org.jboss.tools.smooks.analyzer.AnalyzerFactory;
+import org.jboss.tools.smooks.analyzer.IAnalyzer;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
import org.jboss.tools.smooks.analyzer.SmooksFileBuilder;
+import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.graphical.MappingDataType;
import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver;
import org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard;
import org.jboss.tools.smooks.ui.IViewerInitor;
@@ -94,7 +102,9 @@
import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
import org.jboss.tools.smooks.ui.wizards.TransformDataSelectionWizard;
import org.jboss.tools.smooks.utils.UIUtils;
+import org.milyn.xsd.smooks.SmooksResourceListType;
import org.milyn.xsd.smooks.util.SmooksConstants;
+import org.milyn.xsd.smooks.util.SmooksResourceFactoryImpl;
/**
* @author Dart Peng
@@ -102,6 +112,7 @@
*/
public class SmooksGraphicalFormPage extends FormPage implements
ISelectionChangedListener {
+ protected SmooksConfigurationFileGenerateContext smooksConfigurationFileGenerateContext;
protected IViewerInitor sourceViewerInitor;
protected IViewerInitor targetViewerInitor;
protected TreeViewer targetViewer;
@@ -112,7 +123,6 @@
protected GraphRootModel rootModel;
protected Hyperlink sourceLink = null;
protected Hyperlink targetLink = null;
- protected int itemY = 0;
protected String sourceDataTypeID = null;
protected String targetDataTypeID = null;
protected SmooksFileBuilder smooksFileBuilder = null;
@@ -364,14 +374,12 @@
protected void createSourceGraphModels() {
Tree tree = sourceViewer.getTree();
TreeItem[] items = tree.getItems();
- itemY = 0;
createGraphModels(items, SourceModel.class);
}
protected void createTargetGraphModels() {
Tree tree = targetViewer.getTree();
TreeItem[] items = tree.getItems();
- itemY = 0;
createGraphModels(items, TargetModel.class);
}
@@ -418,7 +426,9 @@
@Override
public void doSave(IProgressMonitor monitor) {
SmooksFileBuilder builder = this.getSmooksFileBuilder();
- SmooksConfigurationFileGenerateContext context = createContext();
+ SmooksConfigurationFileGenerateContext context = this
+ .getSmooksConfigurationFileGenerateContext();
+ this.initSmooksConfigurationFileGenerateContext(context);
Exception exp = null;
try {
// generate smooks configuration file
@@ -429,7 +439,7 @@
}
// save graphical informations
- if(this.graphicalInformationSaver != null){
+ if (this.graphicalInformationSaver != null) {
graphicalInformationSaver.doSave(monitor, context);
}
} catch (CoreException e) {
@@ -450,15 +460,14 @@
protected SmooksConfigurationFileGenerateContext createContext() {
SmooksConfigurationFileGenerateContext context = new SmooksConfigurationFileGenerateContext();
- context.setSourceDataTypeID(this.sourceDataTypeID);
- context.setTargetDataTypeID(this.targetDataTypeID);
- context.setSmooksType(SmooksConstants.SAX);
- context.setDataMappingRootModel(this.rootModel);
return context;
}
protected void initSmooksConfigurationFileGenerateContext(
SmooksConfigurationFileGenerateContext context) {
+ context.setSourceDataTypeID(this.sourceDataTypeID);
+ context.setTargetDataTypeID(this.targetDataTypeID);
+ context.setSmooksType(SmooksConstants.SAX);
context.setDataMappingRootModel(this.rootModel);
}
@@ -487,10 +496,6 @@
protected void initGraphicalViewer() {
createActions();
-
- this.getGraphicalViewer().getControl().setBackground(
- ColorConstants.white);
-
rootModel = new GraphRootModel();
this.createSourceGraphModels();
this.createTargetGraphModels();
@@ -581,8 +586,39 @@
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
graphicalInformationSaver = new GraphicalInformationSaver(input);
+ try {
+ GraphInformations graph = graphicalInformationSaver.doLoad();
+ initFormEditorWithGraphInfo(graph);
+
+ String path = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(
+ ((IFileEditorInput) input).getFile().getFullPath()).toString();
+ Resource resource = new SmooksResourceFactoryImpl()
+ .createResource(URI.createFileURI(path));
+ resource.load(Collections.EMPTY_MAP);
+ IAnalyzer analyzer = AnalyzerFactory.getInstance().getAnalyzer(
+ sourceDataTypeID, targetDataTypeID);
+
+
+ Object obj = analyzer.buildSourceInputObjects(graph,
+ (SmooksResourceListType) resource.getContents().get(0),
+ ((IFileEditorInput) input).getFile());
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (CoreException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ }
}
+ protected void initFormEditorWithGraphInfo(GraphInformations graph) {
+ MappingDataType mapping = graph.getMappingType();
+ if (mapping != null) {
+ this.sourceDataTypeID = mapping.getSourceTypeID();
+ this.targetDataTypeID = mapping.getTargetTypeID();
+ }
+ }
+
/**
*
* @param viewer
@@ -745,7 +781,7 @@
public void paintControl(PaintEvent e) {
Tree tree = (Tree) e.getSource();
if (tree.getData(TreeItemRelationModel.PRO_TREE_REPAINT) != null) {
- System.out.println("Block a event fire !!");
+ // System.out.println("Block a event fire !!");
return;
}
rootModel.firePropertyChange(RootModel.P_REFRESH_PANEL, null,
@@ -767,4 +803,11 @@
}
}
+ public SmooksConfigurationFileGenerateContext getSmooksConfigurationFileGenerateContext() {
+ if (smooksConfigurationFileGenerateContext == null) {
+ smooksConfigurationFileGenerateContext = createContext();
+ }
+ return smooksConfigurationFileGenerateContext;
+ }
+
}
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9932 - workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-08-27 22:32:39 -0400 (Wed, 27 Aug 2008)
New Revision: 9932
Modified:
workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
Log:
add browse workspace function
Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-08-28 02:21:38 UTC (rev 9931)
+++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-08-28 02:32:39 UTC (rev 9932)
@@ -3,7 +3,12 @@
*/
package org.jboss.tools.smooks.xml;
+import java.util.Collections;
+
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.emf.common.ui.dialogs.WorkspaceResourceDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -23,7 +28,6 @@
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ResourceSelectionDialog;
import org.jboss.tools.smooks.xsd.model.XSDStructuredModelContentProvider;
import org.jboss.tools.smooks.xsd.model.XSDStructuredModelLabelProvider;
@@ -146,10 +150,17 @@
}
protected void openWorkSpaceSelection(Text relationT) {
- ResourceSelectionDialog dialog = new ResourceSelectionDialog(
- getShell(), ResourcesPlugin.getWorkspace() , "Choose File");
-// dialog.setInitialSelections(selectedResources);
- dialog.open();
+ IFile[] files = WorkspaceResourceDialog.openFileSelection(getShell(),
+ "", "", false, null, Collections.EMPTY_LIST);
+ // dialog.setInitialSelections(selectedResources);
+ if (files.length > 0) {
+ IFile file = files[0];
+ String s = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(
+ file.getFullPath()).toString();
+ relationT.setText(s);
+ return;
+ }
+ relationT.setText("");
}
protected Composite createFileSelectionComposite(Composite parent) {
16 years, 4 months
- 1
- 0
JBoss Tools SVN: r9931 - workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-08-27 22:21:38 -0400 (Wed, 27 Aug 2008)
New Revision: 9931
Modified:
workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
Log:
Modified: workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-08-28 01:32:18 UTC (rev 9930)
+++ workspace/dart/plugins/org.jboss.tools.smooks.xml/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-08-28 02:21:38 UTC (rev 9931)
@@ -3,6 +3,7 @@
*/
package org.jboss.tools.smooks.xml;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -22,6 +23,7 @@
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ResourceSelectionDialog;
import org.jboss.tools.smooks.xsd.model.XSDStructuredModelContentProvider;
import org.jboss.tools.smooks.xsd.model.XSDStructuredModelLabelProvider;
@@ -29,8 +31,8 @@
*
* @author Dart Peng Date : 2008-8-13
*/
-public abstract class AbstractFileSelectionWizardPage extends WizardPage implements
- SelectionListener {
+public abstract class AbstractFileSelectionWizardPage extends WizardPage
+ implements SelectionListener {
protected Object returnObject = null;
protected Text fileText;
@@ -50,6 +52,7 @@
super(pageName);
// TODO Auto-generated constructor stub
}
+
public Object getReturnValue() {
return returnObject;
}
@@ -115,24 +118,40 @@
protected void hookBrowseButtonSelectionAdapter() {
SelectionAdapter browseButtonSelectionAdapter = new SelectionAdapter() {
- @Override
public void widgetSelected(SelectionEvent e) {
Text relationT = null;
- // if (e.getSource() == xmlFileSystemBrowseButton) {
- // relationT = xmlFileText;
- // }
if (e.getSource() == fileSystemBrowseButton) {
relationT = fileText;
}
openFileSelection(relationT);
}
};
+ SelectionAdapter wbrowseButtonSelectionAdapter = new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ Text relationT = null;
+ if (e.getSource() == workspaceBrowseButton) {
+ relationT = fileText;
+ }
+ openWorkSpaceSelection(relationT);
+ }
+
+ };
+
+ workspaceBrowseButton
+ .addSelectionListener(wbrowseButtonSelectionAdapter);
// xmlFileSystemBrowseButton
// .addSelectionListener(browseButtonSelectionAdapter);
fileSystemBrowseButton
.addSelectionListener(browseButtonSelectionAdapter);
}
+ protected void openWorkSpaceSelection(Text relationT) {
+ ResourceSelectionDialog dialog = new ResourceSelectionDialog(
+ getShell(), ResourcesPlugin.getWorkspace() , "Choose File");
+// dialog.setInitialSelections(selectedResources);
+ dialog.open();
+ }
+
protected Composite createFileSelectionComposite(Composite parent) {
Composite xsdComposite = new Composite(parent, SWT.NONE);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -157,8 +176,7 @@
fileSystemBrowseButton = new Button(browseButtonComposite, SWT.NONE);
fileSystemBrowseButton.setText("Browse File System...");
- workspaceBrowseButton = new Button(
- browseButtonComposite, SWT.NONE);
+ workspaceBrowseButton = new Button(browseButtonComposite, SWT.NONE);
workspaceBrowseButton.setText("Browse workspace file..");
gd = new GridData();
gd.horizontalAlignment = GridData.END;
16 years, 4 months
- 1
- 0