Changeset 5533 for branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views

Timestamp:

02/22/11 00:22:52 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views

Files:

• . (added)
• AdministratorView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/AdministratorView.Designer.cs) (5 diffs)
• AdministratorView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/AdministratorView.cs) (5 diffs)
• AlgorithmClassCollectionView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/AlgorithmClassCollectionView.Designer.cs) (1 diff)
• AlgorithmClassCollectionView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/AlgorithmClassCollectionView.cs) (1 diff)
• AlgorithmCollectionView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/AlgorithmCollectionView.Designer.cs) (1 diff)
• AlgorithmCollectionView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/AlgorithmCollectionView.cs) (1 diff)
• AlgorithmView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/AlgorithmView.Designer.cs) (8 diffs)
• AlgorithmView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/AlgorithmView.cs) (7 diffs)
• NamedOKBItemView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/NamedOKBItemView.Designer.cs) (1 diff)
• NamedOKBItemView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/NamedOKBItemView.cs) (1 diff)
• OKBItemView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/OKBItemView.Designer.cs) (1 diff)
• OKBItemView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/OKBItemView.cs) (1 diff)
• PlatformCollectionView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/PlatformCollectionView.Designer.cs) (1 diff)
• PlatformCollectionView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/PlatformCollectionView.cs) (1 diff)
• ProblemClassCollectionView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/ProblemClassCollectionView.Designer.cs) (1 diff)
• ProblemClassCollectionView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/ProblemClassCollectionView.cs) (1 diff)
• ProblemCollectionView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/ProblemCollectionView.Designer.cs) (1 diff)
• ProblemCollectionView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/ProblemCollectionView.cs) (1 diff)
• ProblemView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/ProblemView.Designer.cs) (5 diffs)
• ProblemView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Views/ProblemView.cs) (6 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AdministratorView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class AdministratorView {
     /// <summary> 
@@ -48 +48 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.platformsTabPage = new System.Windows.Forms.TabPage();
-      this.platformCollectionView = new HeuristicLab.Clients.OKB.PlatformCollectionView();
+      this.platformCollectionView = new HeuristicLab.Clients.OKB.Administration.PlatformCollectionView();
       this.dataTypesTabPage = new System.Windows.Forms.TabPage();
-      this.dataTypeCollectionView = new HeuristicLab.Clients.OKB.DataTypeCollectionView();
       this.algorithmClassesTabPage = new System.Windows.Forms.TabPage();
-      this.algorithmClassCollectionView = new HeuristicLab.Clients.OKB.AlgorithmClassCollectionView();
+      this.algorithmClassCollectionView = new HeuristicLab.Clients.OKB.Administration.AlgorithmClassCollectionView();
       this.algorithmsTabPage = new System.Windows.Forms.TabPage();
-      this.algorithmCollectionView = new HeuristicLab.Clients.OKB.AlgorithmCollectionView();
+      this.algorithmCollectionView = new HeuristicLab.Clients.OKB.Administration.AlgorithmCollectionView();
       this.problemClassesTabPage = new System.Windows.Forms.TabPage();
       this.problemsTabPage = new System.Windows.Forms.TabPage();
       this.refreshButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.problemClassCollectionView = new HeuristicLab.Clients.OKB.ProblemClassCollectionView();
-      this.problemCollectionView = new HeuristicLab.Clients.OKB.ProblemCollectionView();
+      this.problemClassCollectionView = new HeuristicLab.Clients.OKB.Administration.ProblemClassCollectionView();
+      this.problemCollectionView = new HeuristicLab.Clients.OKB.Administration.ProblemCollectionView();
       this.tabControl.SuspendLayout();
       this.platformsTabPage.SuspendLayout();
@@ -113 +112 @@
       // dataTypesTabPage
       // 
-      this.dataTypesTabPage.Controls.Add(this.dataTypeCollectionView);
       this.dataTypesTabPage.Location = new System.Drawing.Point(4, 22);
       this.dataTypesTabPage.Name = "dataTypesTabPage";
@@ -121 +119 @@
       this.dataTypesTabPage.Text = "Data Types";
       this.dataTypesTabPage.UseVisualStyleBackColor = true;
-      // 
-      // 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(3, 3);
-      this.dataTypeCollectionView.Name = "dataTypeCollectionView";
-      this.dataTypeCollectionView.ReadOnly = false;
-      this.dataTypeCollectionView.Size = new System.Drawing.Size(713, 374);
-      this.dataTypeCollectionView.TabIndex = 0;
       // 
       // algorithmClassesTabPage
@@ -271 +256 @@
     private PlatformCollectionView platformCollectionView;
     private System.Windows.Forms.TabPage dataTypesTabPage;
-    private DataTypeCollectionView dataTypeCollectionView;
     private System.Windows.Forms.TabPage problemClassesTabPage;
     private System.Windows.Forms.TabPage problemsTabPage;

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AdministratorView.cs

@@ -25 +25 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("OKB Administrator")]
-  [Content(typeof(OKBClient), true)]
+  [Content(typeof(AdministrationClient), true)]
   public sealed partial class AdministratorView : AsynchronousContentView {
-    public new OKBClient Content {
-      get { return (OKBClient)base.Content; }
+    public new AdministrationClient Content {
+      get { return (AdministrationClient)base.Content; }
       set { base.Content = value; }
     }
@@ -54 +54 @@
       if (Content == null) {
         platformCollectionView.Content = null;
-        dataTypeCollectionView.Content = null;
         algorithmClassCollectionView.Content = null;
         algorithmCollectionView.Content = null;
@@ -61 +60 @@
       } else {
         platformCollectionView.Content = Content.Platforms;
-        dataTypeCollectionView.Content = Content.DataTypes;
         algorithmClassCollectionView.Content = Content.AlgorithmClasses;
         algorithmCollectionView.Content = Content.Algorithms;
@@ -73 +71 @@
       refreshButton.Enabled = Content != null;
       platformCollectionView.Enabled = Content != null;
-      dataTypeCollectionView.Enabled = Content != null;
       algorithmClassCollectionView.Enabled = Content != null;
       algorithmCollectionView.Enabled = Content != null;
@@ -94 +91 @@
       } else {
         platformCollectionView.Content = Content.Platforms;
-        dataTypeCollectionView.Content = Content.DataTypes;
         algorithmClassCollectionView.Content = Content.AlgorithmClasses;
         algorithmCollectionView.Content = Content.Algorithms;

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmClassCollectionView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class AlgorithmClassCollectionView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmClassCollectionView.cs

@@ -25 +25 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("AlgorithmClassCollection View")]
   [Content(typeof(IItemCollection<AlgorithmClass>), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmCollectionView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class AlgorithmCollectionView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmCollectionView.cs

@@ -25 +25 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("AlgorithmCollection View")]
   [Content(typeof(IItemCollection<Algorithm>), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class AlgorithmView {
     /// <summary> 
@@ -55 +55 @@
       this.refreshUsersButton = new System.Windows.Forms.Button();
       this.dataTabPage = new System.Windows.Forms.TabPage();
-      this.algorithmDataView = new HeuristicLab.Clients.OKB.AlgorithmDataView();
       this.parametersTabPage = new System.Windows.Forms.TabPage();
-      this.algorithmParameterCollectionView = new HeuristicLab.Clients.OKB.AlgorithmParameterCollectionView();
       this.refreshParametersButton = new System.Windows.Forms.Button();
       this.resultsTabPage = new System.Windows.Forms.TabPage();
-      this.resultCollectionView = new HeuristicLab.Clients.OKB.ResultCollectionView();
       this.refreshResultsButton = new System.Windows.Forms.Button();
       this.experimentsTabPage = new System.Windows.Forms.TabPage();
       this.refreshExperimentsButton = new System.Windows.Forms.Button();
-      this.experimentCollectionView = new HeuristicLab.Clients.OKB.ExperimentCollectionView();
       this.tabControl.SuspendLayout();
       this.usersTabPage.SuspendLayout();
@@ -196 +192 @@
       // dataTabPage
       // 
-      this.dataTabPage.Controls.Add(this.algorithmDataView);
       this.dataTabPage.Location = new System.Drawing.Point(4, 22);
       this.dataTabPage.Name = "dataTabPage";
@@ -205 +200 @@
       this.dataTabPage.UseVisualStyleBackColor = true;
       // 
-      // algorithmDataView
-      // 
-      this.algorithmDataView.AlgorithmId = ((long)(0));
-      this.algorithmDataView.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.algorithmDataView.Caption = "AlgorithmData View";
-      this.algorithmDataView.Content = null;
-      this.algorithmDataView.Location = new System.Drawing.Point(6, 6);
-      this.algorithmDataView.Name = "algorithmDataView";
-      this.algorithmDataView.ReadOnly = false;
-      this.algorithmDataView.Size = new System.Drawing.Size(613, 254);
-      this.algorithmDataView.TabIndex = 0;
-      // 
-      // parametersTabPage
-      // 
-      this.parametersTabPage.Controls.Add(this.algorithmParameterCollectionView);
-      this.parametersTabPage.Controls.Add(this.refreshParametersButton);
-      this.parametersTabPage.Location = new System.Drawing.Point(4, 22);
-      this.parametersTabPage.Name = "parametersTabPage";
-      this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.parametersTabPage.Size = new System.Drawing.Size(625, 266);
-      this.parametersTabPage.TabIndex = 2;
-      this.parametersTabPage.Text = "Parameters";
-      this.parametersTabPage.UseVisualStyleBackColor = true;
-      // 
-      // algorithmParameterCollectionView
-      // 
-      this.algorithmParameterCollectionView.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.algorithmParameterCollectionView.Caption = "AlgorithmParameterCollection View";
-      this.algorithmParameterCollectionView.Content = null;
-      this.algorithmParameterCollectionView.Location = new System.Drawing.Point(6, 36);
-      this.algorithmParameterCollectionView.Name = "algorithmParameterCollectionView";
-      this.algorithmParameterCollectionView.ReadOnly = false;
-      this.algorithmParameterCollectionView.Size = new System.Drawing.Size(613, 224);
-      this.algorithmParameterCollectionView.TabIndex = 1;
-      // 
       // refreshParametersButton
       // 
@@ -252 +208 @@
       this.refreshParametersButton.TabIndex = 0;
       this.refreshParametersButton.UseVisualStyleBackColor = true;
-      this.refreshParametersButton.Click += new System.EventHandler(this.refreshParametersButton_Click);
-      // 
-      // resultsTabPage
-      // 
-      this.resultsTabPage.Controls.Add(this.resultCollectionView);
-      this.resultsTabPage.Controls.Add(this.refreshResultsButton);
-      this.resultsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.resultsTabPage.Name = "resultsTabPage";
-      this.resultsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.resultsTabPage.Size = new System.Drawing.Size(625, 266);
-      this.resultsTabPage.TabIndex = 3;
-      this.resultsTabPage.Text = "Results";
-      this.resultsTabPage.UseVisualStyleBackColor = true;
-      // 
-      // resultCollectionView
-      // 
-      this.resultCollectionView.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.resultCollectionView.Caption = "ResultCollection View";
-      this.resultCollectionView.Content = null;
-      this.resultCollectionView.Location = new System.Drawing.Point(6, 36);
-      this.resultCollectionView.Name = "resultCollectionView";
-      this.resultCollectionView.ReadOnly = false;
-      this.resultCollectionView.Size = new System.Drawing.Size(613, 224);
-      this.resultCollectionView.TabIndex = 1;
       // 
       // refreshResultsButton
@@ -287 +217 @@
       this.refreshResultsButton.TabIndex = 0;
       this.refreshResultsButton.UseVisualStyleBackColor = true;
-      this.refreshResultsButton.Click += new System.EventHandler(this.refreshResultsButton_Click);
-      // 
-      // experimentsTabPage
-      // 
-      this.experimentsTabPage.Controls.Add(this.experimentCollectionView);
-      this.experimentsTabPage.Controls.Add(this.refreshExperimentsButton);
-      this.experimentsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.experimentsTabPage.Name = "experimentsTabPage";
-      this.experimentsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.experimentsTabPage.Size = new System.Drawing.Size(625, 266);
-      this.experimentsTabPage.TabIndex = 4;
-      this.experimentsTabPage.Text = "Experiments";
-      this.experimentsTabPage.UseVisualStyleBackColor = true;
       // 
       // refreshExperimentsButton
@@ -309 +226 @@
       this.refreshExperimentsButton.TabIndex = 0;
       this.refreshExperimentsButton.UseVisualStyleBackColor = true;
-      this.refreshExperimentsButton.Click += new System.EventHandler(this.refreshExperimentsButton_Click);
-      // 
-      // experimentCollectionView
-      // 
-      this.experimentCollectionView.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.experimentCollectionView.Caption = "ExperimentCollection View";
-      this.experimentCollectionView.Content = null;
-      this.experimentCollectionView.Location = new System.Drawing.Point(6, 36);
-      this.experimentCollectionView.Name = "experimentCollectionView";
-      this.experimentCollectionView.ReadOnly = false;
-      this.experimentCollectionView.Size = new System.Drawing.Size(613, 224);
-      this.experimentCollectionView.TabIndex = 1;
       // 
       // AlgorithmView
@@ -367 +270 @@
     private System.Windows.Forms.Button refreshUsersButton;
     private System.Windows.Forms.TabPage dataTabPage;
-    private AlgorithmDataView algorithmDataView;
     private System.Windows.Forms.TabPage parametersTabPage;
     private System.Windows.Forms.TabPage resultsTabPage;
-    private AlgorithmParameterCollectionView algorithmParameterCollectionView;
     private System.Windows.Forms.Button refreshParametersButton;
     private System.Windows.Forms.Button refreshResultsButton;
     private System.Windows.Forms.TabPage experimentsTabPage;
-    private ResultCollectionView resultCollectionView;
-    private ExperimentCollectionView experimentCollectionView;
     private System.Windows.Forms.Button refreshExperimentsButton;
 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmView.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Clients.OKB.Authentication;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("Algorithm View")]
   [Content(typeof(Algorithm), true)]
@@ -45 +46 @@
     protected override void OnInitialized(System.EventArgs e) {
       base.OnInitialized(e);
-      platformComboBoxValues = OKBClient.Instance.Platforms.ToList();
+      platformComboBoxValues = AdministrationClient.Instance.Platforms.ToList();
       platformComboBox.DataSource = platformComboBoxValues;
-      algorithmClassComboBoxValues = OKBClient.Instance.AlgorithmClasses.ToList();
+      algorithmClassComboBoxValues = AdministrationClient.Instance.AlgorithmClasses.ToList();
       algorithmClassComboBox.DataSource = algorithmClassComboBoxValues;
     }
@@ -56 +57 @@
         platformComboBox.SelectedIndex = -1;
         algorithmClassComboBox.SelectedIndex = -1;
-        algorithmDataView.AlgorithmId = 0;
       } else {
         platformComboBox.SelectedItem = platformComboBoxValues.FirstOrDefault(p => p.Id == Content.PlatformId);
         algorithmClassComboBox.SelectedItem = algorithmClassComboBoxValues.FirstOrDefault(a => a.Id == Content.AlgorithmClassId);
-        algorithmDataView.AlgorithmId = Content.Id;
       }
       usersListBox.DataSource = null;
-      algorithmDataView.Content = null;
     }
 
@@ -73 +71 @@
       storeUsersButton.Enabled = (usersListBox.DataSource != null) && !ReadOnly;
       usersListBox.Enabled = (usersListBox.DataSource != null) && !ReadOnly;
-      algorithmDataView.Enabled = Content != null;
     }
 
     protected override void OnContentPropertyChanged(string propertyName) {
       switch (propertyName) {
-        case "Id":
-          algorithmDataView.AlgorithmId = Content.Id;
-          break;
         case "PlatformId":
           platformComboBox.SelectedItem = platformComboBoxValues.FirstOrDefault(p => p.Id == Content.PlatformId);
@@ -104 +98 @@
 
     private void refreshUsersButton_Click(object sender, System.EventArgs e) {
-      List<Guid> ids = OKBClient.Instance.GetAlgorithmUsers(Content.Id);
+      List<Guid> ids = AdministrationClient.Instance.GetAlgorithmUsers(Content.Id);
       if (ids != null) {
-        List<User> users = OKBClient.Instance.Users.ToList();
+        List<User> users = AuthenticationClient.Instance.Users.ToList();
         usersListBox.DataSource = users;
         usersListBox.DisplayMember = "Name";
@@ -117 +111 @@
     }
     private void storeUsersButton_Click(object sender, System.EventArgs e) {
-      if (OKBClient.Instance.UpdateAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToList()))
+      if (AdministrationClient.Instance.UpdateAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToList()))
         storeUsersButton.Enabled = false;
     }
@@ -123 +117 @@
       storeUsersButton.Enabled = !ReadOnly;
     }
-
-    private void refreshParametersButton_Click(object sender, EventArgs e) {
-      algorithmParameterCollectionView.Content = OKBClient.Instance.GetAlgorithmParameters(Content.Id);
-    }
-
-    private void refreshResultsButton_Click(object sender, EventArgs e) {
-      resultCollectionView.Content = OKBClient.Instance.GetResults(Content.Id);
-    }
-
-    private void refreshExperimentsButton_Click(object sender, EventArgs e) {
-      experimentCollectionView.Content = OKBClient.Instance.GetExperiments(Content.Id, 0);
-    }
   }
 }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/NamedOKBItemView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class NamedOKBItemView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/NamedOKBItemView.cs

@@ -26 +26 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("NamedOKBItem View")]
   [Content(typeof(NamedOKBItem), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/OKBItemView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class OKBItemView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/OKBItemView.cs

@@ -27 +27 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("OKBItem View")]
   [Content(typeof(OKBItem), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/PlatformCollectionView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class PlatformCollectionView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/PlatformCollectionView.cs

@@ -25 +25 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("PlatformCollection View")]
   [Content(typeof(IItemCollection<Platform>), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/ProblemClassCollectionView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class ProblemClassCollectionView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/ProblemClassCollectionView.cs

@@ -25 +25 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("ProblemClassCollection View")]
   [Content(typeof(IItemCollection<ProblemClass>), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/ProblemCollectionView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class ProblemCollectionView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/ProblemCollectionView.cs

@@ -25 +25 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("ProblemCollection View")]
   [Content(typeof(IItemCollection<Problem>), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/ProblemView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   partial class ProblemView {
     /// <summary> 
@@ -55 +55 @@
       this.refreshUsersButton = new System.Windows.Forms.Button();
       this.dataTabPage = new System.Windows.Forms.TabPage();
-      this.problemDataView = new HeuristicLab.Clients.OKB.ProblemDataView();
       this.tabControl.SuspendLayout();
       this.usersTabPage.SuspendLayout();
@@ -181 +180 @@
       // dataTabPage
       // 
-      this.dataTabPage.Controls.Add(this.problemDataView);
       this.dataTabPage.Location = new System.Drawing.Point(4, 22);
       this.dataTabPage.Name = "dataTabPage";
@@ -189 +187 @@
       this.dataTabPage.Text = "Platform-Specific Problem Data";
       this.dataTabPage.UseVisualStyleBackColor = true;
-      // 
-      // problemDataView
-      // 
-      this.problemDataView.ProblemId = ((long)(0));
-      this.problemDataView.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.problemDataView.Caption = "ProblemData View";
-      this.problemDataView.Content = null;
-      this.problemDataView.Location = new System.Drawing.Point(6, 6);
-      this.problemDataView.Name = "problemDataView";
-      this.problemDataView.ReadOnly = false;
-      this.problemDataView.Size = new System.Drawing.Size(613, 254);
-      this.problemDataView.TabIndex = 0;
       // 
       // ProblemView
@@ -244 +228 @@
     private System.Windows.Forms.Button refreshUsersButton;
     private System.Windows.Forms.TabPage dataTabPage;
-    private ProblemDataView problemDataView;
 
   }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/ProblemView.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Clients.OKB.Authentication;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Administration {
   [View("Problem View")]
   [Content(typeof(Problem), true)]
@@ -45 +46 @@
     protected override void OnInitialized(System.EventArgs e) {
       base.OnInitialized(e);
-      platformComboBoxValues = OKBClient.Instance.Platforms.ToList();
+      platformComboBoxValues = AdministrationClient.Instance.Platforms.ToList();
       platformComboBox.DataSource = platformComboBoxValues;
-      problemClassComboBoxValues = OKBClient.Instance.ProblemClasses.ToList();
+      problemClassComboBoxValues = AdministrationClient.Instance.ProblemClasses.ToList();
       problemClassComboBox.DataSource = problemClassComboBoxValues;
     }
@@ -56 +57 @@
         platformComboBox.SelectedIndex = -1;
         problemClassComboBox.SelectedIndex = -1;
-        problemDataView.ProblemId = 0;
       } else {
         platformComboBox.SelectedItem = platformComboBoxValues.FirstOrDefault(p => p.Id == Content.PlatformId);
         problemClassComboBox.SelectedItem = problemClassComboBoxValues.FirstOrDefault(a => a.Id == Content.ProblemClassId);
-        problemDataView.ProblemId = Content.Id;
       }
       usersListBox.DataSource = null;
-      problemDataView.Content = null;
     }
 
@@ -73 +71 @@
       storeUsersButton.Enabled = (usersListBox.DataSource != null) && !ReadOnly;
       usersListBox.Enabled = (usersListBox.DataSource != null) && !ReadOnly;
-      problemDataView.Enabled = Content != null;
     }
 
     protected override void OnContentPropertyChanged(string propertyName) {
       switch (propertyName) {
-        case "Id":
-          problemDataView.ProblemId = Content.Id;
-          break;
         case "PlatformId":
           platformComboBox.SelectedItem = platformComboBoxValues.FirstOrDefault(p => p.Id == Content.PlatformId);
@@ -104 +98 @@
 
     private void refreshUsersButton_Click(object sender, System.EventArgs e) {
-      List<Guid> ids = OKBClient.Instance.GetProblemUsers(Content.Id);
+      List<Guid> ids = AdministrationClient.Instance.GetProblemUsers(Content.Id);
       if (ids != null) {
-        List<User> users = OKBClient.Instance.Users.ToList();
+        List<User> users = AuthenticationClient.Instance.Users.ToList();
         usersListBox.DataSource = users;
         usersListBox.DisplayMember = "Name";
@@ -117 +111 @@
     }
     private void storeUsersButton_Click(object sender, System.EventArgs e) {
-      if (OKBClient.Instance.UpdateProblemUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToList()))
+      if (AdministrationClient.Instance.UpdateProblemUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToList()))
         storeUsersButton.Enabled = false;
     }