Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/MStabDamXmlSerializer.cs =================================================================== diff -u -r3113 -r3114 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/MStabDamXmlSerializer.cs (.../MStabDamXmlSerializer.cs) (revision 3113) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/MStabDamXmlSerializer.cs (.../MStabDamXmlSerializer.cs) (revision 3114) @@ -22,81 +22,77 @@ using System; using System.IO; using System.Reflection; +using System.Text; using System.Xml.Serialization; namespace Deltares.LayerOnSlopeTool.Io { public class MStabDamXmlSerializer { /// - /// Saves the DamMStabDoc as XML. + /// Saves the tnsPrefixDamMStabDoc as XML. /// /// The filename. - /// The DamMStabDoc. - public static void SaveDamMStabDocAsXmlFile(string filename, DamMStabDoc DamMStabDoc) + /// The tnsPrefixDamMStabDoc. + public static void SaveDamMStabDocAsXmlFile(string filename, tnsPrefixDamMStabDoc tnsPrefixDamMStabDoc) { - DamMStabDoc.FileIdentification = CreateFileIdentification(); - XmlSerializer xmlSerializer = new XmlSerializer(typeof(DamMStabDoc)); - TextWriter writer = new StreamWriter(filename); - xmlSerializer.Serialize(writer, DamMStabDoc); - writer.Close(); + string xmlString = SaveDamMStabDocAsXmlString(tnsPrefixDamMStabDoc); + File.WriteAllText(filename, xmlString, Encoding.Unicode); } /// - /// Loads the DamMStabDoc from XML. + /// Loads the tnsPrefixDamMStabDoc from XML. /// /// The filename. - /// DamMStabDoc object - public static DamMStabDoc LoadDamMStabDocFromXmlFile(string filename) + /// tnsPrefixDamMStabDoc object + public static tnsPrefixDamMStabDoc LoadDamMStabDocFromXmlFile(string filename) { - DamMStabDoc DamMStabDoc; - XmlSerializer xmlSerializer = new XmlSerializer(typeof(DamMStabDoc)); - FileStream fs = new FileStream(filename, FileMode.Open); - DamMStabDoc = (DamMStabDoc)xmlSerializer.Deserialize(fs); - return DamMStabDoc; + string xmlString = File.ReadAllText(filename); + tnsPrefixDamMStabDoc tnsPrefixDamMStabDoc = LoadDamMStabDocFromXmlString(xmlString); + return tnsPrefixDamMStabDoc; } /// - /// Saves the DamMStabDoc as XML string. + /// Saves the tnsPrefixDamMStabDoc as XML string. /// - /// The DamMStabDoc. + /// The tnsPrefixDamMStabDoc. /// xm string - public static string SaveDamMStabDocAsXmlString(DamMStabDoc DamMStabDoc) + public static string SaveDamMStabDocAsXmlString(tnsPrefixDamMStabDoc tnsPrefixDamMStabDoc) { - DamMStabDoc.FileIdentification = CreateFileIdentification(); - XmlSerializer xmlSerializer = new XmlSerializer(typeof(DamMStabDoc)); + tnsPrefixDamMStabDoc.tnsPrefixFileIdentification = CreateFileIdentification(); + XmlSerializer xmlSerializer = new XmlSerializer(typeof(tnsPrefixDamMStabDoc)); TextWriter writer = new StringWriter(); - xmlSerializer.Serialize(writer, DamMStabDoc); + xmlSerializer.Serialize(writer, tnsPrefixDamMStabDoc); return writer.ToString(); } /// - /// Loads the DamMStabDoc from XML string. + /// Loads the tnsPrefixDamMStabDoc from XML string. /// /// The XML string. - /// DamMStabDoc object - public static DamMStabDoc LoadDamMStabDocFromXmlString(string xmlString) + /// tnsPrefixDamMStabDoc object + public static tnsPrefixDamMStabDoc LoadDamMStabDocFromXmlString(string xmlString) { - DamMStabDoc DamMStabDoc; - XmlSerializer xmlSerializer = new XmlSerializer(typeof(DamMStabDoc)); + tnsPrefixDamMStabDoc tnsPrefixDamMStabDoc; + XmlSerializer xmlSerializer = new XmlSerializer(typeof(tnsPrefixDamMStabDoc)); StringReader reader = new StringReader(xmlString); - DamMStabDoc = (DamMStabDoc)xmlSerializer.Deserialize(reader); - return DamMStabDoc; + tnsPrefixDamMStabDoc = (tnsPrefixDamMStabDoc)xmlSerializer.Deserialize(reader); + return tnsPrefixDamMStabDoc; } - private static DamMStabDocFileIdentification CreateFileIdentification() + private static tnsPrefixDamMStabDocTnsPrefixFileIdentification CreateFileIdentification() { - DamMStabDocFileIdentification damMStabDocFileIdentification = new DamMStabDocFileIdentification(); + tnsPrefixDamMStabDocTnsPrefixFileIdentification tnsPrefixDamMStabDocFileIdentification = new tnsPrefixDamMStabDocTnsPrefixFileIdentification(); var hostAssembly = Assembly.GetEntryAssembly(); if (hostAssembly == null) { hostAssembly = Assembly.GetExecutingAssembly(); } - damMStabDocFileIdentification.Application = hostAssembly.GetName().Name; - damMStabDocFileIdentification.Version = hostAssembly.GetName().Version.ToString(); - damMStabDocFileIdentification.Created = DateTime.Now.ToShortDateString() + " "+ DateTime.Now.ToShortTimeString(); - damMStabDocFileIdentification.Company = "Deltares"; - return damMStabDocFileIdentification; + tnsPrefixDamMStabDocFileIdentification.Application = hostAssembly.GetName().Name; + tnsPrefixDamMStabDocFileIdentification.Version = hostAssembly.GetName().Version.ToString(); + tnsPrefixDamMStabDocFileIdentification.Created = DateTime.Now.ToShortDateString() + " "+ DateTime.Now.ToShortTimeString(); + tnsPrefixDamMStabDocFileIdentification.Company = "Deltares"; + return tnsPrefixDamMStabDocFileIdentification; } } Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/MStabDamXmlSerializerTests.cs =================================================================== diff -u -r3113 -r3114 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/MStabDamXmlSerializerTests.cs (.../MStabDamXmlSerializerTests.cs) (revision 3113) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io.Tests/MStabDamXmlSerializerTests.cs (.../MStabDamXmlSerializerTests.cs) (revision 3114) @@ -30,19 +30,19 @@ public void CanReadWriteDamMStabDocObject() { const string filename = "DamMStabDoc.xml"; - DamMStabDoc sourceDamMStabDoc = CreatePopulatedDamMStabDoc(); + tnsPrefixDamMStabDoc sourceDamMStabDoc = CreatePopulatedDamMStabDoc(); MStabDamXmlSerializer.SaveDamMStabDocAsXmlFile(filename, sourceDamMStabDoc); - DamMStabDoc destinationDamMStabDoc = MStabDamXmlSerializer.LoadDamMStabDocFromXmlFile(filename); + tnsPrefixDamMStabDoc destinationDamMStabDoc = MStabDamXmlSerializer.LoadDamMStabDocFromXmlFile(filename); CompareDamMStabDoc(sourceDamMStabDoc, destinationDamMStabDoc); } - private DamMStabDoc CreatePopulatedDamMStabDoc() + private tnsPrefixDamMStabDoc CreatePopulatedDamMStabDoc() { - DamMStabDoc DamMStabDoc = new DamMStabDoc(); + tnsPrefixDamMStabDoc DamMStabDoc = new tnsPrefixDamMStabDoc(); return DamMStabDoc; } - private void CompareDamMStabDoc(DamMStabDoc expected, DamMStabDoc actual) + private void CompareDamMStabDoc(tnsPrefixDamMStabDoc expected, tnsPrefixDamMStabDoc actual) { var compare = new CompareLogic { Config = { MaxDifferences = 100 } }; var result = compare.Compare(expected, actual); Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs =================================================================== diff -u -r3108 -r3114 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs (.../DamMStabDoc.cs) (revision 3108) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Io/DamMStabDoc.cs (.../DamMStabDoc.cs) (revision 3114) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2020. All rights reserved. -// -// This file is part of the Dam Engine. -// -// The Dam Engine is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -43,18 +22,18 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class SurfaceLine { + public partial class tnsbPrefixSurfaceLine { - private SurfaceLineSurfacePoint[] surfacePointField; + private tnsbPrefixSurfaceLineTnsbPrefixSurfacePoint[] tnsbPrefixSurfacePointField; /// - [System.Xml.Serialization.XmlElementAttribute("SurfacePoint")] - public SurfaceLineSurfacePoint[] SurfacePoint { + [System.Xml.Serialization.XmlElementAttribute("tnsbPrefixSurfacePoint")] + public tnsbPrefixSurfaceLineTnsbPrefixSurfacePoint[] tnsbPrefixSurfacePoint { get { - return this.surfacePointField; + return this.tnsbPrefixSurfacePointField; } set { - this.surfacePointField = value; + this.tnsbPrefixSurfacePointField = value; } } } @@ -65,7 +44,7 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class SurfaceLineSurfacePoint { + public partial class tnsbPrefixSurfaceLineTnsbPrefixSurfacePoint { private string xCoordField; @@ -101,18 +80,18 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class CharacteristicPoints { + public partial class tnsbPrefixCharacteristicPoints { - private CharacteristicPointsCharacteristicPoint[] characteristicPointField; + private tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint[] tnsbPrefixCharacteristicPointField; /// - [System.Xml.Serialization.XmlElementAttribute("CharacteristicPoint")] - public CharacteristicPointsCharacteristicPoint[] CharacteristicPoint { + [System.Xml.Serialization.XmlElementAttribute("tnsbPrefixCharacteristicPoint")] + public tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint[] tnsbPrefixCharacteristicPoint { get { - return this.characteristicPointField; + return this.tnsbPrefixCharacteristicPointField; } set { - this.characteristicPointField = value; + this.tnsbPrefixCharacteristicPointField = value; } } } @@ -123,7 +102,7 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class CharacteristicPointsCharacteristicPoint { + public partial class tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint { private string xCoordField; @@ -172,18 +151,18 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class ExternalPLLines { + public partial class tnsbPrefixExternalPLLines { - private ExternalPLLinesPLLine[] pLLineField; + private tnsbPrefixExternalPLLinesTnsbPrefixPLLine[] tnsbPrefixPLLineField; /// - [System.Xml.Serialization.XmlElementAttribute("PLLine")] - public ExternalPLLinesPLLine[] PLLine { + [System.Xml.Serialization.XmlElementAttribute("tnsbPrefixPLLine")] + public tnsbPrefixExternalPLLinesTnsbPrefixPLLine[] tnsbPrefixPLLine { get { - return this.pLLineField; + return this.tnsbPrefixPLLineField; } set { - this.pLLineField = value; + this.tnsbPrefixPLLineField = value; } } } @@ -194,22 +173,22 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class ExternalPLLinesPLLine { + public partial class tnsbPrefixExternalPLLinesTnsbPrefixPLLine { - private ExternalPLLinesPLLinePLPoint[] pLPointField; + private tnsbPrefixExternalPLLinesTnsbPrefixPLLineTnsbPrefixPLPoint[] tnsbPrefixPLPointField; private string isPhreaticField; private string boundaryLayerField; /// - [System.Xml.Serialization.XmlElementAttribute("PLPoint")] - public ExternalPLLinesPLLinePLPoint[] PLPoint { + [System.Xml.Serialization.XmlElementAttribute("tnsbPrefixPLPoint")] + public tnsbPrefixExternalPLLinesTnsbPrefixPLLineTnsbPrefixPLPoint[] tnsbPrefixPLPoint { get { - return this.pLPointField; + return this.tnsbPrefixPLPointField; } set { - this.pLPointField = value; + this.tnsbPrefixPLPointField = value; } } @@ -242,7 +221,7 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class ExternalPLLinesPLLinePLPoint { + public partial class tnsbPrefixExternalPLLinesTnsbPrefixPLLineTnsbPrefixPLPoint { private string xCoordField; @@ -278,7 +257,7 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class Model { + public partial class tnsbPrefixModel { private string calculationModelField; @@ -353,7 +332,7 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class TrafficLoad { + public partial class tnsbPrefixTrafficLoad { private string xCoordinateAtRiverField; @@ -428,7 +407,7 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class CalculationOptions { + public partial class tnsbPrefixCalculationOptions { private string minimalCircleDepthField; @@ -464,7 +443,7 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class GeometryCreationOptions { + public partial class tnsbPrefixGeometryCreationOptions { private string soilGeometryTypeField; @@ -604,7 +583,7 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class HorizontalBalanceArea { + public partial class tnsbPrefixHorizontalBalanceArea { private string xLeftField; @@ -679,7 +658,7 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class SlipCircleDefinition { + public partial class tnsbPrefixSlipCircleDefinition { private string xCoordinateLastUpliftPointField; @@ -923,29 +902,29 @@ [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] [System.Xml.Serialization.XmlRootAttribute(Namespace="", IsNullable=false)] - public partial class DamMStabDoc { + public partial class tnsPrefixDamMStabDoc { - private DamMStabDocFileIdentification fileIdentificationField; + private tnsPrefixDamMStabDocTnsPrefixFileIdentification tnsPrefixFileIdentificationField; - private DamMStabDocDamMStabInput damMStabInputField; + private tnsPrefixDamMStabDocTnsPrefixDamMStabInput tnsPrefixDamMStabInputField; /// - public DamMStabDocFileIdentification FileIdentification { + public tnsPrefixDamMStabDocTnsPrefixFileIdentification tnsPrefixFileIdentification { get { - return this.fileIdentificationField; + return this.tnsPrefixFileIdentificationField; } set { - this.fileIdentificationField = value; + this.tnsPrefixFileIdentificationField = value; } } /// - public DamMStabDocDamMStabInput DamMStabInput { + public tnsPrefixDamMStabDocTnsPrefixDamMStabInput tnsPrefixDamMStabInput { get { - return this.damMStabInputField; + return this.tnsPrefixDamMStabInputField; } set { - this.damMStabInputField = value; + this.tnsPrefixDamMStabInputField = value; } } } @@ -956,7 +935,7 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class DamMStabDocFileIdentification { + public partial class tnsPrefixDamMStabDocTnsPrefixFileIdentification { private string applicationField; @@ -1017,120 +996,120 @@ [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] - public partial class DamMStabDocDamMStabInput { + public partial class tnsPrefixDamMStabDocTnsPrefixDamMStabInput { - private SurfaceLineSurfacePoint[] surfaceLineField; + private tnsbPrefixSurfaceLineTnsbPrefixSurfacePoint[] tnsbPrefixSurfaceLineField; - private CharacteristicPointsCharacteristicPoint[] characteristicPointsField; + private tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint[] tnsbPrefixCharacteristicPointsField; - private ExternalPLLinesPLLine[] externalPLLinesField; + private tnsbPrefixExternalPLLinesTnsbPrefixPLLine[] tnsbPrefixExternalPLLinesField; - private Model modelField; + private tnsbPrefixModel tnsbPrefixModelField; - private TrafficLoad trafficLoadField; + private tnsbPrefixTrafficLoad tnsbPrefixTrafficLoadField; - private CalculationOptions calculationOptionsField; + private tnsbPrefixCalculationOptions tnsbPrefixCalculationOptionsField; - private GeometryCreationOptions geometryCreationOptionsField; + private tnsbPrefixGeometryCreationOptions tnsbPrefixGeometryCreationOptionsField; - private HorizontalBalanceArea horizontalBalanceAreaField; + private tnsbPrefixHorizontalBalanceArea tnsbPrefixHorizontalBalanceAreaField; - private SlipCircleDefinition slipCircleDefinitionField; + private tnsbPrefixSlipCircleDefinition tnsbPrefixSlipCircleDefinitionField; private string mStabFileNameField; private string soilDBNameField; /// - [System.Xml.Serialization.XmlArrayItemAttribute("SurfacePoint", IsNullable=false)] - public SurfaceLineSurfacePoint[] SurfaceLine { + [System.Xml.Serialization.XmlArrayItemAttribute("tnsbPrefixSurfacePoint", IsNullable=false)] + public tnsbPrefixSurfaceLineTnsbPrefixSurfacePoint[] tnsbPrefixSurfaceLine { get { - return this.surfaceLineField; + return this.tnsbPrefixSurfaceLineField; } set { - this.surfaceLineField = value; + this.tnsbPrefixSurfaceLineField = value; } } /// - [System.Xml.Serialization.XmlArrayItemAttribute("CharacteristicPoint", IsNullable=false)] - public CharacteristicPointsCharacteristicPoint[] CharacteristicPoints { + [System.Xml.Serialization.XmlArrayItemAttribute("tnsbPrefixCharacteristicPoint", IsNullable=false)] + public tnsbPrefixCharacteristicPointsTnsbPrefixCharacteristicPoint[] tnsbPrefixCharacteristicPoints { get { - return this.characteristicPointsField; + return this.tnsbPrefixCharacteristicPointsField; } set { - this.characteristicPointsField = value; + this.tnsbPrefixCharacteristicPointsField = value; } } /// - [System.Xml.Serialization.XmlArrayItemAttribute("PLLine", IsNullable=false)] - public ExternalPLLinesPLLine[] ExternalPLLines { + [System.Xml.Serialization.XmlArrayItemAttribute("tnsbPrefixPLLine", IsNullable=false)] + public tnsbPrefixExternalPLLinesTnsbPrefixPLLine[] tnsbPrefixExternalPLLines { get { - return this.externalPLLinesField; + return this.tnsbPrefixExternalPLLinesField; } set { - this.externalPLLinesField = value; + this.tnsbPrefixExternalPLLinesField = value; } } /// - public Model Model { + public tnsbPrefixModel tnsbPrefixModel { get { - return this.modelField; + return this.tnsbPrefixModelField; } set { - this.modelField = value; + this.tnsbPrefixModelField = value; } } /// - public TrafficLoad TrafficLoad { + public tnsbPrefixTrafficLoad tnsbPrefixTrafficLoad { get { - return this.trafficLoadField; + return this.tnsbPrefixTrafficLoadField; } set { - this.trafficLoadField = value; + this.tnsbPrefixTrafficLoadField = value; } } /// - public CalculationOptions CalculationOptions { + public tnsbPrefixCalculationOptions tnsbPrefixCalculationOptions { get { - return this.calculationOptionsField; + return this.tnsbPrefixCalculationOptionsField; } set { - this.calculationOptionsField = value; + this.tnsbPrefixCalculationOptionsField = value; } } /// - public GeometryCreationOptions GeometryCreationOptions { + public tnsbPrefixGeometryCreationOptions tnsbPrefixGeometryCreationOptions { get { - return this.geometryCreationOptionsField; + return this.tnsbPrefixGeometryCreationOptionsField; } set { - this.geometryCreationOptionsField = value; + this.tnsbPrefixGeometryCreationOptionsField = value; } } /// - public HorizontalBalanceArea HorizontalBalanceArea { + public tnsbPrefixHorizontalBalanceArea tnsbPrefixHorizontalBalanceArea { get { - return this.horizontalBalanceAreaField; + return this.tnsbPrefixHorizontalBalanceAreaField; } set { - this.horizontalBalanceAreaField = value; + this.tnsbPrefixHorizontalBalanceAreaField = value; } } /// - public SlipCircleDefinition SlipCircleDefinition { + public tnsbPrefixSlipCircleDefinition tnsbPrefixSlipCircleDefinition { get { - return this.slipCircleDefinitionField; + return this.tnsbPrefixSlipCircleDefinitionField; } set { - this.slipCircleDefinitionField = value; + this.tnsbPrefixSlipCircleDefinitionField = value; } } Index: DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDoc.xsd =================================================================== diff -u -r3107 -r3114 --- DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDoc.xsd (.../DamMStabDoc.xsd) (revision 3107) +++ DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDoc.xsd (.../DamMStabDoc.xsd) (revision 3114) @@ -2,29 +2,29 @@ - + - + - + - - - - - - - - - + + + + + + + + + Index: DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd =================================================================== diff -u -r3105 -r3114 --- DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd (.../DamMStabDefinitions.xsd) (revision 3105) +++ DamTools/LayerOnSlopeTool/trunk/xsd/DamMStabDefinitions.xsd (.../DamMStabDefinitions.xsd) (revision 3114) @@ -1,10 +1,10 @@ - + - + @@ -13,10 +13,10 @@ - + - + @@ -26,13 +26,13 @@ - + - + - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,13 +64,13 @@ - + - + @@ -84,7 +84,7 @@ - + @@ -93,7 +93,7 @@ - +