GNOME.org
 

[gxml] XSD: removed Gom prefix in classes' name

commit 825dfa96f545775c552baf09d84a6564cc633265
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Jul 5 15:18:30 2019 -0500

    XSD: removed Gom prefix in classes' name

 gxml/GomProperty.vala                           |   6 +-
 gxml/{GomSchema.vala => XsdSchema.vala}         | 142 ++++++++++++------------
 gxml/meson.build                                |   2 +-
 test/{GomSchemaTest.vala => XsdSchemaTest.vala} |   8 +-
 test/meson.build                                |   2 +-
 5 files changed, 80 insertions(+), 80 deletions(-)
---
diff --git a/gxml/GomProperty.vala b/gxml/GomProperty.vala
index 2a0d618..3b53dd5 100644
--- a/gxml/GomProperty.vala
+++ b/gxml/GomProperty.vala
@@ -174,7 +174,7 @@ public class GXml.GomXsdArrayString : GomArrayString {
     if (_source == null) return;
     if (!_source.query_exists ()) return;
     if (_simple_type == null) return;
-    var xsd = new GomXsdSchema ();
+    var xsd = new XsdSchema ();
     xsd.read_from_file (_source);
     if (xsd.simple_type_definitions == null) return;
     if (xsd.simple_type_definitions.length == 0) return;
@@ -183,7 +183,7 @@ public class GXml.GomXsdArrayString : GomArrayString {
     message ("SimpleType definitions: "+xsd.simple_type_definitions.length.to_string ());
 #endif
     for (int i = 0; i < xsd.simple_type_definitions.length; i++) {
-      var st = xsd.simple_type_definitions.get_item (i) as GomXsdSimpleType;
+      var st = xsd.simple_type_definitions.get_item (i) as XsdSimpleType;
 #if DEBUG
           message ("Item SimpleType %i is Null %s: ".printf (i, (st == null).to_string ()));
 #endif
@@ -201,7 +201,7 @@ public class GXml.GomXsdArrayString : GomArrayString {
         if (st.restriction.enumerations.length == 0) continue;
         string[] vals = {};
         for (int j = 0; j < st.restriction.enumerations.length; j++) {
-          var en = st.restriction.enumerations.get_item (j) as GomXsdTypeRestrictionEnumeration;
+          var en = st.restriction.enumerations.get_item (j) as XsdTypeRestrictionEnumeration;
           if (en == null) continue;
           if (en.value == null) continue;
 #if DEBUG
diff --git a/gxml/GomSchema.vala b/gxml/XsdSchema.vala
similarity index 62%
rename from gxml/GomSchema.vala
rename to gxml/XsdSchema.vala
index c7b70dd..3c5acc4 100644
--- a/gxml/GomSchema.vala
+++ b/gxml/XsdSchema.vala
@@ -24,10 +24,10 @@ using GXml;
 /**
  * Reference interfaces for XSD support.
  */
-public class GXml.GomXsdSchema : GXml.Element {
-  public GomXsdListElements element_definitions { get; set; }
-  public GomXsdListSimpleTypes simple_type_definitions { get; set; }
-  public GomXsdListComplexTypes complex_type_definitions { get; set; }
+public class GXml.XsdSchema : GXml.Element {
+  public XsdListElements element_definitions { get; set; }
+  public XsdListSimpleTypes simple_type_definitions { get; set; }
+  public XsdListComplexTypes complex_type_definitions { get; set; }
   construct {
     initialize_with_namespace (IXsdSchema.SCHEMA_NAMESPACE_URI,
                               IXsdSchema.SCHEMA_NAMESPACE_PREFIX,
@@ -35,7 +35,7 @@ public class GXml.GomXsdSchema : GXml.Element {
   }
 }
 
-public class GXml.GomXsdSimpleType : GXml.Element {
+public class GXml.XsdSimpleType : GXml.Element {
   /**
    * (#all | List of (list | union | restriction | extension))
    */
@@ -43,10 +43,10 @@ public class GXml.GomXsdSimpleType : GXml.Element {
   public string final { get; set; }
   [Description (nick="::name")]
   public string name { get; set; }
-  public GomXsdAnnotation annotation { get; set; }
-  public GomXsdTypeList list { get; set; }
-  public GomXsdTypeUnion union { get; set; }
-  public GomXsdTypeRestriction restriction { get; set; }
+  public XsdAnnotation annotation { get; set; }
+  public XsdTypeList list { get; set; }
+  public XsdTypeUnion union { get; set; }
+  public XsdTypeRestriction restriction { get; set; }
   construct {
     initialize_with_namespace (IXsdSchema.SCHEMA_NAMESPACE_URI,
                               IXsdSchema.SCHEMA_NAMESPACE_PREFIX,
@@ -54,17 +54,17 @@ public class GXml.GomXsdSimpleType : GXml.Element {
   }
 }
 
-public class GXml.GomXsdTypeDefinition : GXml.Element {
-  public GomXsdAnnotation annotation { get; set; }
+public class GXml.XsdTypeDefinition : GXml.Element {
+  public XsdAnnotation annotation { get; set; }
 }
-public class GXml.GomXsdTypeList : GomXsdTypeDefinition {}
-public class GXml.GomXsdTypeUnion : GomXsdTypeDefinition {}
-public class GXml.GomXsdTypeRestriction : GomXsdTypeDefinition {
+public class GXml.XsdTypeList : XsdTypeDefinition {}
+public class GXml.XsdTypeUnion : XsdTypeDefinition {}
+public class GXml.XsdTypeRestriction : XsdTypeDefinition {
   [Description (nick="::base")]
   public string base { get; set; }
-  public GomXsdSimpleType simple_type { get; set; }
-  public GomXsdListTypeRestrictionEnumerations enumerations { get; set; }
-  public GomXsdListTypeRestrictionWhiteSpaces white_spaces { get; set; }
+  public XsdSimpleType simple_type { get; set; }
+  public XsdListTypeRestrictionEnumerations enumerations { get; set; }
+  public XsdListTypeRestrictionWhiteSpaces white_spaces { get; set; }
   construct {
     initialize_with_namespace (IXsdSchema.SCHEMA_NAMESPACE_URI,
                               IXsdSchema.SCHEMA_NAMESPACE_PREFIX,
@@ -72,19 +72,19 @@ public class GXml.GomXsdTypeRestriction : GomXsdTypeDefinition {
   }
 }
 
-public class GXml.GomXsdTypeRestrictionDef : GXml.Element {
-  public GomXsdAnnotation annotation { get; set; }
+public class GXml.XsdTypeRestrictionDef : GXml.Element {
+  public XsdAnnotation annotation { get; set; }
 }
-public class GXml.GomXsdTypeRestrictionMinExclusive : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionMinInclusive : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionMaxExclusive : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionMaxInclusive : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionTotalDigits : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionFractionDigits : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionLength : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionMinLength : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionMaxLength : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionEnumeration : GomXsdTypeRestrictionDef {
+public class GXml.XsdTypeRestrictionMinExclusive : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionMinInclusive : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionMaxExclusive : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionMaxInclusive : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionTotalDigits : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionFractionDigits : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionLength : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionMinLength : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionMaxLength : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionEnumeration : XsdTypeRestrictionDef {
   [Description (nick="::value")]
   public string value { get; set; }
   construct {
@@ -93,7 +93,7 @@ public class GXml.GomXsdTypeRestrictionEnumeration : GomXsdTypeRestrictionDef {
                               IXsdTypeRestrictionEnumeration.SCHEMA_NODE_NAME);
   }
 }
-public class GXml.GomXsdTypeRestrictionWhiteSpace: GomXsdTypeRestrictionDef {
+public class GXml.XsdTypeRestrictionWhiteSpace: XsdTypeRestrictionDef {
   [Description (nick="::fixed")]
   public Fixed fixed { get; set; }
   /**
@@ -108,13 +108,13 @@ public class GXml.GomXsdTypeRestrictionWhiteSpace: GomXsdTypeRestrictionDef {
   }
   public class Fixed : GomBoolean {}
 }
-public class GXml.GomXsdTypeRestrictionPattern : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionAssertion : GomXsdTypeRestrictionDef {}
-public class GXml.GomXsdTypeRestrictionExplicitTimezone : GomXsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionPattern : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionAssertion : XsdTypeRestrictionDef {}
+public class GXml.XsdTypeRestrictionExplicitTimezone : XsdTypeRestrictionDef {}
 
-public class GXml.GomXsdComplexType : GomXsdBaseType {
-  protected GomXsdList _type_attributes = null;
-  protected GomXsdList _group_attributes = null;
+public class GXml.XsdComplexType : XsdBaseType {
+  protected XsdList _type_attributes = null;
+  protected XsdList _group_attributes = null;
   /**
   * attribute name = abstract
   */
@@ -134,17 +134,17 @@ public class GXml.GomXsdComplexType : GomXsdBaseType {
    */
   public bool default_attributes_apply { get; set; default = true; }
   /**
-   * A {@link GomXsdComplexType} or {@link GomXsdSimpleType}
+   * A {@link XsdComplexType} or {@link XsdSimpleType}
    */
-  public GomXsdBaseContent content_type { get; set; }
+  public XsdBaseContent content_type { get; set; }
   /**
-   * List of type {@link GomXsdAttribute} definitions
+   * List of type {@link XsdAttribute} definitions
    */
-  public GomXsdList type_attributes { get { return _type_attributes; } }
+  public XsdList type_attributes { get { return _type_attributes; } }
   /**
-   * List of group {@link GomXsdAttribute} definitions
+   * List of group {@link XsdAttribute} definitions
    */
-  public GomXsdList group_attributes { get { return _group_attributes; } }
+  public XsdList group_attributes { get { return _group_attributes; } }
   construct {
     initialize_with_namespace (IXsdSchema.SCHEMA_NAMESPACE_URI,
                               IXsdSchema.SCHEMA_NAMESPACE_PREFIX,
@@ -152,7 +152,7 @@ public class GXml.GomXsdComplexType : GomXsdBaseType {
   }
 }
 
-public class GXml.GomXsdExtension : GXml.Element {
+public class GXml.XsdExtension : GXml.Element {
   [Description (nick="::base")]
   public string base { get; set; }
   construct {
@@ -162,7 +162,7 @@ public class GXml.GomXsdExtension : GXml.Element {
   }
 }
 
-public class GXml.GomXsdElement : GXml.Element {
+public class GXml.XsdElement : GXml.Element {
   /**
   * attribute name = abstract
   */
@@ -219,11 +219,11 @@ public class GXml.GomXsdElement : GXml.Element {
   [Description (nick="::type")]
   public string object_type { get; set; }
   [Description (nick="::annotation")]
-  public GomXsdAnnotation anotation { get; set; }
+  public XsdAnnotation anotation { get; set; }
   [Description (nick="::SimpleType")]
-  public GomXsdSimpleType simple_type { get; set; }
+  public XsdSimpleType simple_type { get; set; }
   [Description (nick="::ComplexType")]
-  public GomXsdComplexType complex_type { get; set; }
+  public XsdComplexType complex_type { get; set; }
   construct {
     initialize_with_namespace (IXsdSchema.SCHEMA_NAMESPACE_URI,
                               IXsdSchema.SCHEMA_NAMESPACE_PREFIX,
@@ -232,31 +232,31 @@ public class GXml.GomXsdElement : GXml.Element {
 }
 
 
-public class GXml.GomXsdAnnotation : GXml.Element {
+public class GXml.XsdAnnotation : GXml.Element {
 }
 
-public class GXml.GomXsdBaseType : GXml.Element {
-  public GomXsdAnnotation anotation { get; set; }
+public class GXml.XsdBaseType : GXml.Element {
+  public XsdAnnotation anotation { get; set; }
 }
 
-public class GXml.GomXsdBaseContent : GXml.Element {
-  public GomXsdAnnotation anotation { get; set; }
+public class GXml.XsdBaseContent : GXml.Element {
+  public XsdAnnotation anotation { get; set; }
 }
-public class GXml.GomXsdSimpleContent : GomXsdBaseContent {
+public class GXml.XsdSimpleContent : XsdBaseContent {
   construct { initialize (GXml.IXsdSimpleContent.SCHEMA_NODE_NAME); }
 }
-public class GXml.GomXsdComplexContent : GomXsdBaseContent {
+public class GXml.XsdComplexContent : XsdBaseContent {
   construct { initialize (GXml.IXsdComplexContent.SCHEMA_NODE_NAME); }
 }
-public class GXml.GomXsdOpenContent : GomXsdBaseContent {}
+public class GXml.XsdOpenContent : XsdBaseContent {}
 
-public class GXml.GomXsdBaseAttribute : GXml.Element  {
-  public GomXsdAnnotation anotation { get; set; }
+public class GXml.XsdBaseAttribute : GXml.Element  {
+  public XsdAnnotation anotation { get; set; }
 }
-public class GXml.GomXsdAttribute : GomXsdBaseAttribute {}
-public class GXml.GomXsdAttributeGroup : GomXsdBaseAttribute {}
+public class GXml.XsdAttribute : XsdBaseAttribute {}
+public class GXml.XsdAttributeGroup : XsdBaseAttribute {}
 
-public class GXml.GomXsdList : ArrayList {
+public class GXml.XsdList : ArrayList {
   public new int length {
     get { return (this as ArrayList).length; }
   }
@@ -277,46 +277,46 @@ public class GXml.GomXsdList : ArrayList {
     }
     return -1;
   }/*
-  public DomElement? GomXsdList.get_item (int index) {
+  public DomElement? XsdList.get_item (int index) {
     return (this as GomArrayList).get_item (index);
   }*/
 }
 
-public class GXml.GomXsdListElements : GomXsdList {
+public class GXml.XsdListElements : XsdList {
   construct {
-    try { initialize (typeof (GomXsdElement)); }
+    try { initialize (typeof (XsdElement)); }
     catch (GLib.Error e) {
       warning (_("Collection type %s, initialization error: %s").printf (get_type ().name(), e.message));
     }
   }
 }
-public class GXml.GomXsdListSimpleTypes : GomXsdList {
+public class GXml.XsdListSimpleTypes : XsdList {
   construct {
-    try { initialize (typeof (GomXsdSimpleType)); }
+    try { initialize (typeof (XsdSimpleType)); }
     catch (GLib.Error e) {
       warning (_("Collection type %s, initialization error: %s").printf (get_type ().name(), e.message));
     }
   }
 }
-public class GXml.GomXsdListComplexTypes : GomXsdList {
+public class GXml.XsdListComplexTypes : XsdList {
   construct {
-    try { initialize (typeof (GomXsdComplexType)); }
+    try { initialize (typeof (XsdComplexType)); }
     catch (GLib.Error e) {
       warning (_("Collection type %s, initialization error: %s").printf (get_type ().name(), e.message));
     }
   }
 }
-public class GXml.GomXsdListTypeRestrictionEnumerations : GomXsdList {
+public class GXml.XsdListTypeRestrictionEnumerations : XsdList {
   construct {
-    try { initialize (typeof (GomXsdTypeRestrictionEnumeration)); }
+    try { initialize (typeof (XsdTypeRestrictionEnumeration)); }
     catch (GLib.Error e) {
       warning (_("Collection type %s, initialization error: %s").printf (get_type ().name(), e.message));
     }
   }
 }
-public class GXml.GomXsdListTypeRestrictionWhiteSpaces : GomXsdList {
+public class GXml.XsdListTypeRestrictionWhiteSpaces : XsdList {
   construct {
-    try { initialize (typeof (GomXsdTypeRestrictionWhiteSpace)); }
+    try { initialize (typeof (XsdTypeRestrictionWhiteSpace)); }
     catch (GLib.Error e) {
       warning (_("Collection type %s, initialization error: %s").printf (get_type ().name(), e.message));
     }
diff --git a/gxml/meson.build b/gxml/meson.build
index f44cfbe..a7bb52f 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -60,7 +60,6 @@ valasources = files ([
        'GomHashThreeMap.vala',
        'GomObject.vala',
        'GomProperty.vala',
-       'GomSchema.vala',
        'GomStringRef.vala',
        'gxml-init.vala',
        'HTMLCollection.vala',
@@ -87,6 +86,7 @@ valasources = files ([
        'XParser.vala',
        'XPath.vala',
        'XProcessingInstruction.vala',
+       'XsdSchema.vala',
        'XText.vala',
 ])
 
diff --git a/test/GomSchemaTest.vala b/test/XsdSchemaTest.vala
similarity index 89%
rename from test/GomSchemaTest.vala
rename to test/XsdSchemaTest.vala
index da47fb0..3499a77 100644
--- a/test/GomSchemaTest.vala
+++ b/test/XsdSchemaTest.vala
@@ -28,7 +28,7 @@ class GomSchemaTest : GXmlTest  {
                        try {
                                var f = GLib.File.new_for_path (GXmlTestConfig.TEST_DIR+"/schema-test.xsd");
                                assert (f.query_exists ());
-                               var sch = new GomXsdSchema ();
+                               var sch = new XsdSchema ();
 #if DEBUG
                                message ("XSD Empty: "+sch.write_string ());
                                message ("XSD node name: "+sch.node_name);
@@ -39,18 +39,18 @@ class GomSchemaTest : GXmlTest  {
                                message ("XSD: "+sch.write_string ());
 #endif
                                assert (sch.simple_type_definitions != null);
-                               var st = sch.simple_type_definitions.get_item (0) as GomXsdSimpleType;
+                               var st = sch.simple_type_definitions.get_item (0) as XsdSimpleType;
                                assert (st != null);
                                assert (st.restriction != null);
                                assert (st.restriction.base != null);
                                assert (st.restriction.base == "xs:string");
                                assert (st.restriction.enumerations != null);
                                assert (st.restriction.enumerations.length == 20);
-                               var enumt1 = st.restriction.enumerations.get_item (0) as 
GomXsdTypeRestrictionEnumeration;
+                               var enumt1 = st.restriction.enumerations.get_item (0) as 
XsdTypeRestrictionEnumeration;
                                assert (enumt1 != null);
                                assert (enumt1.value != null);
                                assert (enumt1.value == "01");
-                               var enumt20 = st.restriction.enumerations.get_item (19) as 
GomXsdTypeRestrictionEnumeration;
+                               var enumt20 = st.restriction.enumerations.get_item (19) as 
XsdTypeRestrictionEnumeration;
                                assert (enumt20 != null);
                                assert (enumt20.value != null);
                                assert (enumt20.value == "99");
diff --git a/test/meson.build b/test/meson.build
index 2f48b08..9773fbf 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -12,7 +12,7 @@ files_tests = files ([
                'DocumentTest.vala',
                'ElementTest.vala',
                'SerializationTest.vala',
-               'GomSchemaTest.vala',
+               'XsdSchemaTest.vala',
                'XElementTest.vala',
                'XPathTest.vala',
        ])
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]