Changeset 4587 for branches/OKB/HeuristicLab.Clients.OKB-3.3/Views

Timestamp:

10/09/10 13:27:57 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views

Files:

• AlgorithmDataView.cs (modified) (2 diffs)
• ProblemDataView.cs (modified) (2 diffs)

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmDataView.cs

@@ -157 +157 @@
             if (Content == null) Content = new AlgorithmData { AlgorithmId = AlgorithmId };
             viewHost.Content = (IContent)dialog.TypeSelector.CreateInstanceOfSelectedType();
-            DataType dataType = OKBClient.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
-            if (dataType == null) {
-              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
-              dataType.PlatformId = OKBClient.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
-              dataType.Store();
-              OKBClient.Instance.DataTypes.Add(dataType);
-              dataTypeComboBoxValues = OKBClient.Instance.DataTypes.OrderBy(d => d.Name).ToList();
-              dataTypeComboBox.DataSource = dataTypeComboBoxValues;
-            }
+            DataType dataType = OKBClient.Instance.ConvertToDataType(viewHost.Content.GetType());
+            dataTypeComboBoxValues = OKBClient.Instance.DataTypes.OrderBy(d => d.Name).ToList();
+            dataTypeComboBox.DataSource = dataTypeComboBoxValues;
             dataTypeComboBox.SelectedItem = dataType;
             fileTextBox.Text = "-";
@@ -190 +184 @@
             viewHost.Content = algorithm;
             noViewAvailableLabel.Visible = false;
-            DataType dataType = OKBClient.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
-            if (dataType == null) {
-              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
-              dataType.PlatformId = OKBClient.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
-              dataType.Store();
-              OKBClient.Instance.DataTypes.Add(dataType);
-              dataTypeComboBoxValues = OKBClient.Instance.DataTypes.OrderBy(d => d.Name).ToList();
-              dataTypeComboBox.DataSource = dataTypeComboBoxValues;
-            }
+            DataType dataType = OKBClient.Instance.ConvertToDataType(viewHost.Content.GetType());
+            dataTypeComboBoxValues = OKBClient.Instance.DataTypes.OrderBy(d => d.Name).ToList();
+            dataTypeComboBox.DataSource = dataTypeComboBoxValues;
             dataTypeComboBox.SelectedItem = dataType;
           } else {

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/ProblemDataView.cs

@@ -156 +156 @@
             if (Content == null) Content = new ProblemData { ProblemId = ProblemId };
             viewHost.Content = (IContent)dialog.TypeSelector.CreateInstanceOfSelectedType();
-            DataType dataType = OKBClient.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
-            if (dataType == null) {
-              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
-              dataType.PlatformId = OKBClient.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
-              dataType.Store();
-              OKBClient.Instance.DataTypes.Add(dataType);
-              dataTypeComboBoxValues = OKBClient.Instance.DataTypes.OrderBy(d => d.Name).ToList();
-              dataTypeComboBox.DataSource = dataTypeComboBoxValues;
-            }
+            DataType dataType = OKBClient.Instance.ConvertToDataType(viewHost.Content.GetType());
+            dataTypeComboBoxValues = OKBClient.Instance.DataTypes.OrderBy(d => d.Name).ToList();
+            dataTypeComboBox.DataSource = dataTypeComboBoxValues;
             dataTypeComboBox.SelectedItem = dataType;
             fileTextBox.Text = "-";
@@ -189 +183 @@
             viewHost.Content = problem;
             noViewAvailableLabel.Visible = false;
-            DataType dataType = OKBClient.Instance.DataTypes.FirstOrDefault(d => d.Name == viewHost.Content.GetType().AssemblyQualifiedName);
-            if (dataType == null) {
-              dataType = new DataType { Name = viewHost.Content.GetType().AssemblyQualifiedName, SqlName = "varbinary" };
-              dataType.PlatformId = OKBClient.Instance.Platforms.FirstOrDefault(p => p.Name == "HeuristicLab 3.3").Id;
-              dataType.Store();
-              OKBClient.Instance.DataTypes.Add(dataType);
-              dataTypeComboBoxValues = OKBClient.Instance.DataTypes.OrderBy(d => d.Name).ToList();
-              dataTypeComboBox.DataSource = dataTypeComboBoxValues;
-            }
+            DataType dataType = OKBClient.Instance.ConvertToDataType(viewHost.Content.GetType());
+            dataTypeComboBoxValues = OKBClient.Instance.DataTypes.OrderBy(d => d.Name).ToList();
+            dataTypeComboBox.DataSource = dataTypeComboBoxValues;
             dataTypeComboBox.SelectedItem = dataType;
           } else {