Changeset 4466

Timestamp:

09/22/10 05:54:13 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB/HeuristicLab.Clients.OKB-3.3

Files:

• Administrator.cs (modified) (6 diffs)
• HeuristicLab.Clients.OKB-3.3.csproj (modified) (5 diffs)
• ServiceClients/AdminServiceClient.cs (added)
• ServiceClients/AuthenticationServiceClient.cs (added)
• ServiceClients/DataType.cs (added)
• ServiceClients/GenerateServiceClients.cmd (modified) (1 diff)
• ServiceClients/ServiceClients.cs (deleted)
• Views/AdministratorView.Designer.cs (modified) (7 diffs)
• Views/AdministratorView.cs (modified) (3 diffs)
• Views/AlgorithmView.Designer.cs (modified) (8 diffs)
• Views/AlgorithmView.cs (modified) (5 diffs)
• Views/DataTypeCollectionView.Designer.cs (added)
• Views/DataTypeCollectionView.cs (added)
• Views/DataTypeView.Designer.cs (added)
• Views/DataTypeView.cs (added)
• app.config (modified) (2 diffs)

branches/OKB/HeuristicLab.Clients.OKB-3.3/Administrator.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Clients.Common;
@@ -51 +52 @@
       get { return algorithms; }
     }
+    private ItemCollection<DataType> dataTypes;
+    public ItemCollection<DataType> DataTypes {
+      get { return dataTypes; }
+    }
+    private IEnumerable<User> users;
+    public IEnumerable<User> Users {
+      get { return users; }
+    }
 
     private Administrator() { }
@@ -71 +80 @@
       }
       algorithms.Clear();
+      if (dataTypes == null) {
+        dataTypes = new ItemCollection<DataType>();
+        dataTypes.ItemsRemoved += new CollectionItemsChangedEventHandler<DataType>(dataTypes_ItemsRemoved);
+      }
+      dataTypes.Clear();
 
       var call = new Func<Exception>(delegate() {
         try {
-          platforms.AddRange(CallAdminService<ItemCollection<Platform>>(s => s.GetPlatforms()).OrderBy(a => a.Name));
-          algorithmClasses.AddRange(CallAdminService<ItemCollection<AlgorithmClass>>(s => s.GetAlgorithmClasses()).OrderBy(a => a.Name));
-          algorithms.AddRange(CallAdminService<ItemCollection<Algorithm>>(s => s.GetAlgorithms()).OrderBy(a => a.Name));
+          platforms.AddRange(CallAdminService<Platform[]>(s => s.GetPlatforms()).OrderBy(x => x.Name));
+          algorithmClasses.AddRange(CallAdminService<AlgorithmClass[]>(s => s.GetAlgorithmClasses()).OrderBy(x => x.Name));
+          algorithms.AddRange(CallAdminService<Algorithm[]>(s => s.GetAlgorithms()).OrderBy(x => x.Name));
+          dataTypes.AddRange(CallAdminService<DataType[]>(s => s.GetDataTypes()).OrderBy(x => x.Name));
+          users = CallAuthenticationService<User[]>(s => s.GetUsers()).OrderBy(x => x.Name);
           return null;
         }
@@ -98 +114 @@
         else if (item is Algorithm)
           CallAdminService(s => s.StoreAlgorithm((Algorithm)item));
+        else if (item is DataType)
+          CallAdminService(s => s.StoreDataType((DataType)item));
         return true;
       }
       catch (Exception ex) {
         ErrorHandling.ShowErrorDialog("Store failed.", ex);
+        return false;
+      }
+    }
+
+    public Guid[] GetAlgorithmUsers(long algorithmId) {
+      try {
+        return CallAdminService<Guid[]>(s => s.GetAlgorithmUsers(algorithmId));
+      }
+      catch (Exception ex) {
+        ErrorHandling.ShowErrorDialog("Refresh authorized algorithm users failed.", ex);
+        return null;
+      }
+    }
+    public bool StoreAlgorithmUsers(long algorithmId, Guid[] users) {
+      try {
+        CallAdminService(s => s.StoreAlgorithmUsers(algorithmId, users));
+        return true;
+      }
+      catch (Exception ex) {
+        ErrorHandling.ShowErrorDialog("Store authorized algorithm users failed.", ex);
+        return false;
+      }
+    }
+
+    public bool StoreAlgorithmData(AlgorithmData algorithmData) {
+      try {
+        CallAdminService(s => s.StoreAlgorithmData(algorithmData));
+        return true;
+      }
+      catch (Exception ex) {
+        ErrorHandling.ShowErrorDialog("Store serialized algorithm failed.", ex);
         return false;
       }
@@ -144 +193 @@
       }
     }
+    private void dataTypes_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<DataType> e) {
+      try {
+        foreach (DataType d in e.Items)
+          CallAdminService(s => s.DeleteDataType(d.Id));
+      }
+      catch (Exception ex) {
+        ErrorHandling.ShowErrorDialog("Delete failed.", ex);
+      }
+    }
 
     #region Helpers
@@ -174 +232 @@
       }
     }
+    private T CallAuthenticationService<T>(Func<IAuthenticationService, T> call) where T : class {
+      AuthenticationServiceClient client = ClientFactory.CreateClient<AuthenticationServiceClient, IAuthenticationService>();
+      try {
+        return call(client);
+      }
+      finally {
+        try {
+          client.Close();
+        }
+        catch (Exception) {
+          client.Abort();
+        }
+      }
+    }
     #endregion
   }

branches/OKB/HeuristicLab.Clients.OKB-3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -77 +77 @@
     <Compile Include="HeuristicLabClientsOKBPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ServiceClients\AdminServiceClient.cs" />
     <Compile Include="ServiceClients\Algorithm.cs">
       <SubType>Code</SubType>
@@ -83 +84 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="ServiceClients\AuthenticationServiceClient.cs" />
+    <Compile Include="ServiceClients\DataType.cs" />
     <Compile Include="ServiceClients\NamedOKBItem.cs" />
     <Compile Include="ServiceClients\Platform.cs" />
@@ -94 +97 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ServiceClients\ServiceClients.cs" />
     <Compile Include="Views\AdministratorView.cs">
       <SubType>UserControl</SubType>
@@ -118 +120 @@
     <Compile Include="Views\AlgorithmView.Designer.cs">
       <DependentUpon>AlgorithmView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DataTypeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\DataTypeView.Designer.cs">
+      <DependentUpon>DataTypeView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DataTypeCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\DataTypeCollectionView.Designer.cs">
+      <DependentUpon>DataTypeCollectionView.cs</DependentUpon>
     </Compile>
     <Compile Include="Views\PlatformCollectionView.cs">
@@ -146 +160 @@
     <None Include="HeuristicLabClientsOKBPlugin.cs.frame" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\AdministratorView.resx">
+      <DependentUpon>AdministratorView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Views\AlgorithmView.resx">
+      <DependentUpon>AlgorithmView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/OKB/HeuristicLab.Clients.OKB-3.3/ServiceClients/GenerateServiceClients.cmd

@@ -1 +1 @@
 echo off
+
+echo.
+echo *******************************************************************************************
+echo Generating AdminService client
+echo.
+
 svcutil.exe ^
   http://localhost:8732/Design_Time_Addresses/OKB-3.3/AdminService/mex ^
-  /out:ServiceClients ^
+  /out:AdminServiceClient ^
   /namespace:*,HeuristicLab.Clients.OKB ^
   /targetClientVersion:Version35 ^
   /enableDataBinding ^
-  /reference:"C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll" ^
-  /collectionType:HeuristicLab.Core.ItemCollection`1 ^
   /config:..\app.config
 
 echo.
-echo --------------------------------------------------------------------------------------
-echo ATTENTION!!!
+echo ---------------------------------------------------------------------------------------
+echo !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!!
+echo.
 echo Following modifications have to be done manually in generated data contracts:
 echo  * Remove method "protected void RaisePropertyChanged(string propertyName)" in OKBItem
-echo --------------------------------------------------------------------------------------
+echo.
+echo !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!!
+echo ---------------------------------------------------------------------------------------
+echo.
+echo Generation of AdminService client finished.
+echo *******************************************************************************************
+echo.
+echo.
+echo *******************************************************************************************
+echo Generating AuthenticationService client
+echo.
+
+svcutil.exe ^
+  http://localhost:8732/Design_Time_Addresses/OKB-3.3/AuthenticationService/mex ^
+  /out:AuthenticationServiceClient ^
+  /namespace:*,HeuristicLab.Clients.OKB ^
+  /targetClientVersion:Version35 ^
+  /enableDataBinding ^
+  /config:..\app.config ^
+  /mergeConfig
+
+echo.
+echo Generation of AuthenticationService client finished.
+echo *******************************************************************************************
 echo.
 

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdministratorView));
       this.tabControl = new System.Windows.Forms.TabControl();
       this.platformsTabPage = new System.Windows.Forms.TabPage();
@@ -53 +54 @@
       this.algorithmsTabPage = new System.Windows.Forms.TabPage();
       this.algorithmCollectionView = new HeuristicLab.Clients.OKB.AlgorithmCollectionView();
+      this.dataTypesTabPage = new System.Windows.Forms.TabPage();
       this.refreshButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      this.dataTypeCollectionView = new HeuristicLab.Clients.OKB.DataTypeCollectionView();
       this.tabControl.SuspendLayout();
       this.platformsTabPage.SuspendLayout();
       this.algorithmClassesTabPage.SuspendLayout();
       this.algorithmsTabPage.SuspendLayout();
+      this.dataTypesTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -69 +73 @@
       this.tabControl.Controls.Add(this.algorithmClassesTabPage);
       this.tabControl.Controls.Add(this.algorithmsTabPage);
+      this.tabControl.Controls.Add(this.dataTypesTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 29);
       this.tabControl.Name = "tabControl";
@@ -147 +152 @@
       this.algorithmCollectionView.TabIndex = 0;
       // 
+      // dataTypesTabPage
+      // 
+      this.dataTypesTabPage.Controls.Add(this.dataTypeCollectionView);
+      this.dataTypesTabPage.Location = new System.Drawing.Point(4, 22);
+      this.dataTypesTabPage.Name = "dataTypesTabPage";
+      this.dataTypesTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.dataTypesTabPage.Size = new System.Drawing.Size(719, 380);
+      this.dataTypesTabPage.TabIndex = 3;
+      this.dataTypesTabPage.Text = "Data Types";
+      this.dataTypesTabPage.UseVisualStyleBackColor = true;
+      // 
       // refreshButton
       // 
-      this.refreshButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
+      this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
       this.refreshButton.Location = new System.Drawing.Point(0, 0);
       this.refreshButton.Name = "refreshButton";
@@ -157 +173 @@
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+      // 
+      // dataTypeCollectionView
+      // 
+      this.dataTypeCollectionView.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.dataTypeCollectionView.Caption = "DataTypeCollection View";
+      this.dataTypeCollectionView.Content = null;
+      this.dataTypeCollectionView.Location = new System.Drawing.Point(6, 6);
+      this.dataTypeCollectionView.Name = "dataTypeCollectionView";
+      this.dataTypeCollectionView.ReadOnly = false;
+      this.dataTypeCollectionView.Size = new System.Drawing.Size(707, 368);
+      this.dataTypeCollectionView.TabIndex = 0;
       // 
       // AdministratorView
@@ -170 +199 @@
       this.algorithmClassesTabPage.ResumeLayout(false);
       this.algorithmsTabPage.ResumeLayout(false);
+      this.dataTypesTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -185 +215 @@
     private System.Windows.Forms.TabPage platformsTabPage;
     private PlatformCollectionView platformCollectionView;
+    private System.Windows.Forms.TabPage dataTypesTabPage;
+    private DataTypeCollectionView dataTypeCollectionView;
 
   }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AdministratorView.cs

@@ -56 +56 @@
         algorithmClassCollectionView.Content = null;
         algorithmCollectionView.Content = null;
+        dataTypeCollectionView.Content = null;
       } else {
         platformCollectionView.Content = Content.Platforms;
         algorithmClassCollectionView.Content = Content.AlgorithmClasses;
         algorithmCollectionView.Content = Content.Algorithms;
+        dataTypeCollectionView.Content = Content.DataTypes;
       }
     }
@@ -69 +71 @@
       algorithmClassCollectionView.Enabled = Content != null;
       algorithmCollectionView.Enabled = Content != null;
+      dataTypeCollectionView.Enabled = Content != null;
     }
 
@@ -87 +90 @@
         algorithmClassCollectionView.Content = Content.AlgorithmClasses;
         algorithmCollectionView.Content = Content.Algorithms;
+        dataTypeCollectionView.Content = Content.DataTypes;
         refreshButton.Enabled = true;
         tabControl.Enabled = true;

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.Designer.cs

@@ -49 +49 @@
       this.algorithmClassLabel = new System.Windows.Forms.Label();
       this.algorithmClassComboBox = new System.Windows.Forms.ComboBox();
+      this.usersListBox = new System.Windows.Forms.ListBox();
+      this.tabControl = new System.Windows.Forms.TabControl();
+      this.usersTabPage = new System.Windows.Forms.TabPage();
+      this.storeUsersButton = new System.Windows.Forms.Button();
+      this.refreshUsersButton = new System.Windows.Forms.Button();
+      this.dataTabPage = new System.Windows.Forms.TabPage();
+      this.fileLabel = new System.Windows.Forms.Label();
+      this.storeDataButton = new System.Windows.Forms.Button();
+      this.fileTextBox = new System.Windows.Forms.TextBox();
+      this.openFileButton = new System.Windows.Forms.Button();
+      this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+      this.dataTypeLabel = new System.Windows.Forms.Label();
+      this.dataTypeComboBox = new System.Windows.Forms.ComboBox();
       ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).BeginInit();
+      this.tabControl.SuspendLayout();
+      this.usersTabPage.SuspendLayout();
+      this.dataTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -55 +71 @@
       // 
       this.nameTextBox.Location = new System.Drawing.Point(90, 29);
-      this.nameTextBox.Size = new System.Drawing.Size(197, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(495, 20);
       // 
       // descriptionTextBox
       // 
       this.descriptionTextBox.Location = new System.Drawing.Point(90, 55);
-      this.descriptionTextBox.Size = new System.Drawing.Size(197, 20);
+      this.descriptionTextBox.Size = new System.Drawing.Size(495, 20);
       // 
       // storeButton
@@ -68 +84 @@
       // modifiedPictureBox
       // 
-      this.modifiedPictureBox.Location = new System.Drawing.Point(293, 3);
-      this.modifiedPictureBox.Size = new System.Drawing.Size(39, 130);
+      this.modifiedPictureBox.Location = new System.Drawing.Point(591, 3);
       // 
       // platformLabel
@@ -88 +103 @@
       this.platformComboBox.Location = new System.Drawing.Point(90, 81);
       this.platformComboBox.Name = "platformComboBox";
-      this.platformComboBox.Size = new System.Drawing.Size(197, 21);
+      this.platformComboBox.Size = new System.Drawing.Size(495, 21);
       this.platformComboBox.TabIndex = 6;
       this.platformComboBox.SelectedValueChanged += new System.EventHandler(this.platformComboBox_SelectedValueChanged);
@@ -109 +124 @@
       this.algorithmClassComboBox.Location = new System.Drawing.Point(90, 108);
       this.algorithmClassComboBox.Name = "algorithmClassComboBox";
-      this.algorithmClassComboBox.Size = new System.Drawing.Size(197, 21);
+      this.algorithmClassComboBox.Size = new System.Drawing.Size(495, 21);
       this.algorithmClassComboBox.TabIndex = 8;
       this.algorithmClassComboBox.SelectedValueChanged += new System.EventHandler(this.algorithmClassComboBox_SelectedValueChanged);
       // 
+      // usersListBox
+      // 
+      this.usersListBox.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.usersListBox.Enabled = false;
+      this.usersListBox.FormattingEnabled = true;
+      this.usersListBox.Location = new System.Drawing.Point(6, 35);
+      this.usersListBox.Name = "usersListBox";
+      this.usersListBox.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
+      this.usersListBox.Size = new System.Drawing.Size(613, 225);
+      this.usersListBox.TabIndex = 2;
+      this.usersListBox.SelectedIndexChanged += new System.EventHandler(this.usersListBox_SelectedIndexChanged);
+      // 
+      // tabControl
+      // 
+      this.tabControl.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.tabControl.Controls.Add(this.usersTabPage);
+      this.tabControl.Controls.Add(this.dataTabPage);
+      this.tabControl.Location = new System.Drawing.Point(0, 162);
+      this.tabControl.Name = "tabControl";
+      this.tabControl.SelectedIndex = 0;
+      this.tabControl.Size = new System.Drawing.Size(633, 292);
+      this.tabControl.TabIndex = 9;
+      // 
+      // usersTabPage
+      // 
+      this.usersTabPage.Controls.Add(this.storeUsersButton);
+      this.usersTabPage.Controls.Add(this.refreshUsersButton);
+      this.usersTabPage.Controls.Add(this.usersListBox);
+      this.usersTabPage.Location = new System.Drawing.Point(4, 22);
+      this.usersTabPage.Name = "usersTabPage";
+      this.usersTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.usersTabPage.Size = new System.Drawing.Size(625, 266);
+      this.usersTabPage.TabIndex = 0;
+      this.usersTabPage.Text = "Authorized Users";
+      this.usersTabPage.UseVisualStyleBackColor = true;
+      // 
+      // storeUsersButton
+      // 
+      this.storeUsersButton.Location = new System.Drawing.Point(86, 6);
+      this.storeUsersButton.Name = "storeUsersButton";
+      this.storeUsersButton.Size = new System.Drawing.Size(75, 23);
+      this.storeUsersButton.TabIndex = 1;
+      this.storeUsersButton.Text = "&Store";
+      this.toolTip.SetToolTip(this.storeUsersButton, "Store Authorized Users");
+      this.storeUsersButton.UseVisualStyleBackColor = true;
+      this.storeUsersButton.Click += new System.EventHandler(this.storeUsersButton_Click);
+      // 
+      // refreshUsersButton
+      // 
+      this.refreshUsersButton.Location = new System.Drawing.Point(6, 6);
+      this.refreshUsersButton.Name = "refreshUsersButton";
+      this.refreshUsersButton.Size = new System.Drawing.Size(75, 23);
+      this.refreshUsersButton.TabIndex = 0;
+      this.refreshUsersButton.Text = "&Refresh";
+      this.toolTip.SetToolTip(this.refreshUsersButton, "Refresh Authorized Users");
+      this.refreshUsersButton.UseVisualStyleBackColor = true;
+      this.refreshUsersButton.Click += new System.EventHandler(this.refreshUsersButton_Click);
+      // 
+      // dataTabPage
+      // 
+      this.dataTabPage.Controls.Add(this.dataTypeComboBox);
+      this.dataTabPage.Controls.Add(this.openFileButton);
+      this.dataTabPage.Controls.Add(this.fileTextBox);
+      this.dataTabPage.Controls.Add(this.storeDataButton);
+      this.dataTabPage.Controls.Add(this.dataTypeLabel);
+      this.dataTabPage.Controls.Add(this.fileLabel);
+      this.dataTabPage.Location = new System.Drawing.Point(4, 22);
+      this.dataTabPage.Name = "dataTabPage";
+      this.dataTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.dataTabPage.Size = new System.Drawing.Size(625, 266);
+      this.dataTabPage.TabIndex = 1;
+      this.dataTabPage.Text = "Serialized Algorithm";
+      this.dataTabPage.UseVisualStyleBackColor = true;
+      // 
+      // fileLabel
+      // 
+      this.fileLabel.AutoSize = true;
+      this.fileLabel.Location = new System.Drawing.Point(6, 38);
+      this.fileLabel.Name = "fileLabel";
+      this.fileLabel.Size = new System.Drawing.Size(26, 13);
+      this.fileLabel.TabIndex = 1;
+      this.fileLabel.Text = "&File:";
+      // 
+      // storeDataButton
+      // 
+      this.storeDataButton.Enabled = false;
+      this.storeDataButton.Location = new System.Drawing.Point(6, 6);
+      this.storeDataButton.Name = "storeDataButton";
+      this.storeDataButton.Size = new System.Drawing.Size(75, 23);
+      this.storeDataButton.TabIndex = 0;
+      this.storeDataButton.Text = "&Store";
+      this.toolTip.SetToolTip(this.storeDataButton, "Store Serialized Algorithm");
+      this.storeDataButton.UseVisualStyleBackColor = true;
+      this.storeDataButton.Click += new System.EventHandler(this.storeDataButton_Click);
+      // 
+      // fileTextBox
+      // 
+      this.fileTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.fileTextBox.Location = new System.Drawing.Point(69, 35);
+      this.fileTextBox.Name = "fileTextBox";
+      this.fileTextBox.ReadOnly = true;
+      this.fileTextBox.Size = new System.Drawing.Size(520, 20);
+      this.fileTextBox.TabIndex = 2;
+      // 
+      // openFileButton
+      // 
+      this.openFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.openFileButton.Location = new System.Drawing.Point(595, 32);
+      this.openFileButton.Name = "openFileButton";
+      this.openFileButton.Size = new System.Drawing.Size(24, 24);
+      this.openFileButton.TabIndex = 3;
+      this.openFileButton.Text = "...";
+      this.openFileButton.UseVisualStyleBackColor = true;
+      this.openFileButton.Click += new System.EventHandler(this.openFileButton_Click);
+      // 
+      // openFileDialog
+      // 
+      this.openFileDialog.FileName = "algorithm";
+      this.openFileDialog.Filter = "All Files (*.*)|*.*";
+      this.openFileDialog.Title = "Select Algorithm File";
+      // 
+      // dataTypeLabel
+      // 
+      this.dataTypeLabel.AutoSize = true;
+      this.dataTypeLabel.Location = new System.Drawing.Point(6, 64);
+      this.dataTypeLabel.Name = "dataTypeLabel";
+      this.dataTypeLabel.Size = new System.Drawing.Size(57, 13);
+      this.dataTypeLabel.TabIndex = 4;
+      this.dataTypeLabel.Text = "&DataType:";
+      // 
+      // dataTypeComboBox
+      // 
+      this.dataTypeComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.dataTypeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.dataTypeComboBox.FormattingEnabled = true;
+      this.dataTypeComboBox.Location = new System.Drawing.Point(69, 61);
+      this.dataTypeComboBox.Name = "dataTypeComboBox";
+      this.dataTypeComboBox.Size = new System.Drawing.Size(550, 21);
+      this.dataTypeComboBox.TabIndex = 5;
+      this.dataTypeComboBox.SelectedIndexChanged += new System.EventHandler(this.dataTypeComboBox_SelectedIndexChanged);
+      // 
       // AlgorithmView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.tabControl);
       this.Controls.Add(this.platformComboBox);
       this.Controls.Add(this.platformLabel);
@@ -121 +284 @@
       this.Controls.Add(this.algorithmClassLabel);
       this.Name = "AlgorithmView";
-      this.Size = new System.Drawing.Size(335, 275);
-      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
+      this.Size = new System.Drawing.Size(633, 454);
       this.Controls.SetChildIndex(this.algorithmClassLabel, 0);
       this.Controls.SetChildIndex(this.algorithmClassComboBox, 0);
       this.Controls.SetChildIndex(this.platformLabel, 0);
       this.Controls.SetChildIndex(this.platformComboBox, 0);
+      this.Controls.SetChildIndex(this.tabControl, 0);
+      this.Controls.SetChildIndex(this.modifiedPictureBox, 0);
       this.Controls.SetChildIndex(this.storeButton, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
@@ -133 +297 @@
       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
       ((System.ComponentModel.ISupportInitialize)(this.modifiedPictureBox)).EndInit();
+      this.tabControl.ResumeLayout(false);
+      this.usersTabPage.ResumeLayout(false);
+      this.dataTabPage.ResumeLayout(false);
+      this.dataTabPage.PerformLayout();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -144 +312 @@
     private System.Windows.Forms.Label algorithmClassLabel;
     private System.Windows.Forms.ComboBox algorithmClassComboBox;
+    private System.Windows.Forms.ListBox usersListBox;
+    private System.Windows.Forms.TabControl tabControl;
+    private System.Windows.Forms.TabPage usersTabPage;
+    private System.Windows.Forms.Button storeUsersButton;
+    private System.Windows.Forms.Button refreshUsersButton;
+    private System.Windows.Forms.TabPage dataTabPage;
+    private System.Windows.Forms.ComboBox dataTypeComboBox;
+    private System.Windows.Forms.Button openFileButton;
+    private System.Windows.Forms.TextBox fileTextBox;
+    private System.Windows.Forms.Button storeDataButton;
+    private System.Windows.Forms.Label dataTypeLabel;
+    private System.Windows.Forms.Label fileLabel;
+    private System.Windows.Forms.OpenFileDialog openFileDialog;
 
   }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using System.IO;
 
 namespace HeuristicLab.Clients.OKB {
@@ -42 +45 @@
       platformComboBox.DataSource = Administrator.Instance.Platforms.ToList();
       algorithmClassComboBox.DataSource = Administrator.Instance.AlgorithmClasses.ToList();
+      dataTypeComboBox.DataSource = Administrator.Instance.DataTypes.ToList();
     }
 
@@ -62 +66 @@
         algorithmClassComboBox.SelectedItem = Administrator.Instance.AlgorithmClasses.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
       }
+      usersListBox.DataSource = null;
+      fileTextBox.Text = "";
+      dataTypeComboBox.SelectedIndex = -1;
     }
 
@@ -68 +75 @@
       platformComboBox.Enabled = Content != null;
       algorithmClassComboBox.Enabled = Content != null;
+      refreshUsersButton.Enabled = Content != null;
+      storeUsersButton.Enabled = usersListBox.DataSource != null;
+      usersListBox.Enabled = usersListBox.DataSource != null;
+      storeDataButton.Enabled = !string.IsNullOrEmpty(fileTextBox.Text) && dataTypeComboBox.SelectedIndex != -1;
     }
 
@@ -93 +104 @@
       }
     }
+
+    private void refreshUsersButton_Click(object sender, System.EventArgs e) {
+      Guid[] ids = Administrator.Instance.GetAlgorithmUsers(Content.Id);
+      if (ids != null) {
+        List<User> users = Administrator.Instance.Users.ToList();
+        usersListBox.DataSource = users;
+        usersListBox.DisplayMember = "Name";
+        usersListBox.SelectedItems.Clear();
+        foreach (Guid id in ids)
+          usersListBox.SelectedItems.Add(users.First(u => u.Id == id));
+        usersListBox.Enabled = true;
+        storeUsersButton.Enabled = false;
+      }
+    }
+    private void storeUsersButton_Click(object sender, System.EventArgs e) {
+      if (Administrator.Instance.StoreAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToArray()))
+        storeUsersButton.Enabled = false;
+    }
+    private void usersListBox_SelectedIndexChanged(object sender, EventArgs e) {
+      storeUsersButton.Enabled = true;
+    }
+
+    private void storeDataButton_Click(object sender, EventArgs e) {
+      AlgorithmData data = new AlgorithmData();
+      data.AlgorithmId = Content.Id;
+      data.DataTypeId = ((DataType)dataTypeComboBox.SelectedItem).Id;
+
+      using (FileStream stream = new FileStream(fileTextBox.Text, FileMode.Open, FileAccess.Read)) {
+        byte[] bytes = new byte[stream.Length];
+        stream.Read(bytes, 0, bytes.Length);
+        stream.Close();
+        data.Data = bytes;
+      }
+
+      if (Administrator.Instance.StoreAlgorithmData(data))
+        storeDataButton.Enabled = false;
+    }
+    private void openFileButton_Click(object sender, EventArgs e) {
+      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
+        fileTextBox.Text = openFileDialog.FileName;
+        storeDataButton.Enabled = true;
+      }
+    }
+    private void dataTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      storeDataButton.Enabled = !string.IsNullOrEmpty(fileTextBox.Text);
+    }
   }
 }

branches/OKB/HeuristicLab.Clients.OKB-3.3/app.config

@@ -5 +5 @@
             <wsHttpBinding>
                 <binding name="WSHttpBinding_IAdminService" closeTimeout="00:01:00"
+                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
+                    bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
+                    maxBufferPoolSize="524288" maxReceivedMessageSize="200000000"
+                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
+                    allowCookies="false">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="200000000"
+                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                    <reliableSession ordered="true" inactivityTimeout="00:10:00"
+                        enabled="false" />
+                    <security mode="Message">
+                        <transport clientCredentialType="Windows" proxyCredentialType="None"
+                            realm="" />
+                        <message clientCredentialType="UserName" negotiateServiceCredential="true"
+                            algorithmSuite="Default" />
+                    </security>
+                </binding>
+                <binding name="WSHttpBinding_IAuthenticationService" closeTimeout="00:01:00"
                     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
                     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
@@ -31 +48 @@
                 </identity>
             </endpoint>
+            <endpoint address="http://localhost:8732/Design_Time_Addresses/OKB-3.3/AuthenticationService"
+                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAuthenticationService"
+                contract="HeuristicLab.Clients.OKB.IAuthenticationService"
+                name="WSHttpBinding_IAuthenticationService">
+                <identity>
+                    <certificate encodedValue="AwAAAAEAAAAUAAAAD/AlkYJw/OUhl6D/9w8mjJBh39kgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMDIyMzIwOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPkfCSLRX8/4F+Z4ys43yZ4MMzjB44cMakPz4Nri+mEB5n2z/0GFatCYzkI2f/nniWqVrBYjHkjsZy2EZioHu4wa99c1XEGJnFNDuNn6ESkfEyhyF4+OqKGnpK9HNrw7OWMuqn2oOh0iFd9fl6FTAm+Y0p3LP+38BuYzpCniqqdwIDAQABo0kwRzBFBgNVHQEEPjA8gBDvi8Rgio9v+mr58TiAvqF5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQADgYEANdGlvHKeUptfNu9I0wgA5qjmVB+JDldOAkrfM0R+4IcVQ06y5K7P07uxQAV7+rhnDLgLyFJunUHgzbfjsjFy7vjwtoieXA5j0AYlm4AHR7dHt4HVgkIMYt8XOCqMw5jjFX91xJ89tC7mM9zYR48N9T5QSeMGo+f+JzybeLWxnNs=" />
+                </identity>
+            </endpoint>
         </client>
     </system.serviceModel>