Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs =================================================================== diff -u -r2ba330f4b2da07e3769d9573bd22d53435975240 -rf749088de3e20a1b1eae36c5ab083ab7086809ef --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs (.../AssemblyGmlWriter.cs) (revision 2ba330f4b2da07e3769d9573bd22d53435975240) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyGmlWriter.cs (.../AssemblyGmlWriter.cs) (revision f749088de3e20a1b1eae36c5ab083ab7086809ef) @@ -102,7 +102,6 @@ WriteFeatureMember(() => WriteTotalAssemblyResult(assessmentSectionAssembly, assessmentProcess.Id)); WriteFailureMechanisms(assessmentSection.FailureMechanisms, assessmentSectionAssembly.Id); - WriteCombinedSectionAssemblies(assessmentSection.CombinedSectionAssemblies, assessmentSectionAssembly.Id); WriteFailureMechanismSectionCollections(assessmentSection.FailureMechanismSectionCollections); writer.WriteEndElement(); @@ -254,52 +253,6 @@ writer.WriteEndElement(); } - private void WriteCombinedSectionAssemblies(IEnumerable combinedSectionAssemblies, string assessmentSectionAssemblyId) - { - foreach (ExportableCombinedSectionAssembly combinedSectionAssembly in combinedSectionAssemblies) - { - WriteFeatureMember(() => WriteCombinedSectionAssembly(combinedSectionAssembly, assessmentSectionAssemblyId)); - - foreach (ExportableFailureMechanismCombinedSectionAssemblyResult failureMechanismResult in combinedSectionAssembly.FailureMechanismResults) - { - WriteFeatureMember(() => WriteCombinedSectionAssemblyFailureMechanismResult(failureMechanismResult, combinedSectionAssembly.Id)); - } - } - } - - private void WriteCombinedSectionAssembly(ExportableCombinedSectionAssembly combinedSectionAssembly, string assessmentSectionAssemblyId) - { - WriteStartElementWithId(AssemblyXmlIdentifiers.CombinedFailureMechanismSection, AssemblyXmlIdentifiers.UboiNamespace, - combinedSectionAssembly.Id); - - writer.WriteElementString(AssemblyXmlIdentifiers.FailureMechanismSectionAssemblyGroup, AssemblyXmlIdentifiers.UboiNamespace, - EnumDisplayNameHelper.GetDisplayName(combinedSectionAssembly.AssemblyGroup)); - writer.WriteElementString(AssemblyXmlIdentifiers.AssemblyMethod, AssemblyXmlIdentifiers.UboiNamespace, - EnumDisplayNameHelper.GetDisplayName(combinedSectionAssembly.AssemblyGroupAssemblyMethod)); - writer.WriteElementString(AssemblyXmlIdentifiers.Status, AssemblyXmlIdentifiers.UboiNamespace, Resources.FullAssembly); - - WriteLink(AssemblyXmlIdentifiers.Specifies, AssemblyXmlIdentifiers.UboiNamespace, assessmentSectionAssemblyId); - WriteLink(AssemblyXmlIdentifiers.AppliesTo, AssemblyXmlIdentifiers.UboiNamespace, combinedSectionAssembly.Section.Id); - - writer.WriteEndElement(); - } - - private void WriteCombinedSectionAssemblyFailureMechanismResult(ExportableFailureMechanismCombinedSectionAssemblyResult failureMechanismResult, string combinedSectionAssemblyResultId) - { - writer.WriteStartElement(AssemblyXmlIdentifiers.CombinedFailureMechanismSectionResult, AssemblyXmlIdentifiers.UboiNamespace); - - writer.WriteElementString(AssemblyXmlIdentifiers.FailureMechanismSectionAssemblyGroup, AssemblyXmlIdentifiers.UboiNamespace, - EnumDisplayNameHelper.GetDisplayName(failureMechanismResult.AssemblyGroup)); - writer.WriteElementString(AssemblyXmlIdentifiers.AssemblyMethod, AssemblyXmlIdentifiers.UboiNamespace, - EnumDisplayNameHelper.GetDisplayName(failureMechanismResult.AssemblyMethod)); - writer.WriteElementString(AssemblyXmlIdentifiers.Status, AssemblyXmlIdentifiers.UboiNamespace, Resources.FullAssembly); - - WriteLink(AssemblyXmlIdentifiers.DerivedFrom, AssemblyXmlIdentifiers.UboiNamespace, failureMechanismResult.FailureMechanismSectionResult.Id); - WriteLink(AssemblyXmlIdentifiers.Indicates, AssemblyXmlIdentifiers.UboiNamespace, combinedSectionAssemblyResultId); - - writer.WriteEndElement(); - } - private void WriteFailureMechanismSectionCollections(IEnumerable failureMechanismSectionCollections) { foreach (ExportableFailureMechanismSectionCollection failureMechanismSectionCollection in failureMechanismSectionCollections) @@ -308,11 +261,7 @@ foreach (ExportableFailureMechanismSection section in failureMechanismSectionCollection.Sections) { - Action writeFailureMechanismSectionAction = section is ExportableCombinedFailureMechanismSection combinedFailureMechanismSection - ? () => WriteCombinedFailureMechanismSection(combinedFailureMechanismSection, failureMechanismSectionCollection.Id) - : (Action) (() => WriteFailureMechanismSection(section, failureMechanismSectionCollection.Id)); - - WriteFeatureMember(writeFailureMechanismSectionAction); + WriteFeatureMember(() => WriteFailureMechanismSection(section, failureMechanismSectionCollection.Id)); } } } @@ -323,16 +272,6 @@ writer.WriteEndElement(); } - private void WriteCombinedFailureMechanismSection(ExportableCombinedFailureMechanismSection section, string failureMechanismSectionCollectionId) - { - WriteFailureMechanismSection(section, Resources.FailureMechanismSectionType_Combined, failureMechanismSectionCollectionId); - - writer.WriteElementString(AssemblyXmlIdentifiers.AssemblyMethod, AssemblyXmlIdentifiers.UboiNamespace, - EnumDisplayNameHelper.GetDisplayName(section.AssemblyMethod)); - - writer.WriteEndElement(); - } - private void WriteFailureMechanismSection(ExportableFailureMechanismSection section, string failureMechanismSectionCollectionId) { WriteFailureMechanismSection(section, Resources.FailureMechanismSectionType_FailureMechanism, failureMechanismSectionCollectionId); Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyXmlIdentifiers.cs =================================================================== diff -u -r325d757ba81cded989c80385d783e76e5aced50c -rf749088de3e20a1b1eae36c5ab083ab7086809ef --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyXmlIdentifiers.cs (.../AssemblyXmlIdentifiers.cs) (revision 325d757ba81cded989c80385d783e76e5aced50c) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.IO/AssemblyXmlIdentifiers.cs (.../AssemblyXmlIdentifiers.cs) (revision f749088de3e20a1b1eae36c5ab083ab7086809ef) @@ -87,16 +87,6 @@ /// public const string SpecificFailureMechanismName = "specifiekFaalmechanisme"; - /// - /// Identifier for a combined failure mechanism section element. - /// - public const string CombinedFailureMechanismSection = "AnalyseDeelvakGecombineerd"; - - /// - /// Identifier for a combined failure mechanism section result element. - /// - public const string CombinedFailureMechanismSectionResult = "AnalyseDeelvak"; - #region Link identifiers /// Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyXmlIdentifiersTest.cs =================================================================== diff -u -r325d757ba81cded989c80385d783e76e5aced50c -rf749088de3e20a1b1eae36c5ab083ab7086809ef --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyXmlIdentifiersTest.cs (.../AssemblyXmlIdentifiersTest.cs) (revision 325d757ba81cded989c80385d783e76e5aced50c) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.IO.Test/AssemblyXmlIdentifiersTest.cs (.../AssemblyXmlIdentifiersTest.cs) (revision f749088de3e20a1b1eae36c5ab083ab7086809ef) @@ -41,8 +41,6 @@ Assert.AreEqual("generiekFaalmechanisme", AssemblyXmlIdentifiers.GenericFailureMechanismName); Assert.AreEqual("SpecifiekFaalmechanisme", AssemblyXmlIdentifiers.SpecificFailureMechanism); Assert.AreEqual("specifiekFaalmechanisme", AssemblyXmlIdentifiers.SpecificFailureMechanismName); - Assert.AreEqual("AnalyseDeelvakGecombineerd", AssemblyXmlIdentifiers.CombinedFailureMechanismSection); - Assert.AreEqual("AnalyseDeelvak", AssemblyXmlIdentifiers.CombinedFailureMechanismSectionResult); Assert.AreEqual("href", AssemblyXmlIdentifiers.Link); Assert.AreEqual("beoordeelt", AssemblyXmlIdentifiers.Assesses);