diff --git a/IDTF.Net/IDTFNodes.cs b/IDTF.Net/IDTFNodes.cs index 46e2125..2d76a61 100644 --- a/IDTF.Net/IDTFNodes.cs +++ b/IDTF.Net/IDTFNodes.cs @@ -4,56 +4,65 @@ using System.IO; namespace IDTF.Net { - // References: -// http://jmol.svn.sourceforge.net/viewvc/jmol/trunk/Jmol/src/org/jmol/export/_IdtfExporter.java?revision=HEAD&view=markup -// http://www2.iaas.msu.ru/tmp/u3d/ + // References: + // http://jmol.svn.sourceforge.net/viewvc/jmol/trunk/Jmol/src/org/jmol/export/_IdtfExporter.java?revision=HEAD&view=markup + // http://www2.iaas.msu.ru/tmp/u3d/ - public abstract class Node - { - public Node() - { - this.MetaData = new MetaData(); - } + public abstract class Node + { + public Node() + { + this.MetaData = new MetaData(); + } - public string Name { get; set; } + public string Name + { + get => name; + set + { + name = value.Replace("\"","\\\""); + } + } - public NodeType Type { get; protected set; } + public NodeType Type { get; protected set; } - private List _parents; - public List Parents - { - get - { - if (_parents == null) { _parents = new List(); } - return _parents; - } + private List _parents; + private string name; - set - { - _parents = value; - } - } + public List Parents + { + get + { + if (_parents == null) { _parents = new List(); } + return _parents; + } - public MetaData MetaData { get; private set; } + set + { + _parents = value; + } + } - protected void WriteCommonOutputWithoutMetaData(StreamWriter toStream) - { - toStream.WriteLine(String.Format("\tNODE_NAME \"{0}\"", this.Name)); - if (_parents != null) - { - ListExtensions.ExportParentListToStream(_parents, toStream); - } - } + public MetaData MetaData { get; private set; } - protected void WriteMetaData(StreamWriter toStream) - { - this.MetaData.WriteOutput(toStream); - } + protected void WriteCommonOutputWithoutMetaData(StreamWriter toStream) + { + toStream.WriteLine(String.Format("\tNODE_NAME \"{0}\"", this.Name)); + if (_parents != null) + { + ListExtensions.ExportParentListToStream(_parents, toStream); + } + } - } + protected void WriteMetaData(StreamWriter toStream) + { + this.MetaData.WriteOutput(toStream); + } + + } - public class Group : Node + public class Group : Node { public Group() : base() { diff --git a/IDTF.Net/IDTFResources.cs b/IDTF.Net/IDTFResources.cs index 0c22e6e..5746d6b 100644 --- a/IDTF.Net/IDTFResources.cs +++ b/IDTF.Net/IDTFResources.cs @@ -24,7 +24,16 @@ namespace IDTF.Net public abstract class Resource { - public string Name { get; set; } + private string name; + + public string Name + { + get => name; + set + { + name = value.Replace("\"", "\\\""); + } + } public abstract ResourceListType ResourceType { get; } public abstract void Export(StreamWriter toStream); }