Free cookie consent management tool by TermsFeed Policy Generator

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

#1734: Added StorableConstructor to all storable DataImporter classes.

Location:
branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/DataBaseCommandBase.cs

    r7267 r9614  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using HeuristicLab.DataImporter.Data.CommandBase;
    523using HeuristicLab.DataImporter.Data.Model;
    6 using HeuristicLab.DataImporter.Data.CommandBase;
    724using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    825using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    1128  [StorableClass]
    1229  public abstract class DatabaseCommandBase : DataSetCommandBase {
    13     private DatabaseCommandBase()
    14       : base(null) {
    15     }
    16 
     30    [StorableConstructor]
     31    protected DatabaseCommandBase(bool deserializing) : base(deserializing) { }
    1732    protected DatabaseCommandBase(DataSet dataSet, IDbExplorer dbExplorer)
    1833      : base(dataSet) {

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/LoadColumnGroupWithSqlStringFromDBCommand.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.Xml;
     22using HeuristicLab.DataImporter.Data.CommandBase;
    2723using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data.CommandBase;
    2924using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    3025using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3833    private ColumnGroup newColumnGroup;
    3934
    40     private LoadColumnGroupWithSqlStringFromDBCommand()
    41       : base(null, null) {
    42     }
    43 
     35    [StorableConstructor]
     36    protected LoadColumnGroupWithSqlStringFromDBCommand(bool deserializing) : base(deserializing) { }
    4437    public LoadColumnGroupWithSqlStringFromDBCommand(DataSet dataSet, IDbExplorer dbExplorer, string sqlString)
    4538      : base(dataSet, dbExplorer) {

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/LoadColumnGroupsFromDBCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    26 using System.Xml;
     23using HeuristicLab.DataImporter.Data.CommandBase;
    2724using HeuristicLab.DataImporter.Data.Model;
    28 using HeuristicLab.DataImporter.Data.CommandBase;
    2925using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    3026using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3834    private List<ColumnGroup> newColumnGroups;
    3935
    40     private LoadColumnGroupsFromDBCommand()
    41       : base(null, null) {
     36    [StorableConstructor]
     37    protected LoadColumnGroupsFromDBCommand(bool deserializing)
     38      : base(deserializing) {
    4239      this.newColumnGroups = new List<ColumnGroup>();
    4340    }

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/ReorderColumnsCommand.cs

    r7267 r9614  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    26 using System.Xml;
    2724using HeuristicLab.DataImporter.Data.CommandBase;
    2825using HeuristicLab.DataImporter.Data.Model;
    … …  
    3532    private Dictionary<string, int[]> displayedIndexes;
    3633
    37     private ReorderColumnsCommand()
    38       : base(null) {
    39     }
    40 
     34    [StorableConstructor]
     35    protected ReorderColumnsCommand(bool deserializing) : base(deserializing) { }
    4136    public ReorderColumnsCommand(DataSet ds, Dictionary<string, int[]> displayedIndexes)
    4237      : base(ds) {

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/DataProcessor.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.Xml;
    27 using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    2822using HeuristicLab.DataImporter.Data;
    2923using HeuristicLab.DataImporter.Data.Model;
     24using HeuristicLab.DataImporter.DbExplorer.Interfaces;
    3025using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3126
    3227namespace HeuristicLab.DataImporter.DataProcessor {
    3328  [StorableClass]
    34   public class DataProcessor{
     29  public class DataProcessor {
    3530    public DataProcessor() {
    3631      this.commandChain = new CommandChain();
    3732      this.dataSet = new DataSet();
     33    }
     34    [StorableConstructor]
     35    protected DataProcessor(bool deserializing)
     36      : base() {
     37      this.commandChain = new CommandChain();
    3838    }
    3939

  • branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Plugin.cs.frame

    r8626 r9614  
    3131  [PluginFile("HeuristicLab.DataImporter.DataProcessor-1.0.dll", PluginFileType.Assembly)]
    3232  [PluginFile("HeuristicLab.DataImporter.DbExplorer.Interfaces-1.0.dll", PluginFileType.Assembly)]
    33   [PluginDependency("HeuristicLab.ALGLIB","3.6")]
    3433  [PluginDependency("HeuristicLab.Common.Resources","3.3")]
     34  [PluginDependency("HeuristicLab.Problems.DataAnalysis","3.4")]
    3535  [PluginDependency("HeuristicLab.Persistence","3.3")]
    3636  public class HeuristicLabDataImporterDataProcessorPlugin : PluginBase {
Note: See TracChangeset for help on using the changeset viewer.