[gxml] TNode: Removed
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] TNode: Removed
- Date: Thu, 4 Jul 2019 23:42:50 +0000 (UTC)
commit 3a82a533b209fce1070e654141b5690af7ff7ec8
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Jul 4 12:35:53 2019 -0500
TNode: Removed
Fix issue #7
gxml/GXmlDocument.vala | 19 +-
gxml/GXmlParser.vala | 2 +-
gxml/Serializable.vala | 427 --------
gxml/SerializableBool.vala | 55 --
gxml/SerializableContainer.vala | 78 --
gxml/SerializableDouble.vala | 60 --
gxml/SerializableEnum.vala | 86 --
gxml/SerializableFloat.vala | 46 -
gxml/SerializableGeeArrayList.vala | 172 ----
gxml/SerializableGeeDualKeyMap.vala | 255 -----
gxml/SerializableGeeHashMap.vala | 170 ----
gxml/SerializableGeeTreeMap.vala | 171 ----
gxml/SerializableInt.vala | 44 -
gxml/SerializableMapDualKey.vala | 41 -
gxml/SerializableMapKey.vala | 38 -
gxml/SerializableObjectModel.vala | 489 ---------
gxml/SerializableProperty.vala | 130 ---
gxml/SerializableValueList.vala | 107 --
gxml/TAttribute.vala | 67 --
gxml/TCDATA.vala | 48 -
gxml/TComment.vala | 48 -
gxml/TDocument.vala | 725 --------------
gxml/TElement.vala | 160 ---
gxml/TNamespace.vala | 43 -
gxml/TNode.vala | 109 --
gxml/TProcessingInstruction.vala | 51 -
gxml/TText.vala | 49 -
gxml/meson.build | 25 -
test/SerializableBasicTypesTest.vala | 204 ----
test/SerializableGeeArrayListTest.vala | 321 ------
.../SerializableGeeCollections-TDocument-Test.vala | 523 ----------
test/SerializableGeeCollectionsTest.vala | 666 -------------
test/SerializableGeeDualKeyMapTest.vala | 416 --------
test/SerializableGeeHashMapTest.vala | 436 --------
test/SerializableGeeTreeMapTest.vala | 394 --------
test/SerializableObjectModel-TDocument-Test.vala | 590 -----------
test/SerializableObjectModelTest.vala | 1038 --------------------
test/SerializablePropertyBoolTest.vala | 144 ---
test/SerializablePropertyDoubleTest.vala | 161 ---
test/SerializablePropertyEnumTest.vala | 173 ----
test/SerializablePropertyFloatTest.vala | 157 ---
test/SerializablePropertyIntTest.vala | 151 ---
test/SerializablePropertyValueListTest.vala | 248 -----
test/SerializableTest.vala | 289 ------
test/TCDATATest.vala | 48 -
test/TCommentTest.vala | 51 -
test/TDocumentTest.vala | 841 ----------------
test/TElementTest.vala | 704 -------------
test/TProcessingInstructionTest.vala | 51 -
test/meson.build | 23 -
50 files changed, 9 insertions(+), 11335 deletions(-)
---
diff --git a/gxml/GXmlDocument.vala b/gxml/GXmlDocument.vala
index 7557725..24dd91a 100644
--- a/gxml/GXmlDocument.vala
+++ b/gxml/GXmlDocument.vala
@@ -158,16 +158,12 @@ public class GXml.GDocument : GXml.GNode,
}
public override string to_string ()
{
-#if DEBUG
- GLib.message ("TDocument: to_string ()");
-#endif
- Xml.Doc doc = null;
- Xml.TextWriter tw = new Xml.TextWriter.doc (out doc);
- try { TDocument.write_document (this, tw); } catch { return "<?xml version=\"0\"?>"; }
- string str;
- int size;
- doc.dump_memory (out str, out size);
- return str;
+ try {
+ return write_string ();
+ } catch (GLib.Error e) {
+ warning (_("Error writting documento to string: %s"), e.message);
+ return "";
+ }
}
/**
* Uses libxml2 internal dump to memory function over owned
@@ -185,7 +181,8 @@ public class GXml.GDocument : GXml.GNode,
public virtual bool save_as (GLib.File f, GLib.Cancellable? cancellable = null)
throws GLib.Error
{
- return TDocument.tw_save_as (this, f, cancellable);
+ write_file (f, cancellable);
+ return true;
}
// DomDocument implementation
protected GImplementation _implementation = new GImplementation ();
diff --git a/gxml/GXmlParser.vala b/gxml/GXmlParser.vala
index d12fc45..9e0f30e 100644
--- a/gxml/GXmlParser.vala
+++ b/gxml/GXmlParser.vala
@@ -34,7 +34,7 @@ private class GXml.GParser : Object, Parser {
public GXml.DomElement? create_element (GXml.DomNode parent) throws GLib.Error { return null; }
public GLib.InputStream create_stream () throws GLib.Error {
string str = document.libxml_to_string ();
- return new MemoryInputStream.from_data ((uint8[]) str);
+ return new MemoryInputStream.from_data (str.data);
}
public async GLib.InputStream create_stream_async () throws GLib.Error {
Idle.add (create_stream_async.callback);
diff --git a/gxml/meson.build b/gxml/meson.build
index 87f4384..01c9779 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -98,32 +98,7 @@ valasources = files ([
'Parser.vala',
'ProcessingInstruction.vala',
'Schema.vala',
- 'Serializable.vala',
- 'SerializableBool.vala',
- 'SerializableContainer.vala',
- 'SerializableDouble.vala',
- 'SerializableEnum.vala',
- 'SerializableFloat.vala',
- 'SerializableGeeArrayList.vala',
- 'SerializableGeeDualKeyMap.vala',
- 'SerializableGeeHashMap.vala',
- 'SerializableGeeTreeMap.vala',
- 'SerializableInt.vala',
- 'SerializableMapDualKey.vala',
- 'SerializableMapKey.vala',
- 'SerializableObjectModel.vala',
- 'SerializableProperty.vala',
- 'SerializableValueList.vala',
- 'TAttribute.vala',
- 'TCDATA.vala',
- 'TComment.vala',
- 'TDocument.vala',
- 'TElement.vala',
'Text.vala',
- 'TNamespace.vala',
- 'TNode.vala',
- 'TProcessingInstruction.vala',
- 'TText.vala',
'XParser.vala',
'XPath.vala'
])
diff --git a/test/meson.build b/test/meson.build
index ed62594..43fc8ea 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -23,30 +23,7 @@ files_tests = files ([
tests_cargs = []
if get_option('enable-tnode-tests')
files_tests += files ([
-
'EnumerationTest.vala',
- 'SerializableTest.vala',
- 'SerializablePropertyBoolTest.vala',
- 'SerializablePropertyDoubleTest.vala',
- 'SerializablePropertyFloatTest.vala',
- 'SerializablePropertyEnumTest.vala',
- 'SerializablePropertyIntTest.vala',
- 'SerializablePropertyValueListTest.vala',
- 'SerializableObjectModelTest.vala',
- 'SerializableObjectModel-TDocument-Test.vala',
- 'SerializableGeeTreeMapTest.vala',
- 'SerializableGeeDualKeyMapTest.vala',
- 'SerializableGeeArrayListTest.vala',
- 'SerializableGeeHashMapTest.vala',
- 'SerializableGeeCollectionsTest.vala',
- 'SerializableGeeCollections-TDocument-Test.vala',
- 'SerializableBasicTypesTest.vala',
- 'gxml-performance.vala',
- 'TElementTest.vala',
- 'TDocumentTest.vala',
- 'TCDATATest.vala',
- 'TCommentTest.vala',
- 'TProcessingInstructionTest.vala',
])
tests_cargs += [
'-DENABLE_TNODE_TESTS',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]