Changeset 7270 for branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

Timestamp:

01/04/12 16:45:02 (12 years ago)

Author:

spimming

Message:

#1680:

• merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs (modified) (5 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -38 +38 @@
   [StorableClass]
   public class DataTable : NamedItem, IStringConvertibleMatrix {
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
     }
@@ -93 +93 @@
     public DataTable(string name)
       : base(name) {
-      VisualProperties = new DataTableVisualProperties();
+      VisualProperties = new DataTableVisualProperties(name);
       rows = new NamedItemCollection<DataRow>();
       this.RegisterRowsEvents();
@@ -99 +99 @@
     public DataTable(string name, string description)
       : base(name, description) {
-      VisualProperties = new DataTableVisualProperties();
+      VisualProperties = new DataTableVisualProperties(name);
       rows = new NamedItemCollection<DataRow>();
       this.RegisterRowsEvents();
@@ -108 +108 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if (VisualProperties == null) VisualProperties = new DataTableVisualProperties();
+      if (VisualProperties == null) VisualProperties = new DataTableVisualProperties(name);
+      if (VisualProperties.Title == null) VisualProperties.Title = name;
     }
     #endregion