Changeset 5874 for branches

Timestamp:

03/30/11 00:32:26 (14 years ago)

Author:

cneumuel

Message:

#1260

• added missing DisposableWrapper.cs
• resolved broken compatibility with trunk (due to #1416)
• updated binaries

Location:

branches/HeuristicLab.Hive-3.3

Files:

• binaries/HeuristicLab.Hive.ExperimentManager.zip (modified) (previous)
• sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln (modified) (2 diffs)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.Contracts/3.3/DisposableWrapper.cs (added)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.Designer.cs (modified) (5 diffs)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.cs (modified) (5 diffs)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.resx (modified) (3 diffs)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveJobView.Designer.cs (modified) (4 diffs)
• sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3 (modified) (1 prop)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

@@ -29 +29 @@
     ConfigMerger.exe = ConfigMerger.exe
     HeuristicLab 3.3.vsmdi = HeuristicLab 3.3.vsmdi
-    HeuristicLab.Hive 3.32.vsmdi = HeuristicLab.Hive 3.32.vsmdi
+    HeuristicLab.Hive 3.3.vsmdi = HeuristicLab.Hive 3.3.vsmdi
     LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
     PreBuildEvent.cmd = PreBuildEvent.cmd
@@ -108 +108 @@
 Global
   GlobalSection(TestCaseManagementSettings) = postSolution
-    CategoryFile = HeuristicLab.Hive 3.32.vsmdi
+    CategoryFile = HeuristicLab.Hive 3.3.vsmdi
   EndGlobalSection
   GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -82 +82 @@
       this.nameTextBox.Size = new System.Drawing.Size(663, 20);
       // 
-      // descriptionTextBox
-      // 
-      this.descriptionTextBox.Size = new System.Drawing.Size(663, 20);
-      // 
       // tabControl
       // 
@@ -145 +141 @@
       this.experimentNamedItemView.Name = "experimentNamedItemView";
       this.experimentNamedItemView.ReadOnly = false;
-      this.experimentNamedItemView.Size = new System.Drawing.Size(721, 52);
+      this.experimentNamedItemView.Size = new System.Drawing.Size(721, 22);
       this.experimentNamedItemView.TabIndex = 3;
       // 
@@ -152 +148 @@
       this.viewExperimentButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.viewExperimentButton.Location = new System.Drawing.Point(0, 94);
+      this.viewExperimentButton.Location = new System.Drawing.Point(0, 64);
       this.viewExperimentButton.Name = "viewExperimentButton";
       this.viewExperimentButton.Size = new System.Drawing.Size(727, 23);
@@ -361 +357 @@
       this.Name = "HiveExperimentView";
       this.Size = new System.Drawing.Size(735, 524);
+      this.Controls.SetChildIndex(this.infoLabel, 0);
       this.Controls.SetChildIndex(this.reconnectButton, 0);
       this.Controls.SetChildIndex(this.resetButton, 0);
@@ -373 +370 @@
       this.Controls.SetChildIndex(this.tabControl, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
-      this.Controls.SetChildIndex(this.descriptionLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
-      this.Controls.SetChildIndex(this.descriptionTextBox, 0);
       this.Controls.SetChildIndex(this.downloadExperimentPanel, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.cs

@@ -101 +101 @@
       if (Content != null) {
         this.nameTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
-        this.descriptionTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.resourceIdsTextBox.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
         this.hiveJobView.ReadOnly = Content.ExecutionState != ExecutionState.Prepared;
@@ -132 +131 @@
         Invoke(new EventHandler(Content_Prepared), sender, e);
       else {
-        nameTextBox.Enabled = descriptionTextBox.Enabled = true;
+        nameTextBox.Enabled = true;
         Locked = false;
         SetEnabledStateOfControls();
@@ -141 +140 @@
         Invoke(new EventHandler(Content_Started), sender, e);
       else {
-        nameTextBox.Enabled = descriptionTextBox.Enabled = false;
+        nameTextBox.Enabled = false;
         SetEnabledStateOfControls();
       }
@@ -149 +148 @@
         Invoke(new EventHandler(Content_Paused), sender, e);
       else {
-        nameTextBox.Enabled = descriptionTextBox.Enabled = true;
+        nameTextBox.Enabled = true;
         SetEnabledStateOfControls();
       }
@@ -157 +156 @@
         Invoke(new EventHandler(Content_Stopped), sender, e);
       else {
-        nameTextBox.Enabled = descriptionTextBox.Enabled = true;
+        nameTextBox.Enabled = true;
         Locked = false;
         SetEnabledStateOfControls();

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveExperimentView.resx

@@ -113 +113 @@
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>107, 17</value>
   </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="openExperimentButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -204 +204 @@
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvQAADr0BR/uQrQAAA2JJREFUOE9lk31MFHQY
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvAAADrwBlbxySQAAA2JJREFUOE9lk31MFHQY
         x59JZIU62/QPF1gauDJXjkpyZLxVMEEubgpKU0NePKS6yp168qaJ4OIlMhUH6hRWChyuuuTaQjqFk8j0
         MEhlURdMRgp0XERccfjpx7G1Vn8822+/fb/fz/f54xFA/jtDf03S4fyTloE/6PhlFNfvY0xMTCjZ/7X/
@@ -268 +268 @@
 </value>
   </data>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>25</value>
   </metadata>

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager.Views/3.3/HiveJobView.Designer.cs

@@ -193 +193 @@
       this.jobStatusGroupBox.Controls.Add(this.dateFinishedLabel);
       this.jobStatusGroupBox.Controls.Add(this.exceptionTextBox);
-      this.jobStatusGroupBox.Location = new System.Drawing.Point(6, 226);
+      this.jobStatusGroupBox.Location = new System.Drawing.Point(6, 203);
       this.jobStatusGroupBox.Name = "jobStatusGroupBox";
       this.jobStatusGroupBox.Size = new System.Drawing.Size(610, 162);
@@ -237 +237 @@
       this.optimizerGroupBox.Location = new System.Drawing.Point(6, 29);
       this.optimizerGroupBox.Name = "optimizerGroupBox";
-      this.optimizerGroupBox.Size = new System.Drawing.Size(610, 74);
+      this.optimizerGroupBox.Size = new System.Drawing.Size(610, 47);
       this.optimizerGroupBox.TabIndex = 28;
       this.optimizerGroupBox.TabStop = false;
@@ -251 +251 @@
       this.optimizerNamedItemView.Name = "optimizerNamedItemView";
       this.optimizerNamedItemView.ReadOnly = false;
-      this.optimizerNamedItemView.Size = new System.Drawing.Size(604, 51);
+      this.optimizerNamedItemView.Size = new System.Drawing.Size(604, 21);
       this.optimizerNamedItemView.TabIndex = 0;
       // 
@@ -266 +266 @@
       this.configurationGroupBox.Controls.Add(this.computeInParallelLabel);
       this.configurationGroupBox.Controls.Add(this.computeInParallelCheckBox);
-      this.configurationGroupBox.Location = new System.Drawing.Point(6, 105);
+      this.configurationGroupBox.Location = new System.Drawing.Point(6, 82);
       this.configurationGroupBox.Name = "configurationGroupBox";
       this.configurationGroupBox.Size = new System.Drawing.Size(610, 119);

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server/3.3

@@ -2 +2 @@
 obj
 *.user
+*.vs10x

@@ -2 +2 @@
 obj
 *.user
+*.vs10x

@@ -2 +2 @@
 obj
 *.user
+*.vs10x