Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/12/13 13:32:34 (12 years ago)
Author:
mkommend
Message:

#1734: Added StorableConstructor to all storable DataImporter classes.

Location:
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewColumnCommandBase.cs

    r9595 r9614  
    2929  [StorableClass]
    3030  public abstract class AddNewColumnCommandBase : ColumnGroupCommandBase {
    31     private AddNewColumnCommandBase()
    32       : base(null, string.Empty) {
    33     }
     31    [StorableConstructor]
     32    protected AddNewColumnCommandBase(bool deserializing) : base(deserializing) { }
    3433
    3534    protected AddNewColumnCommandBase(DataSet dataSet, string columnGroupName, string columnName, Type columnType)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewDateTimeColumnCommand.cs

    r7267 r9614  
    3333  [ViewableCommandInfoAttribute("New DateTimeColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 9)]
    3434  public class AddNewDateTimeColumnCommand : AddNewColumnCommandBase {
    35     private AddNewDateTimeColumnCommand()
    36       : base(null, string.Empty, string.Empty, typeof(DateTimeColumn)) {
    37     }
     35    [StorableConstructor]
     36    protected AddNewDateTimeColumnCommand(bool deserializing) : base(deserializing) { }
    3837
    3938    public AddNewDateTimeColumnCommand(DataSet dataSet, string columnGroupName)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewDoubleColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.DataImporter.Data;
    2623using HeuristicLab.DataImporter.Data.CommandBase;
    2724using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data;
    2925using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3026
    … …  
    3329  [ViewableCommandInfoAttribute("New DoubleColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 7)]
    3430  public class AddNewDoubleColumnCommand : AddNewColumnCommandBase {
    35     private AddNewDoubleColumnCommand()
    36       : base(null, string.Empty, string.Empty, typeof(DoubleColumn)) {
    37     }
     31    [StorableConstructor]
     32    protected AddNewDoubleColumnCommand(bool deserializing) : base(deserializing) { }
    3833
    3934    public AddNewDoubleColumnCommand(DataSet dataSet, string columnGroupName)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewProgrammableColumnCommand.cs

    r9595 r9614  
    3232  OptionsView = typeof(ProgrammableColumnCommandView))]
    3333  public class AddNewProgrammableColumnCommand : AddNewColumnCommandBase {
    34     private AddNewProgrammableColumnCommand()
    35       : base(null, string.Empty, string.Empty, typeof(ProgrammableColumn)) {
    36     }
     34    [StorableConstructor]
     35    protected AddNewProgrammableColumnCommand(bool deserializing) : base(deserializing) { }
    3736
    3837    public AddNewProgrammableColumnCommand(DataSet dataSet, string columnGroupName)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/AddNewStringColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     22using HeuristicLab.DataImporter.Data;
    2623using HeuristicLab.DataImporter.Data.CommandBase;
    2724using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data;
    2925using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3026
    … …  
    3329  [ViewableCommandInfoAttribute("New StringColumn", 1, ColumnGroupState.Active, "Column Commands", Position = 8)]
    3430  public class AddNewStringColumnCommand : AddNewColumnCommandBase {
    35     private AddNewStringColumnCommand()
    36       : base(null,string.Empty,string.Empty,typeof(StringColumn)) {
    37     }
     31    [StorableConstructor]
     32    protected AddNewStringColumnCommand(bool deserializing) : base(deserializing) { }
    3833
    3934    public AddNewStringColumnCommand(DataSet dataSet, string columnGroupName)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnCommandBase.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using System.Windows.Forms;
    27 using System.Xml;
    28 using HeuristicLab.DataImporter.Data;
    2926using HeuristicLab.DataImporter.Data.CommandBase;
    3027using HeuristicLab.DataImporter.Data.Model;
    … …  
    4340    protected IEnumerable<SortOrder> oldSortOrder;
    4441
    45     private ChangeColumnCommandBase()
    46       : base(null, string.Empty, null) {
     42    [StorableConstructor]
     43    protected ChangeColumnCommandBase(bool deserializing)
     44      : base(deserializing) {
    4745      newColumns = new List<ColumnBase>();
    4846      oldColumns = new List<ColumnBase>();

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToDateTimeColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Globalization;
    2722using HeuristicLab.DataImporter.Data;
    2823using HeuristicLab.DataImporter.Data.CommandBase;
    … …  
    3429  [ViewableCommandInfoAttribute("Change to DateTimeColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 13)]
    3530  public class ChangeColumnToDateTimeColumnCommand : ChangeColumnCommandBase {
    36     private ChangeColumnToDateTimeColumnCommand()
    37       : base(null, string.Empty, null, typeof(DateTimeColumn)) {
    38     }
     31    [StorableConstructor]
     32    protected ChangeColumnToDateTimeColumnCommand(bool deserializing) : base(deserializing) { }
    3933
    4034    public ChangeColumnToDateTimeColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToDoubleColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Globalization;
    2722using HeuristicLab.DataImporter.Data;
    2823using HeuristicLab.DataImporter.Data.CommandBase;
    … …  
    3429  [ViewableCommandInfoAttribute("Change to DoubleColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 11)]
    3530  public class ChangeColumnToDoubleColumnCommand : ChangeColumnCommandBase {
    36     private ChangeColumnToDoubleColumnCommand()
    37       : base(null, string.Empty, null, typeof(DoubleColumn)) {
    38     }
     31    [StorableConstructor]
     32    protected ChangeColumnToDoubleColumnCommand(bool deserializing) : base(deserializing) { }
    3933
    4034    public ChangeColumnToDoubleColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/ChangeColumnToStringColumnCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Globalization;
    2722using HeuristicLab.DataImporter.Data;
    2823using HeuristicLab.DataImporter.Data.CommandBase;
    … …  
    3429  [ViewableCommandInfoAttribute("Change to StringColumn", 1, ColumnGroupState.ColumnSelected, "Column Commands", Position = 12)]
    3530  public class ChangeColumnToStringColumnCommand : ChangeColumnCommandBase {
    36     private ChangeColumnToStringColumnCommand()
    37       : base(null, string.Empty, null, typeof(StringColumn)) {
    38     }
     31    [StorableConstructor]
     32    protected ChangeColumnToStringColumnCommand(bool deserializing) : base(deserializing) { }
    3933
    4034    public ChangeColumnToStringColumnCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/CreateTimeSeriesColumnsCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
     24using System.Windows.Forms.DataVisualization.Charting;
     25using HeuristicLab.DataImporter.Data;
    2626using HeuristicLab.DataImporter.Data.CommandBase;
     27using HeuristicLab.DataImporter.Data.Model;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.DataImporter.Data;
    29 using HeuristicLab.DataImporter.Data.Model;
    30 using System.Windows.Forms.DataVisualization.Charting;
    31 using System.Drawing;
    3229
    3330namespace HeuristicLab.DataImporter.Command {
    … …  
    3734  public class CreateTimeSeriesColumnsCommand : ColumnGroupCommandWithAffectedColumnsBase {
    3835    private int addedColumnsCount;
    39 
     36    [StorableConstructor]
     37    protected CreateTimeSeriesColumnsCommand(bool deserializing) : base(deserializing) { }
    4038    public CreateTimeSeriesColumnsCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
    4139      : base(dataSet, columnGroupName, affectedColumns) {

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/SplitCategorialColumnCommand.cs

    r7267 r9614  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
     25using HeuristicLab.DataImporter.Data;
    2626using HeuristicLab.DataImporter.Data.CommandBase;
     27using HeuristicLab.DataImporter.Data.Model;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.DataImporter.Data;
    29 using HeuristicLab.DataImporter.Data.Model;
    3029
    3130namespace HeuristicLab.DataImporter.Command {
    … …  
    3837    private const double NOTSETVALUE = 0.0;
    3938
    40     private SplitCategorialColumnCommand()
    41       : base(null, string.Empty, -1) {
    42     }
     39    [StorableConstructor]
     40    protected SplitCategorialColumnCommand(bool deserializing) : base(deserializing) { }
    4341
    4442    public SplitCategorialColumnCommand(DataSet dataSet, string columnGroupName, int columnIndex)

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeColumnGroup/SplitDictionaryStyleDataCommand.cs

    r8387 r9614  
    3434  public class SplitDictionaryStyleDataCommand : ColumnGroupCommandWithAffectedColumnsBase {
    3535    private int addedColumnsCount;
    36 
    37     private SplitDictionaryStyleDataCommand()
    38       : base(null, string.Empty, null) {
    39     }
     36    [StorableConstructor]
     37    protected SplitDictionaryStyleDataCommand(bool deserializing) : base(deserializing) { }
    4038
    4139    public SplitDictionaryStyleDataCommand(DataSet dataSet, string columnGroupName, int[] affectedColumns)
Note: See TracChangeset for help on using the changeset viewer.