Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContext.cs
===================================================================
diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r8da89db9c186cedc26c4baa657f2dd8961877ec4
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContext.cs (.../WaveImpactAsphaltCoverCalculationGroupContext.cs) (revision 4f4daebe59ab925c98cef039101ec70544530bbe)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContext.cs (.../WaveImpactAsphaltCoverCalculationGroupContext.cs) (revision 8da89db9c186cedc26c4baa657f2dd8961877ec4)
@@ -32,21 +32,21 @@
/// Presentation object for all data required to configure an instance of
/// in order be able to create configurable wave impact asphalt calculations.
///
- public class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext
+ public class WaveImpactAsphaltCoverCalculationGroupContext
: WaveImpactAsphaltCoverContext, ICalculationContext
{
///
- /// Creates a new instance of .
+ /// Creates a new instance of .
///
/// The instance wrapped by this context object.
/// The that owns the wrapped calculation group.
/// The failure mechanism which the context belongs to.
/// The assessment section which the context belongs to.
/// Thrown when any input argument is null, except for .
- public WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(CalculationGroup calculationsGroup,
- CalculationGroup parent,
- WaveImpactAsphaltCoverFailureMechanism failureMechanism,
- IAssessmentSection assessmentSection)
+ public WaveImpactAsphaltCoverCalculationGroupContext(CalculationGroup calculationsGroup,
+ CalculationGroup parent,
+ WaveImpactAsphaltCoverFailureMechanism failureMechanism,
+ IAssessmentSection assessmentSection)
: base(calculationsGroup, failureMechanism, assessmentSection)
{
Parent = parent;
@@ -57,13 +57,13 @@
public override bool Equals(WrappedObjectContextBase other)
{
return base.Equals(other)
- && other is WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext
- && ReferenceEquals(Parent, ((WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) other).Parent);
+ && other is WaveImpactAsphaltCoverCalculationGroupContext
+ && ReferenceEquals(Parent, ((WaveImpactAsphaltCoverCalculationGroupContext) other).Parent);
}
public override bool Equals(object obj)
{
- return Equals(obj as WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext);
+ return Equals(obj as WaveImpactAsphaltCoverCalculationGroupContext);
}
public override int GetHashCode()
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 -r8da89db9c186cedc26c4baa657f2dd8961877ec4
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 8da89db9c186cedc26c4baa657f2dd8961877ec4)
@@ -142,7 +142,7 @@
public override IEnumerable GetImportInfos()
{
- yield return RiskeerImportInfoFactory.CreateCalculationConfigurationImportInfo(
+ yield return RiskeerImportInfoFactory.CreateCalculationConfigurationImportInfo(
(context, filePath) =>
new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationImporter(
filePath,
@@ -174,10 +174,10 @@
.Build()
};
- yield return RiskeerTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(
- WaveConditionsCalculationGroupContextChildNodeObjects,
- WaveConditionsCalculationGroupContextContextMenuStrip,
- WaveConditionsCalculationGroupContextOnNodeRemoved);
+ yield return RiskeerTreeNodeInfoFactory.CreateCalculationGroupContextTreeNodeInfo(
+ CalculationGroupContextChildNodeObjects,
+ CalculationGroupContextContextMenuStrip,
+ CalculationGroupContextOnNodeRemoved);
yield return RiskeerTreeNodeInfoFactory.CreateCalculationContextTreeNodeInfo(
WaveConditionsCalculationContextChildNodeObjects,
@@ -218,7 +218,7 @@
public override IEnumerable GetExportInfos()
{
- yield return new ExportInfo
+ yield return new ExportInfo
{
Name = context => RiskeerCommonFormsResources.WaveConditionsExporter_DisplayName,
Extension = RiskeerCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension,
@@ -248,7 +248,7 @@
GetExportPath = () => ExportHelper.GetFilePath(GetInquiryHelper(), GetWaveConditionsFileFilterGenerator())
};
- yield return RiskeerExportInfoFactory.CreateCalculationGroupConfigurationExportInfo(
+ yield return RiskeerExportInfoFactory.CreateCalculationGroupConfigurationExportInfo(
(context, filePath) => new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter(
context.WrappedData.Children, filePath, context.AssessmentSection),
context => context.WrappedData.Children.Any(),
@@ -322,8 +322,8 @@
{
new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
GetHydraulicLoadsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
- new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup, null,
- failureMechanism, assessmentSection)
+ new WaveImpactAsphaltCoverCalculationGroupContext(failureMechanism.CalculationsGroup, null,
+ failureMechanism, assessmentSection)
};
}
@@ -453,9 +453,9 @@
#endregion
- #region WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext TreeNodeInfo
+ #region WaveImpactAsphaltCoverCalculationGroupContext TreeNodeInfo
- private static object[] WaveConditionsCalculationGroupContextChildNodeObjects(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData)
+ private static object[] CalculationGroupContextChildNodeObjects(WaveImpactAsphaltCoverCalculationGroupContext nodeData)
{
var childNodeObjects = new List