Changeset 10000 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceProviderView.cs

Timestamp:

09/24/13 11:49:28 (11 years ago)

Author:

jkarder

Message:

#2110: refactored ProblemInstanceProviderViews

File:

• trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceProviderView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceConsumerView.cs) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceProviderView.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis.Views {
   [View("DataAnalysis InstanceProvider View")]
-  [Content(typeof(IProblemInstanceConsumer<IDataAnalysisProblemData>), IsDefaultView = true)]
-  [Content(typeof(IProblemInstanceConsumer<IClusteringProblemData>), IsDefaultView = true)]
-  public partial class DataAnalysisInstanceConsumerView<T> : ProblemInstanceConsumerViewGeneric<T>
+  public partial class DataAnalysisInstanceProviderView<T> : ProblemInstanceProviderViewGeneric<T>
     where T : class, IDataAnalysisProblemData {
-    public new IProblemInstanceConsumer<T> Content {
-      get { return (IProblemInstanceConsumer<T>)base.Content; }
-      set { base.Content = value; }
-    }
 
-    public DataAnalysisInstanceConsumerView() {
+    public DataAnalysisInstanceProviderView() {
       InitializeComponent();
     }
 
     protected override void importButton_Click(object sender, EventArgs e) {
-      var provider = SelectedProvider as DataAnalysisInstanceProvider<T, DataAnalysisImportType>;
+      var provider = Content as DataAnalysisInstanceProvider<T, DataAnalysisImportType>;
       if (provider != null) {
-        DataAnalysisImportTypeDialog importTypeDialog = new DataAnalysisImportTypeDialog();
+        var importTypeDialog = new DataAnalysisImportTypeDialog();
         if (importTypeDialog.ShowDialog() == DialogResult.OK) {
           T instance = default(T);
           try {
             instance = provider.ImportData(importTypeDialog.Path, importTypeDialog.ImportType, importTypeDialog.CSVFormat);
-          }
-          catch (IOException ex) {
+          } catch (IOException ex) {
             ErrorWhileParsing(ex);
             return;
@@ -57 +50 @@
           try {
             GenericConsumer.Load(instance);
-          }
-          catch (IOException ex) {
+            instancesComboBox.SelectedIndex = -1;
+          } catch (IOException ex) {
             ErrorWhileLoading(ex, importTypeDialog.Path);
           }
-        } else {
-          return;
         }
       } else {