Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs (modified) (4 diffs)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs

@@ -59 +59 @@
     public NamedItemCollection<DataRow> Rows {
       get { return rows; }
+      private set {
+        if (rows != null) throw new InvalidOperationException("Rows already set");
+        rows = value;
+        if (rows != null) RegisterRowsEvents();
+      }
     }
 
@@ -73 +78 @@
     private IEnumerable<DataRow> StorableRows {
       get { return rows; }
-      set { rows = new NamedItemCollection<DataRow>(value); }
+      set { Rows = new NamedItemCollection<DataRow>(value); }
     }
     #endregion
@@ -81 +86 @@
     protected DataTable(DataTable original, Cloner cloner)
       : base(original, cloner) {
-      this.VisualProperties = (DataTableVisualProperties)cloner.Clone(original.visualProperties);
-      this.rows = cloner.Clone(original.rows);
-      this.RegisterRowsEvents();
+      VisualProperties = (DataTableVisualProperties)cloner.Clone(original.visualProperties);
+      Rows = cloner.Clone(original.rows);
     }
     public DataTable()
       : base() {
       VisualProperties = new DataTableVisualProperties();
-      rows = new NamedItemCollection<DataRow>();
-      this.RegisterRowsEvents();
+      Rows = new NamedItemCollection<DataRow>();
     }
     public DataTable(string name)
       : base(name) {
       VisualProperties = new DataTableVisualProperties(name);
-      rows = new NamedItemCollection<DataRow>();
-      this.RegisterRowsEvents();
+      Rows = new NamedItemCollection<DataRow>();
     }
     public DataTable(string name, string description)
       : base(name, description) {
       VisualProperties = new DataTableVisualProperties(name);
-      rows = new NamedItemCollection<DataRow>();
-      this.RegisterRowsEvents();
+      Rows = new NamedItemCollection<DataRow>();
     }
 
@@ -217 +218 @@
     }
     IEnumerable<string> IStringConvertibleMatrix.RowNames {
-      get { return new List<string>(); }
+      get { return Enumerable.Empty<string>(); }
       set { throw new NotSupportedException(); }
     }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll