Changeset 10554

Timestamp:

03/05/14 17:31:24 (11 years ago)

Author:

pfleck

Message:

• removed resx reference
• improved variable values copying

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/PreprocessingData.cs (modified) (1 diff)
• Views/DataPreprocessingView.designer.cs (modified) (5 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs

@@ -103 +103 @@
       var copy = new Dictionary<int, IList>(variableValues);
       for (int i = 0; i < original.Count; i++) {
-        if (variableValues[i] is IList<double>) {
-          copy[i] = new List<double>((IList<double>)variableValues[i]);
-        } else if (variableValues[i] is IList<DateTime>) {
-          copy[i] = new List<DateTime>((IList<DateTime>)variableValues[i]);
-        } else if (variableValues[i] is IList<string>) {
-          copy[i] = new List<string>((IList<string>)variableValues[i]);
-        } else {
-          throw new NotImplementedException("The Type is not Supported");
-        }
+        variableValues[i] = (IList)Activator.CreateInstance(original[i].GetType(), original[i]);
       }
       return copy;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.designer.cs

@@ -82 +82 @@
       // undoButton
       // 
-      this.undoButton.Image = ((System.Drawing.Image)(resources.GetObject("undoButton.Image")));
+      this.undoButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Undo;
       this.undoButton.Location = new System.Drawing.Point(72, 14);
       this.undoButton.Name = "undoButton";
@@ -93 +93 @@
       // applyInNewTabButton
       // 
-      this.applyInNewTabButton.Image = ((System.Drawing.Image)(resources.GetObject("applyInNewTabButton.Image")));
+      this.applyInNewTabButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
       this.applyInNewTabButton.Location = new System.Drawing.Point(42, 14);
       this.applyInNewTabButton.Name = "applyInNewTabButton";
@@ -104 +104 @@
       // exportProblemButton
       // 
-      this.exportProblemButton.Image = ((System.Drawing.Image)(resources.GetObject("exportProblemButton.Image")));
+      this.exportProblemButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.exportProblemButton.Location = new System.Drawing.Point(12, 14);
       this.exportProblemButton.Name = "exportProblemButton";
@@ -115 +115 @@
       // contentListView
       // 
-      this.contentListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.contentListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.contentListView.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -130 +130 @@
       // viewHost
       // 
-      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.viewHost.Caption = "View";