5 a.m.
Author: scabanovich
Date: 2009-01-11 06:00:45 -0500 (Sun, 11 Jan 2009)
New Revision: 12978
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java
Log:
JBIDE-3487
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2009-01-10
20:58:12 UTC (rev 12977)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2009-01-11
11:00:45 UTC (rev 12978)
@@ -1961,7 +1961,7 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=general" name="log level"
xmlname="logLevel">
+ <XModelAttribute PROPERTIES="category=general" name="log level"
xmlname="log-level|logLevel">
<Constraint loader="%ListEL%">
<value/>
<value name="info"/>
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd 2009-01-10
20:58:12 UTC (rev 12977)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/schemas/pages-2.1.xsd 2009-01-11
11:00:45 UTC (rev 12978)
@@ -56,6 +56,9 @@
<xs:attributeGroup name="attlist.exception">
<xs:attribute name="class" type="xs:token"/>
<xs:attribute name="log" type="pages:tf-boolean"/>
+ <xs:attribute name="log-level"
type="pages:loglevel-values"/>
+
+ <!-- The logLevel attribute is deprecated and will be removed in the next
major version! Please use log-level instead -->
<xs:attribute name="logLevel"
type="pages:loglevel-values"/>
</xs:attributeGroup>
@@ -183,7 +186,7 @@
<xs:attribute name="execute" use="required"
type="pages:method-expression" />
</xs:attributeGroup>
- <xs:element name="restrict" type="pages:value-expression">
+ <xs:element name="restrict"
type="pages:boolean-value-expression" default="true">
<xs:annotation>
<xs:documentation>Security restrictions</xs:documentation>
</xs:annotation>
@@ -218,7 +221,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.navigation">
- <xs:attribute name="from-action"
type="pages:method-expression" />
+ <xs:attribute name="from-action"
type="pages:from-action-expression" />
<xs:attribute name="evaluate"
type="pages:method-expression" />
</xs:attributeGroup>
@@ -245,7 +248,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.rule">
- <xs:attribute name="if-outcome"
type="pages:value-expression" />
+ <xs:attribute name="if-outcome"
type="pages:outcome-expression" />
<xs:attribute name="if"
type="pages:boolean-value-expression" />
</xs:attributeGroup>
@@ -462,7 +465,7 @@
<xs:pattern value="http://.*|https://.*"/>
</xs:restriction>
</xs:simpleType>
-
+
<xs:simpleType name="url-expression">
<xs:union memberTypes="pages:url
pages:method-expression"></xs:union>
</xs:simpleType>
@@ -473,17 +476,31 @@
<xs:enumeration value="http"/>
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="outcome">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[^#\{\}]+"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:simpleType name="view-id">
<xs:restriction base="xs:string">
<xs:pattern value="(/.*)|\*"/>
</xs:restriction>
</xs:simpleType>
-
+
<xs:simpleType name="view-id-expression">
- <xs:union memberTypes="pages:view-id
pages:method-expression"></xs:union>
+ <xs:union memberTypes="pages:view-id
pages:value-expression"></xs:union>
</xs:simpleType>
+ <xs:simpleType name="outcome-expression">
+ <xs:union memberTypes="pages:outcome
pages:value-expression"></xs:union>
+ </xs:simpleType>
+
+ <xs:simpleType name="from-action-expression">
+ <xs:union memberTypes="pages:outcome
pages:method-expression"></xs:union>
+ </xs:simpleType>
+
<xs:simpleType name="ableness">
<xs:restriction base="xs:token">
<xs:enumeration value="enabled"/>
@@ -605,12 +622,14 @@
<xs:simpleType name="method-expression">
<xs:restriction base="xs:token">
- <xs:pattern value="#\{.*\}"/>
+ <xs:pattern value="#\{.+\..+\}"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="value-expression">
- <xs:restriction base="xs:token"/>
+ <xs:restriction base="xs:token">
+ <xs:pattern value="#\{.*\}"/>
+ </xs:restriction>
</xs:simpleType>
<xs:simpleType name="boolean-value-expression">
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java 2009-01-10
20:58:12 UTC (rev 12977)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesLoaderUtil.java 2009-01-11
11:00:45 UTC (rev 12978)
@@ -33,7 +33,20 @@
return super.isSaveable(entity, n, v, dv);
}
+ public String getAttribute(Element element, String xmlname) {
+ int i = xmlname.indexOf('|');
+ if(i < 0) return super.getAttribute(element, xmlname);
+ String v = super.getAttribute(element, xmlname.substring(0, i));
+ return (v != null && v.length() > 0) ? v :
+ super.getAttribute(element, xmlname.substring(i + 1));
+ }
+ public void saveAttribute(Element element, String xmlname, String value) {
+ int i = xmlname.indexOf('|');
+ if(i >= 0) xmlname = xmlname.substring(0, i);
+ super.saveAttribute(element, xmlname, value);
+ }
+
public boolean save(Element parent, XModelObject o) {
if(!needToSave(o)) return true;
return super.save(parent, o);