From ebe6c19f5e53419055b0753156b520a67c6ec806 Mon Sep 17 00:00:00 2001
From: Seva Safris <safris@berkeley.edu>
Date: Sun, 28 Apr 2024 18:19:03 +0700
Subject: [PATCH] 1) Allow binding element devoid of entries, re #15. 2) Remove
 trailing whitespace.

---
 schema-0.5/binding-0.5.jsdx | 22 +++++++++++-----------
 schema-0.5/binding-0.5.xsd  | 10 +++++-----
 schema-0.5/include-0.5.jsdx |  2 +-
 schema-0.5/schema-0.5.jsdx  |  6 +++---
 schema-0.5/schema-0.5.xsd   |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/schema-0.5/binding-0.5.jsdx b/schema-0.5/binding-0.5.jsdx
index 878ef65..d62fd3c 100644
--- a/schema-0.5/binding-0.5.jsdx
+++ b/schema-0.5/binding-0.5.jsdx
@@ -27,7 +27,7 @@
 
   <import namespace="http://www.jsonx.org/schema-0.5.jsdx" schemaLocation="http://www.jsonx.org/schema-0.5.jsdx"><xi:include href="http://www.jsonx.org/schema-0.5.jsdx"/></import>
   <import namespace="http://www.jsonx.org/include-0.5.jsdx" schemaLocation="http://www.jsonx.org/include-0.5.jsdx"><xi:include href="http://www.jsonx.org/include-0.5.jsdx"/></import>
-  
+
   <string name="nonEmptyString" pattern="\S|\S.*\S"/>
   <string name="typeIdentifier" pattern="(([a-zA-Z_$][a-zA-Z\d_$]*)\.)*[a-zA-Z_$][a-zA-Z\d_$]*(\[\])?"/>
   <string name="methodIdentifier" pattern="(([a-zA-Z_$][a-zA-Z\d_$]*)\.)*[a-zA-Z_$][a-zA-Z\d_$]*(\.&lt;init&gt;)?"/>
@@ -50,11 +50,11 @@
   <object name="fieldBindings" abstract="true">
     <property names="\S|\S.*\S" xsi:type="any" types="fieldBinding" nullable="false"/>
   </object>
-  
+
   <object name="typeFieldBindings" abstract="true">
     <property names="\S|\S.*\S" xsi:type="any" types="typeFieldBinding" nullable="false"/>
   </object>
-  
+
   <object name="codecTypeFieldBindings" abstract="true">
     <property names="\S|\S.*\S" xsi:type="any" types="codecTypeFieldBinding" nullable="false"/>
   </object>
@@ -62,36 +62,36 @@
   <object name="any" extends="fieldBindings">
     <property name="@" xsi:type="string" pattern="any" nullable="false"/>
   </object>
-  
+
   <object name="reference" extends="fieldBindings">
     <property name="@" xsi:type="string" pattern="reference" nullable="false"/>
   </object>
-  
+
   <object name="array" extends="fieldBindings">
     <property name="@" xsi:type="string" pattern="array" nullable="false"/>
   </object>
-  
+
   <object name="object" extends="typeFieldBindings">
     <property name="@" xsi:type="string" pattern="object" nullable="false"/>
   </object>
-  
+
   <object name="boolean" extends="codecTypeFieldBindings">
     <property name="@" xsi:type="string" pattern="boolean" nullable="false"/>
   </object>
-  
+
   <object name="number" extends="codecTypeFieldBindings">
     <property name="@" xsi:type="string" pattern="number" nullable="false"/>
   </object>
-  
+
   <object name="string" extends="codecTypeFieldBindings">
     <property name="@" xsi:type="string" pattern="string" nullable="false"/>
   </object>
-  
+
   <object name="binding">
     <property name="@ns" xsi:type="string" pattern="http://www.jsonx.org/binding-0.5.jsd" nullable="false"/>
     <property name="@schemaLocation" xsi:type="string" pattern="((\S|\S.*\S) (\S|\S.*\S))+" use="optional" nullable="false"/>
     <property names="@schema" xsi:type="any" types="jx:schema ji:include" nullable="false"/>
     <property names="\S|\S.*\S" xsi:type="any" types="any reference array object boolean number string" nullable="false"/>
   </object>
-  
+
 </schema>
\ No newline at end of file
diff --git a/schema-0.5/binding-0.5.xsd b/schema-0.5/binding-0.5.xsd
index 5004115..d843be9 100644
--- a/schema-0.5/binding-0.5.xsd
+++ b/schema-0.5/binding-0.5.xsd
@@ -27,7 +27,7 @@
 
   <xs:import namespace="http://www.openjax.org/xml/datatypes-0.9.xsd" schemaLocation="http://www.openjax.org/xml/datatypes-0.9.xsd"/>
   <xs:import namespace="http://www.jsonx.org/schema-0.5.xsd" schemaLocation="http://www.jsonx.org/schema-0.5.xsd"/>
-  
+
   <xs:simpleType name="methodIdentifier">
     <xs:restriction base="xs:string">
       <xs:pattern value="(([a-zA-Z_$][a-zA-Z\d_$]*)\.)*[a-zA-Z_$][a-zA-Z\d_$]*(\.&lt;init&gt;)?"/>
@@ -58,7 +58,7 @@
       </xs:annotation>
     </xs:attribute>
   </xs:complexType>
-  
+
   <xs:complexType name="typeFieldBinding">
     <xs:complexContent>
       <xs:extension base="jb:fieldBinding">
@@ -88,7 +88,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="path" abstract="true">
     <xs:attribute name="path">
       <xs:simpleType>
@@ -131,9 +131,9 @@
 
   <xs:element name="binding">
     <xs:complexType>
-      <xs:sequence>
+      <xs:sequence minOccurs="0">
         <xs:element ref="jx:schema"/>
-        <xs:choice maxOccurs="unbounded">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
           <xs:element name="any" maxOccurs="unbounded">
             <xs:complexType>
               <xs:complexContent>
diff --git a/schema-0.5/include-0.5.jsdx b/schema-0.5/include-0.5.jsdx
index 618dccb..9d584f7 100644
--- a/schema-0.5/include-0.5.jsdx
+++ b/schema-0.5/include-0.5.jsdx
@@ -20,7 +20,7 @@
   xmlns:jxns="http://www.jsonx.org/namespace"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.jsonx.org/schema-0.5.xsd schema-0.5.xsd"
-  
+
   jxns:jx="http://www.jsonx.org/schema-0.5.jsdx"
   targetNamespace="http://www.jsonx.org/include-0.5.jsdx">
 
diff --git a/schema-0.5/schema-0.5.jsdx b/schema-0.5/schema-0.5.jsdx
index fb7d11b..f684e0a 100644
--- a/schema-0.5/schema-0.5.jsdx
+++ b/schema-0.5/schema-0.5.jsdx
@@ -34,7 +34,7 @@
   </object>
 
   <object name="member" abstract="true" extends="documented"/>
-  
+
   <object name="import">
     <property name="@namespace" xsi:type="reference" type="nonEmptyString" nullable="false" use="optional"/>
     <property name="@schemaLocation" xsi:type="reference" type="schemaLocation" use="optional" nullable="false"/>
@@ -49,7 +49,7 @@
     </property>
     <property names="[a-zA-Z_][-a-zA-Z\d_]*" xsi:type="any" types="array boolean number objectType string" nullable="false"/>
   </object>
-  
+
   <object name="any" extends="member" abstract="true">
     <property name="@" xsi:type="string" pattern="any" nullable="false"/>
     <property name="@types" xsi:type="reference" type="nonEmptyString" use="optional" nullable="false"/>
@@ -164,5 +164,5 @@
     <property name="@minOccurs" xsi:type="reference" type="min" use="optional" nullable="false"/>
     <property name="@maxOccurs" xsi:type="reference" type="max" use="optional" nullable="false"/>
   </object>
-  
+
 </schema>
\ No newline at end of file
diff --git a/schema-0.5/schema-0.5.xsd b/schema-0.5/schema-0.5.xsd
index d18f706..ca1f87d 100644
--- a/schema-0.5/schema-0.5.xsd
+++ b/schema-0.5/schema-0.5.xsd
@@ -103,7 +103,7 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
   <xs:complexType name="reference">
     <xs:complexContent>
       <xs:extension base="jx:referenceMember">