Changeset 16994 for addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor

Timestamp:

05/29/19 12:26:42 (5 years ago)

Author:

gkronber

Message:

#2520 Update plugin dependencies and references for HL.DataImporter for new persistence

Location:

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor

Files:

• Command/DataBaseCommandBase.cs (modified) (1 diff)
• Command/LoadColumnGroupWithSqlStringFromDBCommand.cs (modified) (1 diff)
• Command/LoadColumnGroupsFromDBCommand.cs (modified) (1 diff)
• Command/ReorderColumnsCommand.cs (modified) (1 diff)
• Command/SqlCommandView.cs (modified) (1 diff)
• DataProcessorView.cs (modified) (6 diffs)
• DbTablesView.cs (modified) (1 diff)
• ExportDialog.cs (modified) (1 diff)
• HeuristicLab.DataImporter.DataProcessor.csproj (modified) (1 diff)
• HeuristicLabDataImporterDataProcessorApplication.cs (modified) (1 diff)
• IExporter.cs (modified) (1 diff)
• IImporter.cs (modified) (1 diff)
• ImportDialog.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)
• ProgressDialog.cs (modified) (1 diff)
• ToolStripCheckBox.cs (modified) (1 diff)

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/DataBaseCommandBase.cs

@@ -23 +23 @@
 using HeuristicLab.DataImporter.Data.Model;
 using HeuristicLab.DataImporter.DbExplorer.Interfaces;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HEAL.Attic;
 

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/LoadColumnGroupWithSqlStringFromDBCommand.cs

@@ -23 +23 @@
 using HeuristicLab.DataImporter.Data.Model;
 using HeuristicLab.DataImporter.DbExplorer.Interfaces;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HEAL.Attic;
 

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/LoadColumnGroupsFromDBCommand.cs

@@ -24 +24 @@
 using HeuristicLab.DataImporter.Data.Model;
 using HeuristicLab.DataImporter.DbExplorer.Interfaces;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HEAL.Attic;
 

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/ReorderColumnsCommand.cs

@@ -24 +24 @@
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data.Model;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HEAL.Attic;
 

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Command/SqlCommandView.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
 
 namespace HeuristicLab.DataImporter.DataProcessor.Command {

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/DataProcessorView.cs

@@ -29 +29 @@
 using System.Windows.Forms;
 using System.Xml;
+using HEAL.Attic;
+using HeuristicLab.Common;
 using HeuristicLab.DataImporter.Data;
 using HeuristicLab.DataImporter.Data.CommandBase;
@@ -35 +37 @@
 using HeuristicLab.DataImporter.DataProcessor.Command;
 using HeuristicLab.DataImporter.DbExplorer.Interfaces;
-using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.DataAnalysis;
@@ -324 +325 @@
       if (dlg.ShowDialog() == DialogResult.OK) {
         try {
-          DataProcessor dp = (DataProcessor)XmlParser.Deserialize(dlg.FileName);
+          var ser = new ProtoBufSerializer();
+          DataProcessor dp = (DataProcessor)ser.Deserialize(dlg.FileName);
           dp.DatabaseExplorer = this.dataProcessor.DatabaseExplorer;
           this.lastSavedFile = dlg.FileName;
@@ -364 +366 @@
       try {
         this.Cursor = Cursors.WaitCursor;
-        XmlGenerator.Serialize(serialize, filename, CompressionLevel.Optimal);
+        var ser = new ProtoBufSerializer();
+        ser.Serialize(serialize, filename);
         this.Cursor = Cursors.Default;
         this.Text = "Data Importer - " + lastSavedFile;
@@ -443 +446 @@
         this.Enabled = false;
         try {
-          CommandChain temp = (CommandChain)XmlParser.Deserialize(dlg.FileName);
+          var ser = new ProtoBufSerializer();
+          CommandChain temp = (CommandChain)ser.Deserialize(dlg.FileName);
           progressDlg = new ProgressDialog();
           progressDlg.DesktopLocation = new Point(this.Location.X + this.Width / 2 - progressDlg.Width / 2, this.Location.Y + this.Height / 2 - progressDlg.Height / 2);
@@ -467 +471 @@
         try {
           this.Cursor = Cursors.WaitCursor;
-          XmlGenerator.Serialize(this.dataProcessor.CommandChain, saveFileDialog.FileName, CompressionLevel.Optimal);
+          var ser = new ProtoBufSerializer();
+          ser.Serialize(this.dataProcessor.CommandChain, saveFileDialog.FileName);
         }
         finally {

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/DbTablesView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
 using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.DataImporter.DbExplorer.Interfaces;

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/ExportDialog.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using HeuristicLab.DataImporter.Data;
 using HeuristicLab.PluginInfrastructure;
 

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/HeuristicLab.DataImporter.DataProcessor.csproj

@@ -119 +119 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Persistence-3.3">
-      <HintPath>..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/HeuristicLabDataImporterDataProcessorApplication.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/IExporter.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.DataImporter.Data.Model;

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/IImporter.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.DataImporter.Data.CommandBase;

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/ImportDialog.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.DataImporter.Data.CommandBase;
 using HeuristicLab.DataImporter.Data;
-using HeuristicLab.DataImporter.DataProcessor;
 using HeuristicLab.PluginInfrastructure;
 

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/Plugin.cs.frame

@@ -32 +32 @@
   [PluginFile("HeuristicLab.DataImporter.DbExplorer.Interfaces-1.0.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.ALGLIB", "3.7")]
+  [PluginDependency("HeuristicLab.Attic","1.0")]  
   [PluginDependency("HeuristicLab.Common.Resources","3.3")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis","3.4")]
-  [PluginDependency("HeuristicLab.Persistence","3.3")]
   public class HeuristicLabDataImporterDataProcessorPlugin : PluginBase {
   }

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/ProgressDialog.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 

addons/HeuristicLab.DataImporter/HeuristicLab.DataImporter.DataProcessor/ToolStripCheckBox.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;