Skip to content

Commit 708279c

Browse files
Update text node methods
1 parent fa84eb2 commit 708279c

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

csharp/Platform.Data.Doublets.Xml/DefaultXmlStorage.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -539,15 +539,20 @@ public TLinkAddress CreateTextNode(string text)
539539
return Links.GetOrCreate(TextNodeType, contentLink);
540540
}
541541

542-
public string GetTextNodeValue(TLinkAddress textNodeLinkAddress)
542+
public void EnsureIsTextNode(TLinkAddress possibleTextNodeLinkAddress)
543543
{
544-
var textNodeType = Links.GetSource(textNodeLinkAddress);
545-
if (!EqualityComparer.Equals(textNodeType, TextNodeType))
544+
if(!IsTextNode(possibleTextNodeLinkAddress))
546545
{
547-
throw new Exception("The passed link address is not a text element link address.");
546+
throw new ArgumentException($"{possibleTextNodeLinkAddress} is not a text node link address");
548547
}
548+
}
549+
550+
551+
public string GetTextNode(TLinkAddress textNodeLinkAddress)
552+
{
553+
EnsureIsTextNode(textNodeLinkAddress);
549554
var contentLink = Links.GetTarget(textNodeLinkAddress);
550-
return UnicodeSequenceToStringConverter.Convert(contentLink);
555+
return GetString(contentLink);
551556
}
552557

553558
#endregion

csharp/Platform.Data.Doublets.Xml/XmlExporter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void ExportNode(XmlWriter xmlWriter, TLinkAddress nodeLinkAddress)
5555
}
5656
else
5757
{
58-
throw new ArgumentException("The passed link address is not a text, attribute or element.", nameof(nodeLinkAddress));
58+
throw new ArgumentException("The passed link address is not a node.", nameof(nodeLinkAddress));
5959
}
6060
}
6161

@@ -79,7 +79,7 @@ private void ExportAttributeNode(XmlWriter xmlWriter, TLinkAddress xmlNodeLinkAd
7979

8080
public void ExportTextNode(XmlWriter xmlWriter, TLinkAddress textNodeLinkAddress)
8181
{
82-
var text = _storage.GetTextNodeValue(textNodeLinkAddress);
82+
var text = _storage.GetTextNode(textNodeLinkAddress);
8383
xmlWriter.WriteString(text);
8484
}
8585
}

0 commit comments

Comments
 (0)