From 96f42a2e0af1335a103ff87287f3d9e836131083 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Fri, 25 Sep 2015 18:14:49 +0200
Subject: [PATCH] Cleaning up the form schema a bit

---
 .../xml/ns/public/common/common-3.xsd         | 89 ++++++-------------
 1 file changed, 27 insertions(+), 62 deletions(-)

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
index 0eaee3f92ce..cf2eb7bd777 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
@@ -13072,16 +13072,14 @@
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="display" type="tns:FormDisplayType"
-				minOccurs="0">
+			<xsd:element name="display" type="tns:FormDisplayType" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>
 						Display characteristics of the form.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="tns:formItem" minOccurs="0"
-				maxOccurs="unbounded">
+			<xsd:element ref="tns:formItem" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation>
 						List of form items.
@@ -13117,12 +13115,11 @@
 		<xsd:complexContent>
 			<xsd:extension base="tns:AbstractDisplayType">
 				<xsd:sequence>
-					<xsd:element name="minOccurs" type="xsd:string"
-						minOccurs="0" />
-					<xsd:element name="maxOccurs" type="xsd:string"
-						minOccurs="0" />
-					<xsd:element name="newLine" type="xsd:boolean"
-						minOccurs="0" default="true">
+					<xsd:element name="minOccurs" type="xsd:string" minOccurs="0" />
+					<xsd:element name="maxOccurs" type="xsd:string" minOccurs="0" />
+					<xsd:element name="size" type="xsd:integer" minOccurs="0" />
+					<xsd:element name="maxSize" type="xsd:integer" minOccurs="0" />
+					<xsd:element name="newLine" type="xsd:boolean" minOccurs="0" default="true">
 						<xsd:annotation>
 							<xsd:documentation>
 								displayable form component position (if true, field/group/loop will be
@@ -13154,65 +13151,42 @@
 			<xsd:element name="type" type="xsd:QName" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>
-						Type override. Normally the field type will be
-						determined
-						by the type of backing item. This field can be used as
-						type
+						Type override. Normally the field type will be determined
+						by the type of backing item. This field can be used as type
 						override if a different presenation is required.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="display" type="tns:FormItemDisplayType"
-				minOccurs="0" />
+			<xsd:element name="display" type="tns:FormItemDisplayType" minOccurs="0" />
 			<xsd:element name="widget" type="xsd:string" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>
 						Name of the UI widget that should be used to display this item.
-						Normally, the widget will be chosen automatically based on the
-						type
+						Normally, the widget will be chosen automatically based on the type
 						of the backing item (see "ref" element). The "widget" element can be
-						used to override this default behavior. It is used for default
-						included
-						types like text, label, combo, password, checkbox, etc. or class name
-						for
+						used to override this default behavior. It is used for default included
+						types like text, label, combo, password, checkbox, etc. or class name for
 						custom implementation.
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="availableValues" type="c:ExpressionType"
-				minOccurs="0" />
-			<xsd:element name="validation" type="tns:FormItemValidationType"
-				minOccurs="0" />
-			<xsd:element name="condition" type="c:ExpressionType"
-				minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>
-						This element is responsible for enabling/disabling the item. If the
-						expression
-						is not present or it returns true, then the item behaves normally.
-						When the expression evaluates to false then the item behaves as if
-						it is not there
-						at all. It will not be displayed, other expressions will be not
-						evaluated, etc.
-					</xsd:documentation>
-				</xsd:annotation>
-			</xsd:element>
+			<xsd:element name="availableValues" type="c:ExpressionType" minOccurs="0" />
+			<xsd:element name="validation" type="tns:FormItemValidationType" minOccurs="0" />
+			<!-- TODO: condition -->
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:element name="formItem" type="tns:AbstractFormItemType" />
 
 	<xsd:complexType name="FormItemValidationType">
 		<xsd:sequence>
-			<xsd:element name="server" type="xsd:string" minOccurs="0"
-				maxOccurs="unbounded">
+			<xsd:element name="server" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation>
 						<!--TODO -->
 					</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="client" type="tns:FormItemClientValidationType"
-				minOccurs="0" />
+			<xsd:element name="client" type="tns:FormItemClientValidationType" minOccurs="0" />
 		</xsd:sequence>
 	</xsd:complexType>
 
@@ -13227,8 +13201,7 @@
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="event" type="xsd:string" minOccurs="1"
-				maxOccurs="unbounded" />
+			<xsd:element name="event" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
 			<xsd:element name="script" type="xsd:string" minOccurs="1" />
 		</xsd:sequence>
 	</xsd:complexType>
@@ -13258,44 +13231,36 @@
 			displayed value to real value -->
 
 	</xsd:complexType>
-	<xsd:element name="formField" type="tns:FormFieldType"
-		substitutionGroup="tns:formItem" />
+	<xsd:element name="formField" type="tns:FormFieldType" substitutionGroup="tns:formItem" />
 
 	<xsd:complexType name="FormFieldGroupType">
 		<xsd:annotation>
 			<xsd:documentation>
 				<p>
-					A group of fields. The group is rendered in a such a way that it
-					will be obvious
-					that the fields belong together and form a a logical group (e.g. by
-					using box
-					with a border). This can be used to display value of complex
-					containers.
+					A group of fields. The group is rendered in a such a way that it will be obvious
+					that the fields belong together and form a a logical group (e.g. by using box
+					with a border). This can be used to display value of complex containers.
 					But it may also be used to visualy group together a set of
 					related properties that are not in the same container.
 				</p>
 				<p>
-					The group is NOT meant to automatically generate fields for every
-					container item.
+					The group is NOT meant to automatically generate fields for every container item.
 					Individual fields must be defined as sub-items of this group.
 				</p>
 				<p>
-					If ref element is used it MUST point to PrismContainer. In that case
-					subitems of this
+					If ref element is used it MUST point to PrismContainer. In that case subitems of this
 					group must point to the container value items.
 				</p>
 				<p>
 					The group may not have any ref element. In that case the subfields may
-					refer to any
-					property.
+					refer to any property.
 				</p>
 			</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="tns:AbstractFormItemType">
 				<xsd:sequence>
-					<xsd:element ref="tns:formItem" minOccurs="0"
-						maxOccurs="unbounded">
+					<xsd:element ref="tns:formItem" minOccurs="0" maxOccurs="unbounded">
 						<xsd:annotation>
 							<xsd:documentation>
 								List of group subitems.