Changeset 5458 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager

Timestamp:

02/14/11 18:23:37 (14 years ago)

Author:

cneumuel

Message:

#1233

• removed GetConfigurationFile from service -> configuration is now submitted as a plugin with one file (the configuration file)
• resource ids are now checked before uploading a hive experiment, only valid resource names are accepted
• added SharpZipLib License to ConsoleClient project, so dependecies are satisfied

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager

Files:

• HiveExperimentView.Designer.cs (modified) (5 diffs)
• HiveExperimentView.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.Designer.cs

@@ -63 +63 @@
       this.pauseButton = new System.Windows.Forms.Button();
       this.resourceIdsLabel = new System.Windows.Forms.Label();
-      this.resourceIdsTextBox = new System.Windows.Forms.TextBox();
+      this.resourceNamesTextBox = new System.Windows.Forms.TextBox();
       this.disconnectButton = new System.Windows.Forms.Button();
       this.reconnectButton = new System.Windows.Forms.Button();
@@ -289 +289 @@
       // resourceIdsTextBox
       // 
-      this.resourceIdsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.resourceIdsTextBox.Location = new System.Drawing.Point(72, 52);
-      this.resourceIdsTextBox.Name = "resourceIdsTextBox";
-      this.resourceIdsTextBox.Size = new System.Drawing.Size(559, 20);
-      this.resourceIdsTextBox.TabIndex = 14;
-      this.resourceIdsTextBox.Validated += new System.EventHandler(this.resourceIdsTextBox_Validated);
+      this.resourceNamesTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.resourceNamesTextBox.Location = new System.Drawing.Point(72, 52);
+      this.resourceNamesTextBox.Name = "resourceIdsTextBox";
+      this.resourceNamesTextBox.Size = new System.Drawing.Size(559, 20);
+      this.resourceNamesTextBox.TabIndex = 14;
+      this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated);
       // 
       // disconnectButton
@@ -364 +364 @@
       this.Controls.Add(this.disconnectButton);
       this.Controls.Add(this.startButton);
-      this.Controls.Add(this.resourceIdsTextBox);
+      this.Controls.Add(this.resourceNamesTextBox);
       this.Controls.Add(this.executionTimeTextBox);
       this.Controls.Add(this.resourceIdsLabel);
@@ -385 +385 @@
       this.Controls.SetChildIndex(this.resourceIdsLabel, 0);
       this.Controls.SetChildIndex(this.executionTimeTextBox, 0);
-      this.Controls.SetChildIndex(this.resourceIdsTextBox, 0);
+      this.Controls.SetChildIndex(this.resourceNamesTextBox, 0);
       this.Controls.SetChildIndex(this.startButton, 0);
       this.Controls.SetChildIndex(this.disconnectButton, 0);
@@ -413 +413 @@
     private System.Windows.Forms.Button pauseButton;
     private System.Windows.Forms.Label resourceIdsLabel;
-    private System.Windows.Forms.TextBox resourceIdsTextBox;
+    private System.Windows.Forms.TextBox resourceNamesTextBox;
     private System.Windows.Forms.Button viewExperimentButton;
     private Core.Views.NamedItemView experimentNamedItemView;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/ExperimentManager/HiveExperimentView.cs

@@ -83 +83 @@
       if (Content == null) {
         executionTimeTextBox.Text = string.Empty;
-        resourceIdsTextBox.Text = string.Empty;
+        resourceNamesTextBox.Text = string.Empty;
         useLocalPluginsCheckBox.Checked = false;
         logView.Content = null;
       } else {
         executionTimeTextBox.Text = Content.ExecutionTime.ToString();
-        resourceIdsTextBox.Text = Content.ResourceIds;
+        resourceNamesTextBox.Text = Content.ResourceNames;
         useLocalPluginsCheckBox.Checked = Content.UseLocalPlugins;
         logView.Content = Content.Log;
@@ -104 +104 @@
         this.nameTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.descriptionTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
-        this.resourceIdsTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
+        this.resourceNamesTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.hiveJobView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.useLocalPluginsCheckBox.Enabled = Content.ExecutionState == ExecutionState.Prepared;
@@ -214 +214 @@
     }
 
-    private void resourceIdsTextBox_Validated(object sender, EventArgs e) {
-      Content.ResourceIds = resourceIdsTextBox.Text;
+    private void resourceNamesTextBox_Validated(object sender, EventArgs e) {
+      Content.ResourceNames = resourceNamesTextBox.Text;
     }