Changeset 16397 for branches/2904_CalculateImpacts/3.4/Implementation/DataAnalysisSolution.cs

Timestamp:

12/18/18 17:38:50 (6 years ago)

Author:

mkommend

Message:

#2904: Updated branch with trunk changes.

Location:

branches/2904_CalculateImpacts/3.4

Files:

• . (modified) (1 prop)
• Implementation/DataAnalysisSolution.cs (modified) (1 diff)

branches/2904_CalculateImpacts/3.4/Implementation/DataAnalysisSolution.cs

@@ -58 +58 @@
       get { return (IDataAnalysisProblemData)this[ProblemDataResultName].Value; }
       set {
-        if (this[ProblemDataResultName].Value != value) {
-          if (value != null) {
-            ProblemData.Changed -= new EventHandler(ProblemData_Changed);
-            this[ProblemDataResultName].Value = value;
-            ProblemData.Changed += new EventHandler(ProblemData_Changed);
-            OnProblemDataChanged();
-          }
-        }
+        if (value == null) throw new ArgumentNullException("The problemData must not be null.");
+        if (this[ProblemDataResultName].Value == value) return;
+        string errorMessage = string.Empty;
+        if (!Model.IsProblemDataCompatible(value, out errorMessage)) throw new ArgumentException(errorMessage);
+
+        ProblemData.Changed -= new EventHandler(ProblemData_Changed);
+        this[ProblemDataResultName].Value = value;
+        ProblemData.Changed += new EventHandler(ProblemData_Changed);
+        OnProblemDataChanged();
       }
     }