Attribute @draw:concave of <draw:regular-polygon> does not have the datatype boolean, but only 'true' and 'false' as explicit values. Added method to assume in this case the datatype Boolean

Author: svanteschubert

generator/schema2template/src/main/java/schema2template/grammar/OdfModel.java

@@ -162,8 +162,8 @@ public String getDefaultAttributeValue(String attributeName, String parentElemen
       if (defaultValueByElementParents == null) {
         return null;
       }
-        // Not for ODF, but need extension if there are two attributes (same name)
-        // with different defaults in same named parent?
+      // Not for ODF, but need extension if there are two attributes (same name)
+      // with different defaults in same named parent?
       defaultValue = defaultValueByElementParents.get(parentElementName);
       if (defaultValue == null) {
         defaultValue = defaultValueByElementParents.get(ALL_ELEMENTS);

generator/schema2template/src/main/java/schema2template/grammar/XMLModel.java

@@ -23,13 +23,16 @@
  */
 package schema2template.grammar;
 
+import static schema2template.grammar.PuzzlePiece.NAME_VISITOR;
+
 import com.sun.msv.grammar.Expression;
 import com.sun.msv.grammar.Grammar;
 import com.sun.msv.grammar.NameClassAndExpression;
 import com.sun.msv.reader.trex.ng.RELAXNGReader;
 import com.sun.msv.reader.xmlschema.XMLSchemaReader;
 import com.sun.msv.writer.relaxng.RELAXNGWriter;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -45,7 +48,6 @@
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;
 import org.xml.sax.SAXException;
-import static schema2template.grammar.PuzzlePiece.NAME_VISITOR;
 
 /**
  * The most important model, the first access to the XML Schema information.
@@ -322,18 +324,22 @@ public PuzzlePiece getAttribute(String qName, String qParentName) {
     PuzzlePiece attribute = null;
     if (attributes == null) {
       return null;
-    }else {
-        for (PuzzlePiece ppAttribute : attributes.withMultiples().getCollection()) {
-            // If there is more than one name for this expression, create more than one PuzzlePiece
-            for (PuzzlePiece ppElement : ppAttribute.getParents().getCollection()) {
-                List<String> names =
-                  (List<String>) ((NameClassAndExpression) ppElement.getExpression()).getNameClass().visit(NAME_VISITOR);
-                if(names != null && names.contains(qParentName)){
-                     attribute = ppAttribute;
-                     break;
-                }
-            }
+    } else {
+      for (PuzzlePiece ppAttribute : attributes.withMultiples().getCollection()) {
+        // If there is more than one name for this expression, create more than one PuzzlePiece
+        for (PuzzlePiece ppElement : ppAttribute.getParents().getCollection()) {
+          List<String> names =
+              (List<String>)
+                  ((NameClassAndExpression) ppElement.getExpression())
+                      .getNameClass()
+                      .visit(NAME_VISITOR);
+          // takes the first attribute definition with a correct parent
+          if (names != null && names.contains(qParentName)) {
+            attribute = ppAttribute;
+            break;
+          }
         }
+      }
     }
     return attribute;
   }
@@ -347,34 +353,58 @@ public PuzzlePiece getAttribute(String qName, String qParentName) {
    * @return String of given Datatype
    */
   public String getAttributeDataType(String qName, String qParentName) {
-      String dataType = "String";
-      PuzzlePiece attr = getAttribute(qName, qParentName);
-      Collection<PuzzlePiece>  d = attr.getDatatypes().getCollection();
-      Boolean isBoolean = null;
-      if(d.size() == 1){
-          dataType = d.iterator().next().getQName();
-      }else if(!d.isEmpty()){
-          System.out.println("There are multiple datatypes!");
-      } else {
-       Iterator valueIterator  = attr.getValues().getCollection().iterator();
-
-       while(valueIterator.hasNext()){
-           String value =  valueIterator.next().toString();
-           if(value.equals("true") || value.equals("false")){
-               isBoolean = Boolean.TRUE;
-           }else{
-               isBoolean = null;
-               break;
-           }
-       }
-       if(isBoolean != null && isBoolean){
-          dataType = "Boolean";
-       }
+    String dataType = "String";
+    PuzzlePiece attr = getAttribute(qName, qParentName);
+    Collection<PuzzlePiece> d = attr.getDatatypes().getCollection();
+    Boolean isBoolean = null;
+    if (d.size() == 1) {
+      dataType = d.iterator().next().getQName();
+    } else if (!d.isEmpty()) {
+      System.err.println(
+          "\n***********\nThere are multiple datatypes for attribute '" + qName + "'\n");
+      Iterator dataTypesIter = d.iterator();
+      while (dataTypesIter.hasNext()) {
+        System.err.println(dataTypesIter.next().toString());
       }
-      return dataType;
+    } else { // @draw:concave just uses 'false' and 'true' without datatype
+        /** As there are sometimes multiple times definitions of the same attribute for an element 
+         * for an example https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/OpenDocument-v1.3-schema-rng.html#13591
+         * which was taken as boolean, all attributes definitions of all elements of the same name are now takin into account!
+         * BETTER FOR THE FUTURE: If the attribute definitons only for a certain element would be taken into account, e.g.
+         * https://docs.oasis-open.org/office/OpenDocument/v1.3/os/schemas/OpenDocument-v1.3-schema-rng.html#6508
+        */
+        PuzzleComponent elements = getElement(qParentName);
+        List<String> attributeValues = null;
+        if(elements != null && elements.getCollection().size() > 0){
+            attributeValues = new ArrayList<String>();
+        }
+        for(PuzzlePiece ppElement : elements.getCollection()){
+            PuzzlePieceSet attributes = ppElement.getAttributes();
+            for(PuzzlePiece ppAttribute : attributes.getCollection()){
+                if(ppAttribute.getQName().equals(qName)){
+                    for(PuzzlePiece ppValue : ppAttribute.getValues().getCollection()){
+                        // strange that the value has a localName (but the puzzlePiece abstraction should be overworked anyway)
+                        attributeValues.add(ppValue.getLocalName());
+                    }
+                }
+            }
+        }        
+        
+      for (String value : attributeValues) {        
+        if (value.equals("true") || value.equals("false")) {
+          isBoolean = Boolean.TRUE;
+        } else {
+          isBoolean = null;
+          break;
+        }
+      }
+      if (isBoolean != null && isBoolean) {
+        dataType = "Boolean";
+      }
+    }
+    return dataType;
   }
 
-
   /**
    * Get attribute by tag name and hash code. The hash code distincts Attributes sharing the same
    * tag name.

generator/schema2template/src/test/resources/test-reference/odf/generation/odfdom-java/odf-schema-1.0/org/odftoolkit/odfdom/dom/element/draw/DrawRegularPolygonElement.java

@@ -79,25 +79,25 @@ public OdfName getOdfName() {
 	 *
 	 * Attribute is mandatory.
 	 *
-	 * @return - the <code>String</code> , the value or <code>null</code>, if the attribute is not set and no default value defined.
+	 * @return - the <code>Boolean</code> , the value or <code>null</code>, if the attribute is not set and no default value defined.
 	 */
-	public String getDrawConcaveAttribute() {
+	public Boolean getDrawConcaveAttribute() {
 		DrawConcaveAttribute attr = (DrawConcaveAttribute) getOdfAttribute(OdfDocumentNamespace.DRAW, "concave");
-		if (attr != null) {
-			return String.valueOf(attr.getValue());
+		if (attr != null && !attr.getValue().isEmpty()) {
+			return Boolean.valueOf(attr.booleanValue());
 		}
 		return null;
 	}
 
 	/**
 	 * Sets the value of ODFDOM attribute representation <code>DrawConcaveAttribute</code> , See {@odf.attribute draw:concave}
 	 *
-	 * @param drawConcaveValue   The type is <code>String</code>
+	 * @param drawConcaveValue   The type is <code>Boolean</code>
 	 */
-	public void setDrawConcaveAttribute(String drawConcaveValue) {
+	public void setDrawConcaveAttribute(Boolean drawConcaveValue) {
 		DrawConcaveAttribute attr = new DrawConcaveAttribute((OdfFileDom) this.ownerDocument);
 		setOdfAttribute(attr);
-		attr.setValue(drawConcaveValue);
+		attr.setBooleanValue(drawConcaveValue.booleanValue());
 	}
 
 	/**

generator/schema2template/src/test/resources/test-reference/odf/generation/odfdom-java/odf-schema-1.1/org/odftoolkit/odfdom/dom/element/draw/DrawRegularPolygonElement.java

@@ -106,25 +106,25 @@ public void setDrawCaptionIdAttribute(String drawCaptionIdValue) {
 	 *
 	 * Attribute is mandatory.
 	 *
-	 * @return - the <code>String</code> , the value or <code>null</code>, if the attribute is not set and no default value defined.
+	 * @return - the <code>Boolean</code> , the value or <code>null</code>, if the attribute is not set and no default value defined.
 	 */
-	public String getDrawConcaveAttribute() {
+	public Boolean getDrawConcaveAttribute() {
 		DrawConcaveAttribute attr = (DrawConcaveAttribute) getOdfAttribute(OdfDocumentNamespace.DRAW, "concave");
-		if (attr != null) {
-			return String.valueOf(attr.getValue());
+		if (attr != null && !attr.getValue().isEmpty()) {
+			return Boolean.valueOf(attr.booleanValue());
 		}
 		return null;
 	}
 
 	/**
 	 * Sets the value of ODFDOM attribute representation <code>DrawConcaveAttribute</code> , See {@odf.attribute draw:concave}
 	 *
-	 * @param drawConcaveValue   The type is <code>String</code>
+	 * @param drawConcaveValue   The type is <code>Boolean</code>
 	 */
-	public void setDrawConcaveAttribute(String drawConcaveValue) {
+	public void setDrawConcaveAttribute(Boolean drawConcaveValue) {
 		DrawConcaveAttribute attr = new DrawConcaveAttribute((OdfFileDom) this.ownerDocument);
 		setOdfAttribute(attr);
-		attr.setValue(drawConcaveValue);
+		attr.setBooleanValue(drawConcaveValue.booleanValue());
 	}
 
 	/**

generator/schema2template/src/test/resources/test-reference/odf/generation/odfdom-java/odf-schema-1.2/org/odftoolkit/odfdom/dom/element/draw/DrawRegularPolygonElement.java

@@ -106,25 +106,25 @@ public void setDrawCaptionIdAttribute(String drawCaptionIdValue) {
 	 *
 	 * Attribute is mandatory.
 	 *
-	 * @return - the <code>String</code> , the value or <code>null</code>, if the attribute is not set and no default value defined.
+	 * @return - the <code>Boolean</code> , the value or <code>null</code>, if the attribute is not set and no default value defined.
 	 */
-	public String getDrawConcaveAttribute() {
+	public Boolean getDrawConcaveAttribute() {
 		DrawConcaveAttribute attr = (DrawConcaveAttribute) getOdfAttribute(OdfDocumentNamespace.DRAW, "concave");
-		if (attr != null) {
-			return String.valueOf(attr.getValue());
+		if (attr != null && !attr.getValue().isEmpty()) {
+			return Boolean.valueOf(attr.booleanValue());
 		}
 		return null;
 	}
 
 	/**
 	 * Sets the value of ODFDOM attribute representation <code>DrawConcaveAttribute</code> , See {@odf.attribute draw:concave}
 	 *
-	 * @param drawConcaveValue   The type is <code>String</code>
+	 * @param drawConcaveValue   The type is <code>Boolean</code>
 	 */
-	public void setDrawConcaveAttribute(String drawConcaveValue) {
+	public void setDrawConcaveAttribute(Boolean drawConcaveValue) {
 		DrawConcaveAttribute attr = new DrawConcaveAttribute((OdfFileDom) this.ownerDocument);
 		setOdfAttribute(attr);
-		attr.setValue(drawConcaveValue);
+		attr.setBooleanValue(drawConcaveValue.booleanValue());
 	}
 
 	/**

generator/schema2template/src/test/resources/test-reference/odf/generation/odfdom-java/odf-schema-1.3/org/odftoolkit/odfdom/dom/element/style/StyleTextPropertiesElement.java

@@ -2395,25 +2395,25 @@ public void setTextConditionAttribute(String textConditionValue) {
 	 *
 	 * Attribute is mandatory.
 	 *
-	 * @return - the <code>Boolean</code> , the value or <code>null</code>, if the attribute is not set and no default value defined.
+	 * @return - the <code>String</code> , the value or <code>null</code>, if the attribute is not set and no default value defined.
 	 */
-	public Boolean getTextDisplayAttribute() {
+	public String getTextDisplayAttribute() {
 		TextDisplayAttribute attr = (TextDisplayAttribute) getOdfAttribute(OdfDocumentNamespace.TEXT, "display");
-		if (attr != null && !attr.getValue().isEmpty()) {
-			return Boolean.valueOf(attr.booleanValue());
+		if (attr != null) {
+			return String.valueOf(attr.getValue());
 		}
 		return null;
 	}
 
 	/**
 	 * Sets the value of ODFDOM attribute representation <code>TextDisplayAttribute</code> , See {@odf.attribute text:display}
 	 *
-	 * @param textDisplayValue   The type is <code>Boolean</code>
+	 * @param textDisplayValue   The type is <code>String</code>
 	 */
-	public void setTextDisplayAttribute(Boolean textDisplayValue) {
+	public void setTextDisplayAttribute(String textDisplayValue) {
 		TextDisplayAttribute attr = new TextDisplayAttribute((OdfFileDom) this.ownerDocument);
 		setOdfAttribute(attr);
-		attr.setBooleanValue(textDisplayValue.booleanValue());
+		attr.setValue(textDisplayValue);
 	}
 
   /**