diff --git a/HeuristicLab 3.3.sln b/HeuristicLab 3.3.sln index 1dceb85052..d5240e971b 100644 --- a/HeuristicLab 3.3.sln +++ b/HeuristicLab 3.3.sln @@ -40,8 +40,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.PluginInfrastr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence-3.3", "HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj", "{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence.GUI-3.3", "HeuristicLab.Persistence.GUI\3.3\HeuristicLab.Persistence.GUI-3.3.csproj", "{A9E282EA-180F-4233-B809-AEDF0787545C}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Core-3.3", "HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj", "{C36BD924-A541-4A00-AFA8-41701378DDC5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Data-3.3", "HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj", "{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}" @@ -59,7 +57,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab-3.3", "HeuristicLab\3.3\HeuristicLab-3.3.csproj", "{B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}" ProjectSection(ProjectDependencies) = postProject {89B50302-9CEE-4D13-9779-633EADCAE624} = {89B50302-9CEE-4D13-9779-633EADCAE624} - {730A9104-D4D1-4360-966B-E49B7571DDA3} = {730A9104-D4D1-4360-966B-E49B7571DDA3} {125D3006-67F5-48CB-913E-73C0548F17FA} = {125D3006-67F5-48CB-913E-73C0548F17FA} {315BDA09-3F4F-49B3-9790-B37CFC1C5750} = {315BDA09-3F4F-49B3-9790-B37CFC1C5750} {489CFE09-FDF7-4C89-BAB5-BD09CADD61AD} = {489CFE09-FDF7-4C89-BAB5-BD09CADD61AD} @@ -141,7 +138,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab-3.3", "Heurist {88B9B0E3-344E-4196-82A3-0F9732506FE8} = {88B9B0E3-344E-4196-82A3-0F9732506FE8} {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295} = {AE5B1CE5-9862-4D6F-A700-D72CD9AEA295} {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0} = {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0} - {A9E282EA-180F-4233-B809-AEDF0787545C} = {A9E282EA-180F-4233-B809-AEDF0787545C} {96AEBBEE-4203-45F3-BCF5-7B73BF256BDA} = {96AEBBEE-4203-45F3-BCF5-7B73BF256BDA} {5A4679EF-A8F3-4647-B722-441A36B3BA6B} = {5A4679EF-A8F3-4647-B722-441A36B3BA6B} {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} = {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} @@ -306,8 +302,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Exter EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3", "HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj", "{1778134B-866B-4CB3-BFC0-52B2FAAA5777}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Common-3.3", "HeuristicLab.Clients.Common\3.3\HeuristicLab.Clients.Common-3.3.csproj", "{730A9104-D4D1-4360-966B-E49B7571DDA3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab-3.3.Tests", "HeuristicLab\3.3\Tests\HeuristicLab-3.3.Tests.csproj", "{66DABFD5-5BD2-4478-8DF9-C589F569F7A2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Classification-3.3", "HeuristicLab.Problems.DataAnalysis.Classification\3.3\HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj", "{D35FD6DB-D704-4BEA-BDAE-C40ABFB5B13E}" @@ -355,18 +349,6 @@ Global {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}.Release|x64.Build.0 = Release|x64 {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}.Release|x86.ActiveCfg = Release|x86 {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}.Release|x86.Build.0 = Release|x86 - {A9E282EA-180F-4233-B809-AEDF0787545C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9E282EA-180F-4233-B809-AEDF0787545C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9E282EA-180F-4233-B809-AEDF0787545C}.Debug|x64.ActiveCfg = Debug|x64 - {A9E282EA-180F-4233-B809-AEDF0787545C}.Debug|x64.Build.0 = Debug|x64 - {A9E282EA-180F-4233-B809-AEDF0787545C}.Debug|x86.ActiveCfg = Debug|x86 - {A9E282EA-180F-4233-B809-AEDF0787545C}.Debug|x86.Build.0 = Debug|x86 - {A9E282EA-180F-4233-B809-AEDF0787545C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9E282EA-180F-4233-B809-AEDF0787545C}.Release|Any CPU.Build.0 = Release|Any CPU - {A9E282EA-180F-4233-B809-AEDF0787545C}.Release|x64.ActiveCfg = Release|x64 - {A9E282EA-180F-4233-B809-AEDF0787545C}.Release|x64.Build.0 = Release|x64 - {A9E282EA-180F-4233-B809-AEDF0787545C}.Release|x86.ActiveCfg = Release|x86 - {A9E282EA-180F-4233-B809-AEDF0787545C}.Release|x86.Build.0 = Release|x86 {C36BD924-A541-4A00-AFA8-41701378DDC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C36BD924-A541-4A00-AFA8-41701378DDC5}.Debug|Any CPU.Build.0 = Debug|Any CPU {C36BD924-A541-4A00-AFA8-41701378DDC5}.Debug|x64.ActiveCfg = Debug|x64 @@ -1363,18 +1345,6 @@ Global {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|x64.Build.0 = Release|x64 {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|x86.ActiveCfg = Release|x86 {1778134B-866B-4CB3-BFC0-52B2FAAA5777}.Release|x86.Build.0 = Release|x86 - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|x64.ActiveCfg = Debug|x64 - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|x64.Build.0 = Debug|x64 - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|x86.ActiveCfg = Debug|x86 - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Debug|x86.Build.0 = Debug|x86 - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|Any CPU.Build.0 = Release|Any CPU - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|x64.ActiveCfg = Release|x64 - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|x64.Build.0 = Release|x64 - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|x86.ActiveCfg = Release|x86 - {730A9104-D4D1-4360-966B-E49B7571DDA3}.Release|x86.Build.0 = Release|x86 {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Debug|Any CPU.Build.0 = Debug|Any CPU {66DABFD5-5BD2-4478-8DF9-C589F569F7A2}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/HeuristicLab.Clients.Common/3.3/ClientFactory.cs b/HeuristicLab.Clients.Common/3.3/ClientFactory.cs deleted file mode 100644 index 11e9035c3e..0000000000 --- a/HeuristicLab.Clients.Common/3.3/ClientFactory.cs +++ /dev/null @@ -1,58 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using System; -using System.ServiceModel; -using HeuristicLab.Clients.Common.Properties; - -namespace HeuristicLab.Clients.Common { - public static class ClientFactory { - public static T CreateClient() - where T : ClientBase, I - where I : class { - return CreateClient(null, null); - } - public static T CreateClient(string endpointConfigurationName) - where T : ClientBase, I - where I : class { - return CreateClient(endpointConfigurationName, null); - } - public static T CreateClient(string endpointConfigurationName, string remoteAddress) - where T : ClientBase, I - where I : class { - T client; - if (string.IsNullOrEmpty(endpointConfigurationName)) { - client = Activator.CreateInstance(); - } else { - client = (T)Activator.CreateInstance(typeof(T), endpointConfigurationName); - } - - if (!string.IsNullOrEmpty(remoteAddress)) { - client.Endpoint.Address = new EndpointAddress(remoteAddress); - } - - client.ClientCredentials.UserName.UserName = Settings.Default.UserName; - client.ClientCredentials.UserName.Password = Settings.Default.Password; - client.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.None; - return client; - } - } -} diff --git a/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj b/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj deleted file mode 100644 index 1d3d8fcb35..0000000000 --- a/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj +++ /dev/null @@ -1,164 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {730A9104-D4D1-4360-966B-E49B7571DDA3} - Library - Properties - HeuristicLab.Clients.Common - HeuristicLab.Clients.Common-3.3 - v3.5 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - - - HeuristicLab.snk - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - bin\Debug\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - false - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - false - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - bin\Release\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - bin\Debug\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - bin\Release\HeuristicLab.Clients.Common-3.3.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - true - ;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - true - - - - - - - - - - - - - - - - - Form - - - PasswordDialog.cs - - - - True - True - Settings.settings - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - - {94186A6A-5176-4402-AE83-886557B53CCA} - HeuristicLab.PluginInfrastructure-3.3 - - - - - set Path=%25Path%25;$(ProjectDir);$(SolutionDir) -set ProjectDir=$(ProjectDir) -set SolutionDir=$(SolutionDir) -set Outdir=$(Outdir) - -call PreBuildEvent.cmd -SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabClientsCommonPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabClientsCommonPlugin.cs" - - - \ No newline at end of file diff --git a/HeuristicLab.Clients.Common/3.3/HeuristicLab.snk b/HeuristicLab.Clients.Common/3.3/HeuristicLab.snk deleted file mode 100644 index 41ce51218d..0000000000 Binary files a/HeuristicLab.Clients.Common/3.3/HeuristicLab.snk and /dev/null differ diff --git a/HeuristicLab.Clients.Common/3.3/HeuristicLabClientsCommonPlugin.cs.frame b/HeuristicLab.Clients.Common/3.3/HeuristicLabClientsCommonPlugin.cs.frame deleted file mode 100644 index bf259035f8..0000000000 --- a/HeuristicLab.Clients.Common/3.3/HeuristicLabClientsCommonPlugin.cs.frame +++ /dev/null @@ -1,32 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using HeuristicLab.PluginInfrastructure; - -namespace HeuristicLab.Clients.Common { - /// - /// Plugin class for HeuristicLab.Clients.Common plugin. - /// - [Plugin("HeuristicLab.Clients.Common", "3.3.2.$WCREV$")] - [PluginFile("HeuristicLab.Clients.Common-3.3.dll", PluginFileType.Assembly)] - public class HeuristicLabClientsCommonPlugin : PluginBase { - } -} diff --git a/HeuristicLab.Clients.Common/3.3/PasswordDialog.Designer.cs b/HeuristicLab.Clients.Common/3.3/PasswordDialog.Designer.cs deleted file mode 100644 index e9c29848d2..0000000000 --- a/HeuristicLab.Clients.Common/3.3/PasswordDialog.Designer.cs +++ /dev/null @@ -1,176 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -namespace HeuristicLab.Clients.Common { - partial class PasswordDialog { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { - this.okButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); - this.usernameLabel = new System.Windows.Forms.Label(); - this.usernameTextBox = new System.Windows.Forms.TextBox(); - this.passwordLabel = new System.Windows.Forms.Label(); - this.passwordTextBox = new System.Windows.Forms.TextBox(); - this.savePasswordCheckBox = new System.Windows.Forms.CheckBox(); - this.savePasswordLabel = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // okButton - // - this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.okButton.Location = new System.Drawing.Point(163, 89); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 6; - this.okButton.Text = "&OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.okButton_Click); - // - // cancelButton - // - this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(244, 89); - this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 7; - this.cancelButton.Text = "&Cancel"; - this.cancelButton.UseVisualStyleBackColor = true; - // - // usernameLabel - // - this.usernameLabel.AutoSize = true; - this.usernameLabel.Location = new System.Drawing.Point(12, 15); - this.usernameLabel.Name = "usernameLabel"; - this.usernameLabel.Size = new System.Drawing.Size(58, 13); - this.usernameLabel.TabIndex = 0; - this.usernameLabel.Text = "&Username:"; - // - // usernameTextBox - // - this.usernameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.usernameTextBox.Location = new System.Drawing.Point(102, 12); - this.usernameTextBox.Name = "usernameTextBox"; - this.usernameTextBox.Size = new System.Drawing.Size(217, 20); - this.usernameTextBox.TabIndex = 1; - // - // passwordLabel - // - this.passwordLabel.AutoSize = true; - this.passwordLabel.Location = new System.Drawing.Point(12, 41); - this.passwordLabel.Name = "passwordLabel"; - this.passwordLabel.Size = new System.Drawing.Size(56, 13); - this.passwordLabel.TabIndex = 2; - this.passwordLabel.Text = "&Password:"; - // - // passwordTextBox - // - this.passwordTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.passwordTextBox.Location = new System.Drawing.Point(102, 38); - this.passwordTextBox.Name = "passwordTextBox"; - this.passwordTextBox.PasswordChar = '*'; - this.passwordTextBox.Size = new System.Drawing.Size(217, 20); - this.passwordTextBox.TabIndex = 3; - // - // savePasswordCheckBox - // - this.savePasswordCheckBox.AutoSize = true; - this.savePasswordCheckBox.Checked = true; - this.savePasswordCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; - this.savePasswordCheckBox.Location = new System.Drawing.Point(102, 64); - this.savePasswordCheckBox.Name = "savePasswordCheckBox"; - this.savePasswordCheckBox.Size = new System.Drawing.Size(15, 14); - this.savePasswordCheckBox.TabIndex = 5; - this.savePasswordCheckBox.UseVisualStyleBackColor = true; - // - // savePasswordLabel - // - this.savePasswordLabel.AutoSize = true; - this.savePasswordLabel.Location = new System.Drawing.Point(12, 64); - this.savePasswordLabel.Name = "savePasswordLabel"; - this.savePasswordLabel.Size = new System.Drawing.Size(84, 13); - this.savePasswordLabel.TabIndex = 4; - this.savePasswordLabel.Text = "&Save Password:"; - // - // PasswordDialog - // - this.AcceptButton = this.okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.cancelButton; - this.ClientSize = new System.Drawing.Size(331, 124); - this.Controls.Add(this.savePasswordCheckBox); - this.Controls.Add(this.passwordTextBox); - this.Controls.Add(this.usernameTextBox); - this.Controls.Add(this.savePasswordLabel); - this.Controls.Add(this.passwordLabel); - this.Controls.Add(this.usernameLabel); - this.Controls.Add(this.cancelButton); - this.Controls.Add(this.okButton); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "PasswordDialog"; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Set Username / Password"; - this.Load += new System.EventHandler(this.PasswordDialog_Load); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button okButton; - private System.Windows.Forms.Button cancelButton; - private System.Windows.Forms.Label usernameLabel; - private System.Windows.Forms.TextBox usernameTextBox; - private System.Windows.Forms.Label passwordLabel; - private System.Windows.Forms.TextBox passwordTextBox; - private System.Windows.Forms.CheckBox savePasswordCheckBox; - private System.Windows.Forms.Label savePasswordLabel; - } -} \ No newline at end of file diff --git a/HeuristicLab.Clients.Common/3.3/PasswordDialog.cs b/HeuristicLab.Clients.Common/3.3/PasswordDialog.cs deleted file mode 100644 index 093acc2ec1..0000000000 --- a/HeuristicLab.Clients.Common/3.3/PasswordDialog.cs +++ /dev/null @@ -1,48 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using System; -using System.Windows.Forms; -using HeuristicLab.Clients.Common.Properties; - -namespace HeuristicLab.Clients.Common { - public partial class PasswordDialog : Form { - public PasswordDialog() { - InitializeComponent(); - } - - private void PasswordDialog_Load(object sender, EventArgs e) { - usernameTextBox.Text = Settings.Default.UserName; - passwordTextBox.Text = Settings.Default.Password; - savePasswordCheckBox.Checked = Settings.Default.SavePassword; - } - - private void okButton_Click(object sender, EventArgs e) { - Settings.Default.UserName = usernameTextBox.Text; - Settings.Default.SavePassword = savePasswordCheckBox.Checked; - Settings.Default.Password = string.Empty; - Settings.Default.Save(); - Settings.Default.Password = passwordTextBox.Text; - if (savePasswordCheckBox.Checked) - Settings.Default.Save(); - } - } -} diff --git a/HeuristicLab.Clients.Common/3.3/Properties/AssemblyInfo.frame b/HeuristicLab.Clients.Common/3.3/Properties/AssemblyInfo.frame deleted file mode 100644 index 9b61f3d58f..0000000000 --- a/HeuristicLab.Clients.Common/3.3/Properties/AssemblyInfo.frame +++ /dev/null @@ -1,57 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("HeuristicLab.Clients.Common")] -[assembly: AssemblyDescription("Common classes for HeuristicLab services clients")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HeuristicLab")] -[assembly: AssemblyCopyright("(c) 2002-2010 HEAL")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("fabadce0-3dcf-48a0-95bf-6cda957e7fbf")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3.0.0")] -[assembly: AssemblyFileVersion("3.3.2.$WCREV$")] diff --git a/HeuristicLab.Clients.Common/3.3/Properties/Settings.Designer.cs b/HeuristicLab.Clients.Common/3.3/Properties/Settings.Designer.cs deleted file mode 100644 index 62529ef506..0000000000 --- a/HeuristicLab.Clients.Common/3.3/Properties/Settings.Designer.cs +++ /dev/null @@ -1,62 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.1 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace HeuristicLab.Clients.Common.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("anonymous")] - public string UserName { - get { - return ((string)(this["UserName"])); - } - set { - this["UserName"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("anonymous")] - public string Password { - get { - return ((string)(this["Password"])); - } - set { - this["Password"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool SavePassword { - get { - return ((bool)(this["SavePassword"])); - } - set { - this["SavePassword"] = value; - } - } - } -} diff --git a/HeuristicLab.Clients.Common/3.3/Properties/Settings.settings b/HeuristicLab.Clients.Common/3.3/Properties/Settings.settings deleted file mode 100644 index 8c76087f1f..0000000000 --- a/HeuristicLab.Clients.Common/3.3/Properties/Settings.settings +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - anonymous - - - anonymous - - - True - - - \ No newline at end of file diff --git a/HeuristicLab.Clients.Common/3.3/app.config b/HeuristicLab.Clients.Common/3.3/app.config deleted file mode 100644 index 70701f7af6..0000000000 --- a/HeuristicLab.Clients.Common/3.3/app.config +++ /dev/null @@ -1,21 +0,0 @@ - - - - -
- - - - - - anonymous - - - anonymous - - - True - - - - \ No newline at end of file diff --git a/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj b/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj index da9fe19b31..51f9b5a997 100644 --- a/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj +++ b/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj @@ -128,7 +128,6 @@ - @@ -182,10 +181,6 @@ - - {730A9104-D4D1-4360-966B-E49B7571DDA3} - HeuristicLab.Clients.Common-3.3 - {958B43BC-CC5C-4FA2-8628-2B3B01D890B6} HeuristicLab.Collections-3.3 diff --git a/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame b/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame index 95f98f8bb8..ce21484d11 100644 --- a/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame +++ b/HeuristicLab.Optimizer/3.3/HeuristicLabOptimizerPlugin.cs.frame @@ -25,7 +25,6 @@ using HeuristicLab.PluginInfrastructure; namespace HeuristicLab.Optimizer { [Plugin("HeuristicLab.Optimizer", "3.3.2.$WCREV$")] [PluginFile("HeuristicLab.Optimizer-3.3.dll", PluginFileType.Assembly)] - [PluginDependency("HeuristicLab.Clients.Common", "3.3")] [PluginDependency("HeuristicLab.Collections", "3.3")] [PluginDependency("HeuristicLab.Common", "3.3")] [PluginDependency("HeuristicLab.Common.Resources", "3.3")] diff --git a/HeuristicLab.Optimizer/3.3/MenuItems/UsernamePasswordMenuItem.cs b/HeuristicLab.Optimizer/3.3/MenuItems/UsernamePasswordMenuItem.cs deleted file mode 100644 index a5731602dc..0000000000 --- a/HeuristicLab.Optimizer/3.3/MenuItems/UsernamePasswordMenuItem.cs +++ /dev/null @@ -1,48 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using System.Collections.Generic; -using System.Windows.Forms; -using HeuristicLab.Clients.Common; -using HeuristicLab.MainForm; - -namespace HeuristicLab.Optimizer.MenuItems { - internal class UserNamePasswordMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider { - public override string Name { - get { return "Set &Username / Password..."; } - } - public override IEnumerable Structure { - get { return new string[] { "&Services" }; } - } - public override int Position { - get { return 4100; } - } - public override string ToolTipText { - get { return "Set username and password for accessing HeuristicLab services"; } - } - - public override void Execute() { - using (PasswordDialog dialog = new PasswordDialog()) { - dialog.ShowDialog((IWin32Window)MainFormManager.MainForm); - } - } - } -} diff --git a/HeuristicLab.Persistence.GUI/3.3/HeuristicLab.Persistence.GUI-3.3.csproj b/HeuristicLab.Persistence.GUI/3.3/HeuristicLab.Persistence.GUI-3.3.csproj deleted file mode 100644 index 9e28a5fa1d..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/HeuristicLab.Persistence.GUI-3.3.csproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {A9E282EA-180F-4233-B809-AEDF0787545C} - Library - Properties - HeuristicLab.Persistence.GUI - HeuristicLab.Persistence.GUI-3.3 - v3.5 - 512 - - - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\HeuristicLab.Persistence.GUI-3.3.XML - AllRules.ruleset - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - AllRules.ruleset - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - bin\x64\Release\HeuristicLab.Persistence.GUI-3.3.XML - AllRules.ruleset - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - AllRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - bin\x86\Release\HeuristicLab.Persistence.GUI-3.3.XML - AllRules.ruleset - - - - - - {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} - HeuristicLab.Common.Resources-3.3 - - - {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B} - HeuristicLab.Persistence-3.3 - - - {94186A6A-5176-4402-AE83-886557B53CCA} - HeuristicLab.PluginInfrastructure-3.3 - - - - - - - - Form - - - PersistenceConfigurationForm.cs - - - - - - - - 3.5 - - - - - - - - - PersistenceConfigurationForm.cs - Designer - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - set Path=%25Path%25;$(ProjectDir);$(SolutionDir) -set ProjectDir=$(ProjectDir) -set SolutionDir=$(SolutionDir) -set Outdir=$(Outdir) - -call PreBuildEvent.cmd -SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabPersistenceGUIPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabPersistenceGUIPlugin.cs" - - \ No newline at end of file diff --git a/HeuristicLab.Persistence.GUI/3.3/HeuristicLabPersistenceGUIPlugin.cs.frame b/HeuristicLab.Persistence.GUI/3.3/HeuristicLabPersistenceGUIPlugin.cs.frame deleted file mode 100644 index 85c7336e26..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/HeuristicLabPersistenceGUIPlugin.cs.frame +++ /dev/null @@ -1,22 +0,0 @@ -using System.Windows.Forms; -using HeuristicLab.PluginInfrastructure; - -namespace HeuristicLab.Persistence.GUI { - - [Plugin("HeuristicLab.Persistence.GUI", "3.3.2.$WCREV$")] - [PluginFile("HeuristicLab.Persistence.GUI-3.3.dll", PluginFileType.Assembly)] - [PluginDependency("HeuristicLab.Common.Resources", "3.3")] - [PluginDependency("HeuristicLab.Persistence", "3.3")] - public class HeuristicLabPersistenceGUIPlugin : PluginBase { } - - - [Application("Persistence Configuration", "Configure type mappings of persistence")] - public class HeuristicLabPersistenceGUIApplication : ApplicationBase { - public override void Run() { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new PersistenceConfigurationForm()); - } - } - -} \ No newline at end of file diff --git a/HeuristicLab.Persistence.GUI/3.3/PersistenceAnalysis.cs b/HeuristicLab.Persistence.GUI/3.3/PersistenceAnalysis.cs deleted file mode 100644 index 1691c5b766..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/PersistenceAnalysis.cs +++ /dev/null @@ -1,100 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; -using HeuristicLab.Persistence.Core; - -namespace HeuristicLab.Persistence.GUI { - public class PersistenceAnalysis { - - public static bool IsSerializable(Type type, Configuration config) { - if (config.PrimitiveSerializers.Any(ps => ps.SourceType == type)) - return true; - foreach (var cs in config.CompositeSerializers) { - if (cs.CanSerialize(type)) - return true; - } - return false; - } - - private static bool DerivesFrom(Type baseType, Type type) { - if (type == baseType) - return true; - if (type.BaseType == null) - return false; - return DerivesFrom(baseType, type.BaseType); - } - - public static IEnumerable NonSerializableTypes(Configuration config) { - var types = new List(); - var storableInconsistentcy = new List(); - foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) { - if (assembly.FullName.StartsWith("System.") || - assembly.FullName.StartsWith("HeuristicLab.PluginInfrastructure") || - assembly.FullName.StartsWith("log4net") || - assembly.FullName.StartsWith("WindowsBase") || - assembly.FullName.StartsWith("WeifenLuo") || - assembly.FullName.StartsWith("ICSharpCode") || - assembly.FullName.StartsWith("Mono") || - assembly.FullName.StartsWith("Netron")) - continue; - foreach (var type in assembly.GetTypes()) { - if (type.IsInterface || type.IsAbstract || - type.FullName.StartsWith("System.") || - type.FullName.StartsWith("Microsoft.") || - type.FullName.Contains("<") || - type.FullName.Contains(">") || - DerivesFrom(typeof(Exception), type) || - DerivesFrom(typeof(Control), type) || - DerivesFrom(typeof(System.EventArgs), type) || - DerivesFrom(typeof(System.Attribute), type) || - type.GetInterface("HeuristicLab.MainForm.IUserInterfaceItem") != null - ) - continue; - try { - if (!IsSerializable(type, config)) - types.Add(type); - /* if (!IsCorrectlyStorable(type)) - storableInconsistentcy.Add(type); */ - } - catch { - types.Add(type); - } - } - } - return types; - } - - /* private static bool IsCorrectlyStorable(Type type) { - if (StorableAttribute.GetStorableMembers(type).Count() > 0) { - if (!StorableClassAttribute.IsStorableType(type, true)) - return false; - if (type.GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public, null, Type.EmptyTypes, null) == null && - StorableConstructorAttribute.GetStorableConstructor(type) == null) - return false; - } - return true; - } */ - } -} diff --git a/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.Designer.cs b/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.Designer.cs deleted file mode 100644 index 40fb10f377..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.Designer.cs +++ /dev/null @@ -1,129 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -namespace HeuristicLab.Persistence.GUI { - partial class PersistenceConfigurationForm { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { - this.updateButton = new System.Windows.Forms.Button(); - this.configurationTabs = new System.Windows.Forms.TabControl(); - this.buttonPanel = new System.Windows.Forms.TableLayoutPanel(); - this.resetButton = new System.Windows.Forms.Button(); - this.buttonPanel.SuspendLayout(); - this.SuspendLayout(); - // - // updateButton - // - this.updateButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.updateButton.Location = new System.Drawing.Point(296, 6); - this.updateButton.Name = "updateButton"; - this.updateButton.Size = new System.Drawing.Size(282, 25); - this.updateButton.TabIndex = 1; - this.updateButton.Text = "&Define"; - this.updateButton.UseVisualStyleBackColor = true; - this.updateButton.Click += new System.EventHandler(this.updateButton_Click); - // - // configurationTabs - // - this.configurationTabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.configurationTabs.Location = new System.Drawing.Point(0, -1); - this.configurationTabs.Name = "configurationTabs"; - this.configurationTabs.SelectedIndex = 0; - this.configurationTabs.Size = new System.Drawing.Size(584, 573); - this.configurationTabs.TabIndex = 0; - // - // buttonPanel - // - this.buttonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.buttonPanel.AutoSize = true; - this.buttonPanel.CausesValidation = false; - this.buttonPanel.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.InsetDouble; - this.buttonPanel.ColumnCount = 2; - this.buttonPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.buttonPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.buttonPanel.Controls.Add(this.updateButton, 1, 0); - this.buttonPanel.Controls.Add(this.resetButton, 0, 0); - this.buttonPanel.Location = new System.Drawing.Point(0, 572); - this.buttonPanel.Name = "buttonPanel"; - this.buttonPanel.RowCount = 1; - this.buttonPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.buttonPanel.Size = new System.Drawing.Size(584, 37); - this.buttonPanel.TabIndex = 2; - // - // resetButton - // - this.resetButton.Dock = System.Windows.Forms.DockStyle.Fill; - this.resetButton.Location = new System.Drawing.Point(6, 6); - this.resetButton.Name = "resetButton"; - this.resetButton.Size = new System.Drawing.Size(281, 25); - this.resetButton.TabIndex = 2; - this.resetButton.Text = "&Reset All"; - this.resetButton.UseVisualStyleBackColor = true; - this.resetButton.Click += new System.EventHandler(this.resetButton_Click); - // - // PersistenceConfigurationForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(582, 609); - this.Controls.Add(this.buttonPanel); - this.Controls.Add(this.configurationTabs); - this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon; - this.Name = "PersistenceConfigurationForm"; - this.Text = "PersistenceConfigurationForm"; - this.buttonPanel.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TabControl configurationTabs; - private System.Windows.Forms.TableLayoutPanel buttonPanel; - private System.Windows.Forms.Button resetButton; - private System.Windows.Forms.Button updateButton; - } -} \ No newline at end of file diff --git a/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs b/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs deleted file mode 100644 index 29c47faf57..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.cs +++ /dev/null @@ -1,455 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Windows.Forms; -using HeuristicLab.Persistence.Auxiliary; -using HeuristicLab.Persistence.Core; -using HeuristicLab.Persistence.Interfaces; - -namespace HeuristicLab.Persistence.GUI { - - public partial class PersistenceConfigurationForm : Form { - - private readonly Dictionary primitiveSerializersTable; - private readonly Dictionary simplePrimitiveSerializersTable; - private readonly Dictionary reversePrimitiveSerializersTable; - private readonly Dictionary typeNameTable; - private readonly Dictionary reverseTypeNameTable; - private bool underConstruction; - - public PersistenceConfigurationForm() { - InitializeComponent(); - primitiveSerializersTable = new Dictionary(); - simplePrimitiveSerializersTable = new Dictionary(); - reversePrimitiveSerializersTable = new Dictionary(); - typeNameTable = new Dictionary(); - reverseTypeNameTable = new Dictionary(); - underConstruction = true; - InitializeTooltips(); - InitializeNameTables(); - initializeConfigPages(); - try { - ConfigurationService.Instance.LoadSettings(true); - UpdateFromConfigurationService(); - } - catch (PersistenceException) { - MessageBox.Show( - "Persistence settings could not be loaded.\r\n" + - "Default configurations will be used instead.", - "Loading Settings Failed", - MessageBoxButtons.OK, - MessageBoxIcon.Information); - } - underConstruction = false; - UpdatePreview(); - } - - private void InitializeTooltips() { - ToolTip tooltip = new ToolTip() { - AutoPopDelay = 5000, - InitialDelay = 1000, - ReshowDelay = 500, - ShowAlways = true - }; - tooltip.SetToolTip(resetButton, - "Clear all custom configurations from memory.\r\n" + - "The saved configuration will still be used next\r\n" + - "time if you don't save (define) this change."); - tooltip.SetToolTip(updateButton, - "Define configuration for currently active format\r\n" + - "and save to disk."); - } - - private void UpdatePrimitiveSerializersGrid(DataGridView primitiveSerializersGrid, Configuration config) { - foreach (DataGridViewRow row in primitiveSerializersGrid.Rows) { - if (row.Cells["Type"] != null) { - IPrimitiveSerializer primitiveSerializer = config.GetPrimitiveSerializer(typeNameTable[(string)row.Cells["Type"].Value]); - if (primitiveSerializer == null) { - row.Cells["Active"].Value = false; - } else { - foreach (var pair in primitiveSerializersTable) { - if (pair.Value.GetType().VersionInvariantName() == primitiveSerializer.GetType().VersionInvariantName()) { - row.Cells["Primitive Serializer"].Value = pair.Key; - row.Cells["Active"].Value = true; - break; - } - } - } - } - } - } - - private void UpdateCompositeSerializersList(ListView compositeSerializersList, Configuration config) { - compositeSerializersList.SuspendLayout(); - compositeSerializersList.Items.Clear(); - var availableCompositeSerializers = new Dictionary(); - foreach (ICompositeSerializer d in ConfigurationService.Instance.CompositeSerializers) { - availableCompositeSerializers.Add(d.GetType().VersionInvariantName(), d); - } - foreach (ICompositeSerializer compositeSerializer in config.CompositeSerializers) { - var item = compositeSerializersList.Items.Add(compositeSerializer.GetType().Name); - item.Checked = true; - item.Tag = compositeSerializer; - availableCompositeSerializers.Remove(compositeSerializer.GetType().VersionInvariantName()); - } - foreach (KeyValuePair pair in availableCompositeSerializers) { - var item = compositeSerializersList.Items.Add(pair.Value.GetType().Name); - item.Checked = false; - item.Tag = pair.Value; - } - compositeSerializersList.ResumeLayout(); - } - - private void UpdateFromConfigurationService() { - configurationTabs.SuspendLayout(); - foreach (IFormat format in ConfigurationService.Instance.Formats) { - Configuration config = ConfigurationService.Instance.GetConfiguration(format); - UpdatePrimitiveSerializersGrid( - (DataGridView)GetControlsOnPage(format.Name, "GridView"), - config); - UpdateCompositeSerializersList( - (ListView)GetControlsOnPage(format.Name, "CompositeSerializersList"), - config); - } - configurationTabs.ResumeLayout(); - } - - private void initializeConfigPages() { - configurationTabs.SuspendLayout(); - configurationTabs.TabPages.Clear(); - foreach (IFormat format in ConfigurationService.Instance.Formats) { - List primitiveSerializers = ConfigurationService.Instance.PrimitiveSerializers[format.SerialDataType]; - TabPage page = new TabPage(format.Name) { - Name = format.Name, - Tag = format, - }; - page.SuspendLayout(); - configurationTabs.TabPages.Add(page); - SplitContainer verticalSplit = new SplitContainer { - Dock = DockStyle.Fill, - Orientation = Orientation.Vertical, - BorderStyle = BorderStyle.Fixed3D, - }; - verticalSplit.SuspendLayout(); - page.Controls.Add(verticalSplit); - SplitContainer horizontalSplit = new SplitContainer { - Dock = DockStyle.Fill, - Orientation = Orientation.Horizontal, - BorderStyle = BorderStyle.Fixed3D, - }; - horizontalSplit.SuspendLayout(); - verticalSplit.Panel1.Controls.Add(horizontalSplit); - ListView compositeSerializersList = createCompsiteSerializersList(); - horizontalSplit.Panel1.Controls.Add(compositeSerializersList); - DataGridView gridView = createGridView(); - verticalSplit.Panel2.Controls.Add(gridView); - fillDataGrid(gridView, primitiveSerializers); - ListBox checkBox = new ListBox { - Name = "CheckBox", - Dock = DockStyle.Fill, - }; - horizontalSplit.Panel2.Controls.Add(checkBox); - horizontalSplit.ResumeLayout(); - verticalSplit.ResumeLayout(); - page.ResumeLayout(); - } - configurationTabs.ResumeLayout(); - } - - private DataGridView createGridView() { - DataGridView gridView = new DataGridView { - Name = "GridView", - Dock = DockStyle.Fill, - RowHeadersVisible = false, - MultiSelect = false, - EditMode = DataGridViewEditMode.EditOnEnter, - AllowUserToAddRows = false, - AllowUserToDeleteRows = false, - AllowUserToResizeRows = false, - AllowUserToOrderColumns = true, - }; - gridView.SuspendLayout(); - gridView.CellValueChanged += gridView_CellValueChanged; - gridView.Columns.Add(new DataGridViewTextBoxColumn { - Name = "Type", ReadOnly = true, - AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - }); - gridView.Columns.Add(new DataGridViewCheckBoxColumn { - Name = "Active", - AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells - }); - gridView.Columns.Add(new DataGridViewComboBoxColumn { - Name = "Primitive Serializer", - AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - }); - gridView.ResumeLayout(); - return gridView; - } - - private ListView createCompsiteSerializersList() { - ListView compositeSerializersList = new ListView { - Activation = ItemActivation.OneClick, - AllowDrop = true, - CheckBoxes = true, - Dock = DockStyle.Fill, - FullRowSelect = true, - GridLines = true, - HeaderStyle = ColumnHeaderStyle.Nonclickable, - Name = "CompositeSerializersList", - ShowGroups = false, - View = View.Details - }; - compositeSerializersList.SuspendLayout(); - compositeSerializersList.Resize += compositeSerializersList_Resize; - compositeSerializersList.ItemChecked += compositeSerializersList_ItemChecked; - compositeSerializersList.DragDrop += compositeSerializersList_DragDrop; - compositeSerializersList.DragEnter += compositeSerializersList_DragEnter; - compositeSerializersList.ItemDrag += compositeSerializersList_ItemDrag; - compositeSerializersList.Columns.Add( - new ColumnHeader { - Name = "CompositeSerializersColumn", Text = "Composite Serializer", - }); - foreach (ICompositeSerializer compositeSerializer in ConfigurationService.Instance.CompositeSerializers) { - var item = compositeSerializersList.Items.Add(compositeSerializer.GetType().Name); - item.Checked = true; - item.Tag = compositeSerializer; - } - compositeSerializersList.ResumeLayout(); - return compositeSerializersList; - } - - private void fillDataGrid(DataGridView gridView, IEnumerable primitiveSerializers) { - gridView.SuspendLayout(); - Dictionary> primitiveSerializersMap = createPrimitiveSerializersMap(primitiveSerializers); - foreach (var primitiveSerializersMapping in primitiveSerializersMap) { - var row = gridView.Rows[gridView.Rows.Add()]; - row.Cells["Type"].Value = primitiveSerializersMapping.Key; - row.Cells["Type"].ToolTipText = primitiveSerializersMapping.Key; - row.Cells["Active"].Value = true; - var comboBoxCell = (DataGridViewComboBoxCell)row.Cells["Primitive Serializer"]; - foreach (var primitiveSerializer in primitiveSerializersMapping.Value) { - comboBoxCell.Items.Add(primitiveSerializer); - } - comboBoxCell.Value = comboBoxCell.Items[0]; - comboBoxCell.ToolTipText = comboBoxCell.Items[0].ToString(); - if (comboBoxCell.Items.Count == 1) { - comboBoxCell.ReadOnly = true; - comboBoxCell.DisplayStyle = DataGridViewComboBoxDisplayStyle.Nothing; - } - } - gridView.ResumeLayout(); - } - - private Dictionary> createPrimitiveSerializersMap(IEnumerable primitiveSerializers) { - var primitiveSerializersMap = new Dictionary>(); - foreach (var primitiveSerializer in primitiveSerializers) { - string primitiveSerializerName = reversePrimitiveSerializersTable[primitiveSerializer]; - string typeName = reverseTypeNameTable[primitiveSerializer.SourceType]; - if (!primitiveSerializersMap.ContainsKey(typeName)) - primitiveSerializersMap.Add(typeName, new List()); - primitiveSerializersMap[typeName].Add(primitiveSerializerName); - } - return primitiveSerializersMap; - } - - private void InitializeNameTables() { - foreach (var serialDataType in ConfigurationService.Instance.PrimitiveSerializers.Keys) { - foreach (var primtiveSerializer in ConfigurationService.Instance.PrimitiveSerializers[serialDataType]) { - string primitiveSerializerName = primtiveSerializer.GetType().Name; - if (simplePrimitiveSerializersTable.ContainsKey(primitiveSerializerName)) { - IPrimitiveSerializer otherPrimitiveSerializer = primitiveSerializersTable[primitiveSerializerName]; - primitiveSerializersTable.Remove(primitiveSerializerName); - reversePrimitiveSerializersTable.Remove(otherPrimitiveSerializer); - primitiveSerializersTable.Add(otherPrimitiveSerializer.GetType().VersionInvariantName(), otherPrimitiveSerializer); - reversePrimitiveSerializersTable.Add(otherPrimitiveSerializer, otherPrimitiveSerializer.GetType().VersionInvariantName()); - primitiveSerializerName = primtiveSerializer.GetType().VersionInvariantName(); - } - simplePrimitiveSerializersTable[primtiveSerializer.GetType().Name] = true; - primitiveSerializersTable.Add(primitiveSerializerName, primtiveSerializer); - reversePrimitiveSerializersTable.Add(primtiveSerializer, primitiveSerializerName); - - string typeName = primtiveSerializer.SourceType.IsGenericType ? - primtiveSerializer.SourceType.SimpleFullName() : - primtiveSerializer.SourceType.Name; - if (typeNameTable.ContainsKey(typeName)) { - Type otherType = typeNameTable[typeName]; - if (otherType != primtiveSerializer.SourceType) { - typeNameTable.Remove(typeName); - reverseTypeNameTable.Remove(otherType); - typeNameTable.Add(otherType.VersionInvariantName(), otherType); - reverseTypeNameTable.Add(otherType, otherType.VersionInvariantName()); - typeName = primtiveSerializer.SourceType.VersionInvariantName(); - typeNameTable.Add(typeName, primtiveSerializer.SourceType); - reverseTypeNameTable.Add(primtiveSerializer.SourceType, typeName); - } - } else { - typeNameTable.Add(typeName, primtiveSerializer.SourceType); - reverseTypeNameTable.Add(primtiveSerializer.SourceType, typeName); - } - } - } - } - - private void UpdatePreview() { - if (underConstruction) - return; - ListBox checkBox = (ListBox)GetActiveControl("CheckBox"); - checkBox.SuspendLayout(); - IFormat activeFormat = (IFormat)configurationTabs.SelectedTab.Tag; - if (activeFormat != null && checkBox != null) { - checkBox.Items.Clear(); - Configuration activeConfig = GetActiveConfiguration(); - foreach (var primitveSerializer in activeConfig.PrimitiveSerializers) { - checkBox.Items.Add(primitveSerializer.GetType().Name + " (F)"); - } - foreach (var compositeSerializer in activeConfig.CompositeSerializers) - checkBox.Items.Add(compositeSerializer.GetType().Name + " (D)"); - } - checkBox.ResumeLayout(); - } - - - void gridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { - UpdatePreview(); - } - - private void compositeSerializersList_ItemDrag(object sender, ItemDragEventArgs e) { - ListView compositeSerializersList = (ListView)sender; - compositeSerializersList.DoDragDrop(compositeSerializersList.SelectedItems, DragDropEffects.Move); - } - - private void compositeSerializersList_DragEnter(object sender, DragEventArgs e) { - if (e.Data.GetDataPresent(typeof(ListView.SelectedListViewItemCollection).FullName)) { - e.Effect = DragDropEffects.Move; - } - } - - private void compositeSerializersList_DragDrop(object sender, DragEventArgs e) { - ListView compositeSerializersList = (ListView)sender; - if (compositeSerializersList.SelectedItems.Count == 0) { - return; - } - Point cp = compositeSerializersList.PointToClient(new Point(e.X, e.Y)); - ListViewItem targetItem = compositeSerializersList.GetItemAt(cp.X, cp.Y); - if (targetItem == null) - return; - int targetIndex = targetItem.Index; - var selectedItems = new List(compositeSerializersList.SelectedItems.Cast()); - int i = 0; - foreach (ListViewItem dragItem in selectedItems) { - if (targetIndex == dragItem.Index) - return; - if (dragItem.Index < targetIndex) { - compositeSerializersList.Items.Insert(targetIndex + 1, (ListViewItem)dragItem.Clone()); - } else { - compositeSerializersList.Items.Insert(targetIndex + i, (ListViewItem)dragItem.Clone()); - } - compositeSerializersList.Items.Remove(dragItem); - i++; - } - UpdatePreview(); - } - - private void compositeSerializersList_Resize(object sender, EventArgs e) { - ListView compositeSerializersList = (ListView)sender; - compositeSerializersList.Columns["CompositeSerializersColumn"].Width = compositeSerializersList.Width - 4; - } - - - private void compositeSerializersList_ItemChecked(object sender, ItemCheckedEventArgs e) { - UpdatePreview(); - } - - private Control GetActiveControl(string name) { - Control[] controls = configurationTabs.SelectedTab.Controls.Find(name, true); - if (controls.Length == 1) { - return controls[0]; - } else { - return null; - } - } - - private Control GetControlsOnPage(string pageName, string name) { - Control[] controls = configurationTabs.TabPages[pageName].Controls.Find(name, true); - if (controls.Length == 1) { - return controls[0]; - } else { - return null; - } - } - - private Configuration GenerateConfiguration(IFormat format, DataGridView primitiveSerializersGrid, ListView compositeSerializersList) { - if (primitiveSerializersGrid == null || compositeSerializersList == null) - return null; - var primitiveSerializers = new List(); - foreach (DataGridViewRow row in primitiveSerializersGrid.Rows) { - if (row.Cells["Type"].Value != null && - row.Cells["Active"].Value != null && - row.Cells["Primitive Serializer"].Value != null && - (bool)row.Cells["Active"].Value == true) { - primitiveSerializers.Add(primitiveSerializersTable[(string)row.Cells["Primitive Serializer"].Value]); - } - } - var compositeSerializers = new List(); - foreach (ListViewItem item in compositeSerializersList.Items) { - if (item != null && item.Checked) - compositeSerializers.Add((ICompositeSerializer)item.Tag); - } - return new Configuration(format, primitiveSerializers, compositeSerializers); - } - - private Configuration GetActiveConfiguration() { - IFormat format = (IFormat)configurationTabs.SelectedTab.Tag; - return GenerateConfiguration(format, - (DataGridView)GetActiveControl("GridView"), - (ListView)GetActiveControl("CompositeSerializersList")); - } - - private Configuration GetConfiguration(IFormat format) { - return GenerateConfiguration(format, - (DataGridView)GetControlsOnPage(format.Name, "GridView"), - (ListView)GetControlsOnPage(format.Name, "CompositeSerializersList")); - } - - private void updateButton_Click(object sender, EventArgs e) { - IFormat format = (IFormat)configurationTabs.SelectedTab.Tag; - if (format != null) - ConfigurationService.Instance.DefineConfiguration( - GetActiveConfiguration()); - } - - private void resetButton_Click(object sender, EventArgs e) { - ConfigurationService.Instance.Reset(); - underConstruction = true; - UpdateFromConfigurationService(); - underConstruction = false; - UpdatePreview(); - } - - } - - - -} diff --git a/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.resx b/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.resx deleted file mode 100644 index ff31a6db56..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/PersistenceConfigurationForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/HeuristicLab.Persistence.GUI/3.3/Properties/AssemblyInfo.frame b/HeuristicLab.Persistence.GUI/3.3/Properties/AssemblyInfo.frame deleted file mode 100644 index e31b80b96a..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/Properties/AssemblyInfo.frame +++ /dev/null @@ -1,54 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("HeuristicLab.Persistence.GUI")] -[assembly: AssemblyDescription("Graphical user interface for Persistence plugin.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("HeuristicLab")] -[assembly: AssemblyCopyright("(c) 2002-2010 HEAL")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f28c9f48-64f8-4dfe-b6e3-53f5f4b9f429")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("3.3.0.0")] -[assembly: AssemblyFileVersion("3.3.2.$WCREV$")] diff --git a/HeuristicLab.Persistence.GUI/3.3/TypeExtensions.cs b/HeuristicLab.Persistence.GUI/3.3/TypeExtensions.cs deleted file mode 100644 index 58bc77eab8..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/TypeExtensions.cs +++ /dev/null @@ -1,52 +0,0 @@ -#region License Information -/* HeuristicLab - * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) - * - * This file is part of HeuristicLab. - * - * HeuristicLab is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * HeuristicLab is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with HeuristicLab. If not, see . - */ -#endregion - -using System; -using System.Text; - -namespace HeuristicLab.Persistence.GUI { - - internal static class TypeExtensions { - - public static string SimpleFullName(this Type type) { - StringBuilder sb = new StringBuilder(); - SimpleFullName(type, sb); - return sb.ToString(); - } - - private static void SimpleFullName(Type type, StringBuilder sb) { - if (type.IsGenericType) { - sb.Append(type.Name, 0, type.Name.LastIndexOf('`')); - sb.Append("<"); - foreach (Type t in type.GetGenericArguments()) { - SimpleFullName(t, sb); - sb.Append(", "); - } - sb.Remove(sb.Length - 2, 2); - sb.Append(">"); - } else { - sb.Append(type.Name); - } - } - - } - -} diff --git a/HeuristicLab.Persistence.GUI/3.3/app.config b/HeuristicLab.Persistence.GUI/3.3/app.config deleted file mode 100644 index c99d6b0229..0000000000 --- a/HeuristicLab.Persistence.GUI/3.3/app.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - -
- - - - - - - - - - - - - \ No newline at end of file diff --git a/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj b/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj index c59c811aa0..8ecedfff9a 100644 --- a/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj +++ b/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj @@ -170,10 +170,6 @@ {887425B4-4348-49ED-A457-B7D2C26DDBF9} HeuristicLab.Analysis-3.3 - - {730A9104-D4D1-4360-966B-E49B7571DDA3} - HeuristicLab.Clients.Common-3.3 - {489CFE09-FDF7-4C89-BAB5-BD09CADD61AD} HeuristicLab.CodeEditor-3.3 @@ -334,10 +330,6 @@ {56F9106A-079F-4C61-92F6-86A84C2D84B7} HeuristicLab.Parameters-3.3 - - {A9E282EA-180F-4233-B809-AEDF0787545C} - HeuristicLab.Persistence.GUI-3.3 - {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B} HeuristicLab.Persistence-3.3