From 8ad23d61c0f5d9d7ee619e62fe8911fafa70e635 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Tue, 27 Oct 2009 11:38:39 +0000
Subject: [PATCH] Fix for ETHREEOH-3117: Schema elements of type xs:anyType
 defined as repeating have their group label missing

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17177 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web/forms/xforms/Schema2XForms.java       | 33 ++++++++++++++++---
 .../xforms/tests/bugs/ETHREEOH-3117.xsd       | 22 +++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 source/test-resources/xforms/tests/bugs/ETHREEOH-3117.xsd

diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index 574c5185c8..33f3ea723e 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -1301,7 +1301,7 @@ public class Schema2XForms implements Serializable
                       " occurs " + occurs);
 
          // create the <xforms:bind> element and add it to the model.
-         boolean isRepeated = occurs.isRepeated() || (occurs.isOptional() && (controlType instanceof XSSimpleTypeDefinition == false));
+         boolean isRepeated = isRepeated(occurs, controlType);
          final Element bindElement = 
             this.createBind(xformsDocument, 
                             pathToRoot + (isRepeated ? "[position() != last()]" : ""));
@@ -1734,7 +1734,7 @@ public class Schema2XForms implements Serializable
                    " default instance element for " + elementName +
                    " at path " + path);
       // update the default instance
-      if (occurs.isRepeated() || (occurs.isOptional() && (element.getTypeDefinition() instanceof XSSimpleTypeDefinition == false)))
+      if (isRepeated(occurs, element.getTypeDefinition()))
       {
          LOGGER.debug("adding " + (occurs.minimum + 1) +
                       " default instance elements for " + elementName +
@@ -1777,7 +1777,7 @@ public class Schema2XForms implements Serializable
    {
 
       // add xforms:repeat section if this element re-occurs
-      if ((o.isOptional() && controlType instanceof XSSimpleTypeDefinition) ||
+      if ((o.isOptional() && (controlType instanceof XSSimpleTypeDefinition || "anyType".equals(controlType.getName()))) ||
           (o.maximum == 1 && o.minimum == 1))
       {
          return formSection;
@@ -1874,7 +1874,7 @@ public class Schema2XForms implements Serializable
       }
 
       // create the <xforms:bind> element and add it to the model.
-      boolean isRepeated = occurs.isRepeated() || (occurs.isOptional() && (controlType instanceof XSSimpleTypeDefinition == false));
+      boolean isRepeated = isRepeated(occurs, controlType);
       Element bindElement = 
          this.createBind(xformsDocument, pathToRoot + (isRepeated ? "[position() != last()]" : ""));
       String bindId = bindElement.getAttributeNS(null, "id");
@@ -3234,4 +3234,29 @@ public class Schema2XForms implements Serializable
       LOGGER.debug("created bind " + id + " for nodeset " + nodeset);
       return result;
    }
+   
+   private boolean isRepeated(SchemaUtil.Occurrence occurs, XSTypeDefinition type)
+   {
+      // return immediately if occurs signifies repeat
+      if (occurs.isRepeated())
+      {
+         return true;
+      }
+      
+      boolean repeated = false;
+      
+      if (occurs.isOptional())
+      {
+         // if element is optional check the type, for
+         // simple and 'any' types return false
+             
+         if ((type instanceof XSSimpleTypeDefinition == false) && 
+             ("anyType".equals(type.getName()) == false))
+         {
+             repeated = true;
+         }
+      }
+      
+      return repeated;
+   }
 }
diff --git a/source/test-resources/xforms/tests/bugs/ETHREEOH-3117.xsd b/source/test-resources/xforms/tests/bugs/ETHREEOH-3117.xsd
new file mode 100644
index 0000000000..5996063472
--- /dev/null
+++ b/source/test-resources/xforms/tests/bugs/ETHREEOH-3117.xsd
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:alf="http://www.alfresco.org"
+	        targetNamespace="http://www.alfresco.org"
+	        elementFormDefault="qualified">
+	         
+	         
+   <xs:complexType name="form-section">
+      <xs:sequence>
+         <xs:element name="section-title" type="xs:normalizedString" minOccurs="0" />
+         <xs:element name="section-text" type="xs:anyType" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+   </xs:complexType>
+	         
+   <xs:element name="simple">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:element name="sections" type="alf:form-section" minOccurs="1" maxOccurs="unbounded" />
+         </xs:sequence>
+      </xs:complexType>
+   </xs:element>
+</xs:schema>