Changeset 7487 for branches/ChangeDatasetOfRegressionModel

Timestamp:

02/20/12 11:17:24 (13 years ago)

Author:

sforsten

Message:

#1758: changes according to mkommend's reviewing comments have been made and catch blocks now only catch specific exceptions

Location:

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• Solution Views/RegressionSolutionView.cs (modified) (4 diffs)

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -144 +144 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core">

branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
+using HeuristicLab.Persistence.Core;
 using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
+using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -62 +64 @@
     #endregion
 
-    private void importButton_Click(object sender, EventArgs e) {
+    protected void importButton_Click(object sender, EventArgs e) {
       if (openFileDialog.ShowDialog(this) != DialogResult.OK) return;
+      ImportProblemData(openFileDialog.FileName);
+    }
 
+    protected void ImportProblemData(string filename) {
       object hlFile = null;
       try {
-        hlFile = XmlParser.Deserialize(openFileDialog.FileName);
+        hlFile = XmlParser.Deserialize(filename);
       }
-      catch (Exception ex) {
+      catch (PersistenceException ex) {
+        ErrorHandling.ShowErrorDialog(this, ex);
+        return;
+      }
+      catch (ZipException ex) {
         ErrorHandling.ShowErrorDialog(this, ex);
         return;
@@ -84 +93 @@
 
       if (problemData == null) {
-        ErrorHandling.ShowErrorDialog(this,
-          new NullReferenceException("The problem data is null." + Environment.NewLine
-                                   + "The .hl-file is no RegressionProblemData or RegressionProblem."));
+        ErrorHandling.ShowErrorDialog(this, new NullReferenceException("The problem data is null." + Environment.NewLine
+                                                                     + "The .hl-file is no RegressionProblemData or RegressionProblem."));
         return;
       }
 
+      if (CheckCompatibilityOfProblemData(Content.ProblemData, problemData))
+        Content.ProblemData = problemData;
+    }
+
+    protected virtual bool CheckCompatibilityOfProblemData(IRegressionProblemData iRegressionProblemData, IRegressionProblemData problemData) {
       StringBuilder message = new StringBuilder();
       if (!problemData.TargetVariable.Equals(Content.ProblemData.TargetVariable))
@@ -102 +115 @@
       }
 
-      if (message.Length != 0)
-        ErrorHandling.ShowErrorDialog(this, new Exception(message.ToString()));
-      else
-        Content.ProblemData = problemData;
-
+      if (message.Length != 0) {
+        ErrorHandling.ShowErrorDialog(this, new InvalidOperationException(message.ToString()));
+        return false;
+      }
+      return true;
     }
   }