Changeset 5472
- Timestamp:
- 02/15/11 17:58:28 (14 years ago)
- Location:
- branches/HeuristicLab.Hive-3.4/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Core.cs
r5469 r5472 111 111 112 112 private void RegisterServiceEvents() { 113 WcfService.Instance.Connected += new EventHandler( wcfService_Connected);114 WcfService.Instance.ExceptionOccured += new EventHandler<EventArgs<Exception>>( wcfService_ExceptionOccured);113 WcfService.Instance.Connected += new EventHandler(WcfService_Connected); 114 WcfService.Instance.ExceptionOccured += new EventHandler<EventArgs<Exception>>(WcfService_ExceptionOccured); 115 115 } 116 116 117 117 private void DeRegisterServiceEvents() { 118 WcfService.Instance.Connected -= wcfService_Connected;119 WcfService.Instance.ExceptionOccured -= wcfService_ExceptionOccured;120 } 121 122 void wcfService_ExceptionOccured(object sender, EventArgs<Exception> e) {118 WcfService.Instance.Connected -= WcfService_Connected; 119 WcfService.Instance.ExceptionOccured -= WcfService_ExceptionOccured; 120 } 121 122 void WcfService_ExceptionOccured(object sender, EventArgs<Exception> e) { 123 123 ClientCom.LogMessage("Connection to server interruped with exception: " + e.Value.Message); 124 124 } 125 125 126 void wcfService_Connected(object sender, EventArgs e) {126 void WcfService_Connected(object sender, EventArgs e) { 127 127 ClientCom.LogMessage("Connected successfully to Hive server"); 128 128 } … … 299 299 foreach (KeyValuePair<Guid, AppDomain> kvp in appDomains) { 300 300 ClientCom.LogMessage("Shutting down Appdomain for " + kvp.Key); 301 appDomains[kvp.Key].UnhandledException -= new UnhandledExceptionEventHandler( appDomain_UnhandledException);301 appDomains[kvp.Key].UnhandledException -= new UnhandledExceptionEventHandler(AppDomain_UnhandledException); 302 302 AppDomain.Unload(kvp.Value); 303 303 } … … 417 417 try { 418 418 AppDomain appDomain = HeuristicLab.PluginInfrastructure.Sandboxing.SandboxManager.CreateAndInitSandbox(myJob.Id.ToString(), pluginDir, Path.Combine(pluginDir, configFileName)); 419 appDomain.UnhandledException += new UnhandledExceptionEventHandler( appDomain_UnhandledException);419 appDomain.UnhandledException += new UnhandledExceptionEventHandler(AppDomain_UnhandledException); 420 420 lock (engines) { 421 421 if (!jobs.ContainsKey(myJob.Id)) { … … 451 451 } 452 452 453 private void appDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) {453 private void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) { 454 454 ClientCom.LogMessage("Exception in AppDomain: " + e.ExceptionObject.ToString()); 455 455 KillAppDomain(new Guid(e.ExceptionObject.ToString())); … … 492 492 493 493 if (appDomains.ContainsKey(id)) { 494 appDomains[id].UnhandledException -= new UnhandledExceptionEventHandler( appDomain_UnhandledException);494 appDomains[id].UnhandledException -= new UnhandledExceptionEventHandler(AppDomain_UnhandledException); 495 495 496 496 int repeat = 5; -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs
r5469 r5472 61 61 } 62 62 63 private string getFilenameFromPath(string path) {63 private string GetFilenameFromPath(string path) { 64 64 string[] dirParts = path.Split(Path.DirectorySeparatorChar); 65 65 if (dirParts.Length > 0) { … … 76 76 77 77 foreach (string dir in Directory.EnumerateDirectories(PluginCacheDir)) { 78 cachedPluginsGuids.Add(Guid.Parse( getFilenameFromPath(dir))); // Todo: cleaner solution to getFilenameFromPath78 cachedPluginsGuids.Add(Guid.Parse(GetFilenameFromPath(dir))); // Todo: cleaner solution to getFilenameFromPath 79 79 } 80 80 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.Designer.cs
r5469 r5472 56 56 this.splitUsers = new System.Windows.Forms.SplitContainer(); 57 57 this.lstUsers = new System.Windows.Forms.ListView(); 58 this.grpUsersInfo = new System.Windows.Forms.GroupBox(); 58 this.label4 = new System.Windows.Forms.Label(); 59 this.label3 = new System.Windows.Forms.Label(); 60 this.label2 = new System.Windows.Forms.Label(); 61 this.label1 = new System.Windows.Forms.Label(); 62 this.tabStatistics = new System.Windows.Forms.TabPage(); 63 this.label5 = new System.Windows.Forms.Label(); 64 this.label6 = new System.Windows.Forms.Label(); 65 this.label7 = new System.Windows.Forms.Label(); 66 this.label8 = new System.Windows.Forms.Label(); 67 this.txtUserExecutionTime = new System.Windows.Forms.TextBox(); 68 this.txtUserCalculatedJobs = new System.Windows.Forms.TextBox(); 69 this.txtUserPriority = new System.Windows.Forms.TextBox(); 70 this.txtUserEmail = new System.Windows.Forms.TextBox(); 71 this.txtUserRole = new System.Windows.Forms.TextBox(); 72 this.txtUserLastActivity = new System.Windows.Forms.TextBox(); 73 this.txtUserName = new System.Windows.Forms.TextBox(); 74 this.tabUserDetails = new System.Windows.Forms.TabControl(); 75 this.tabUserInformation = new System.Windows.Forms.TabPage(); 76 this.tabUserJobs = new System.Windows.Forms.TabPage(); 59 77 this.scheduleControl1 = new HeuristicLab.Clients.Hive.Views.Administration.ScheduleControl(); 60 78 this.hiveJobListViewSlaves = new HeuristicLab.Clients.Hive.Views.HiveJobListView(); 79 this.label9 = new System.Windows.Forms.Label(); 80 this.label10 = new System.Windows.Forms.Label(); 81 this.label11 = new System.Windows.Forms.Label(); 82 this.label12 = new System.Windows.Forms.Label(); 83 this.txtDetailsCalculatedJobs = new System.Windows.Forms.TextBox(); 84 this.txtMemory = new System.Windows.Forms.TextBox(); 85 this.txtCPU = new System.Windows.Forms.TextBox(); 86 this.txtName = new System.Windows.Forms.TextBox(); 61 87 this.tabAdmin.SuspendLayout(); 62 88 this.tabSlaves.SuspendLayout(); … … 66 92 this.splitSlaves.SuspendLayout(); 67 93 this.tabSlaveGroup.SuspendLayout(); 94 this.tabDetails.SuspendLayout(); 68 95 this.tabSchedule.SuspendLayout(); 69 96 this.tabJobs.SuspendLayout(); … … 73 100 this.splitUsers.Panel2.SuspendLayout(); 74 101 this.splitUsers.SuspendLayout(); 102 this.tabStatistics.SuspendLayout(); 103 this.tabUserDetails.SuspendLayout(); 104 this.tabUserInformation.SuspendLayout(); 75 105 this.SuspendLayout(); 76 106 // … … 82 112 this.tabAdmin.Controls.Add(this.tabSlaves); 83 113 this.tabAdmin.Controls.Add(this.tabUsers); 114 this.tabAdmin.Controls.Add(this.tabStatistics); 84 115 this.tabAdmin.Location = new System.Drawing.Point(3, 0); 85 116 this.tabAdmin.Name = "tabAdmin"; … … 127 158 this.treeSlaveGroup.Size = new System.Drawing.Size(209, 502); 128 159 this.treeSlaveGroup.TabIndex = 0; 160 this.treeSlaveGroup.Click += new System.EventHandler(this.treeSlaveGroup_Click); 129 161 // 130 162 // tabSlaveGroup … … 144 176 // tabDetails 145 177 // 178 this.tabDetails.Controls.Add(this.txtName); 179 this.tabDetails.Controls.Add(this.txtCPU); 180 this.tabDetails.Controls.Add(this.txtMemory); 181 this.tabDetails.Controls.Add(this.txtDetailsCalculatedJobs); 182 this.tabDetails.Controls.Add(this.label12); 183 this.tabDetails.Controls.Add(this.label11); 184 this.tabDetails.Controls.Add(this.label10); 185 this.tabDetails.Controls.Add(this.label9); 146 186 this.tabDetails.Location = new System.Drawing.Point(4, 22); 147 187 this.tabDetails.Name = "tabDetails"; … … 199 239 // splitUsers.Panel2 200 240 // 201 this.splitUsers.Panel2.Controls.Add(this. grpUsersInfo);241 this.splitUsers.Panel2.Controls.Add(this.tabUserDetails); 202 242 this.splitUsers.Size = new System.Drawing.Size(722, 508); 203 243 this.splitUsers.SplitterDistance = 240; … … 215 255 this.lstUsers.UseCompatibleStateImageBehavior = false; 216 256 // 217 // grpUsersInfo 218 // 219 this.grpUsersInfo.Location = new System.Drawing.Point(4, 4); 220 this.grpUsersInfo.Name = "grpUsersInfo"; 221 this.grpUsersInfo.Size = new System.Drawing.Size(474, 504); 222 this.grpUsersInfo.TabIndex = 0; 223 this.grpUsersInfo.TabStop = false; 224 this.grpUsersInfo.Text = "User Information"; 257 // label4 258 // 259 this.label4.AutoSize = true; 260 this.label4.Location = new System.Drawing.Point(13, 111); 261 this.label4.Name = "label4"; 262 this.label4.Size = new System.Drawing.Size(32, 13); 263 this.label4.TabIndex = 3; 264 this.label4.Text = "Email"; 265 // 266 // label3 267 // 268 this.label3.AutoSize = true; 269 this.label3.Location = new System.Drawing.Point(13, 79); 270 this.label3.Name = "label3"; 271 this.label3.Size = new System.Drawing.Size(29, 13); 272 this.label3.TabIndex = 2; 273 this.label3.Text = "Role"; 274 // 275 // label2 276 // 277 this.label2.AutoSize = true; 278 this.label2.Location = new System.Drawing.Point(12, 50); 279 this.label2.Name = "label2"; 280 this.label2.Size = new System.Drawing.Size(64, 13); 281 this.label2.TabIndex = 1; 282 this.label2.Text = "Last Activity"; 283 // 284 // label1 285 // 286 this.label1.AutoSize = true; 287 this.label1.Location = new System.Drawing.Point(13, 14); 288 this.label1.Name = "label1"; 289 this.label1.Size = new System.Drawing.Size(58, 13); 290 this.label1.TabIndex = 0; 291 this.label1.Text = "User name"; 292 // 293 // tabStatistics 294 // 295 this.tabStatistics.Controls.Add(this.label5); 296 this.tabStatistics.Location = new System.Drawing.Point(4, 22); 297 this.tabStatistics.Name = "tabStatistics"; 298 this.tabStatistics.Padding = new System.Windows.Forms.Padding(3); 299 this.tabStatistics.Size = new System.Drawing.Size(734, 520); 300 this.tabStatistics.TabIndex = 2; 301 this.tabStatistics.Text = "Statistics"; 302 this.tabStatistics.UseVisualStyleBackColor = true; 303 // 304 // label5 305 // 306 this.label5.AutoSize = true; 307 this.label5.Location = new System.Drawing.Point(141, 221); 308 this.label5.Name = "label5"; 309 this.label5.Size = new System.Drawing.Size(386, 13); 310 this.label5.TabIndex = 0; 311 this.label5.Text = "Show some global statistics, e.g. Overall execution time, nr of calculated jobs, " + 312 "...."; 313 // 314 // label6 315 // 316 this.label6.AutoSize = true; 317 this.label6.Location = new System.Drawing.Point(13, 136); 318 this.label6.Name = "label6"; 319 this.label6.Size = new System.Drawing.Size(63, 13); 320 this.label6.TabIndex = 8; 321 this.label6.Text = "User Priority"; 322 // 323 // label7 324 // 325 this.label7.AutoSize = true; 326 this.label7.Location = new System.Drawing.Point(12, 170); 327 this.label7.Name = "label7"; 328 this.label7.Size = new System.Drawing.Size(82, 13); 329 this.label7.TabIndex = 9; 330 this.label7.Text = "Calculated Jobs"; 331 // 332 // label8 333 // 334 this.label8.AutoSize = true; 335 this.label8.Location = new System.Drawing.Point(13, 202); 336 this.label8.Name = "label8"; 337 this.label8.Size = new System.Drawing.Size(116, 13); 338 this.label8.TabIndex = 10; 339 this.label8.Text = "Overall Execution Time"; 340 // 341 // txtUserExecutionTime 342 // 343 this.txtUserExecutionTime.Location = new System.Drawing.Point(163, 202); 344 this.txtUserExecutionTime.Name = "txtUserExecutionTime"; 345 this.txtUserExecutionTime.Size = new System.Drawing.Size(100, 20); 346 this.txtUserExecutionTime.TabIndex = 11; 347 this.txtUserExecutionTime.Text = "15d 3h 5m"; 348 // 349 // txtUserCalculatedJobs 350 // 351 this.txtUserCalculatedJobs.Location = new System.Drawing.Point(163, 170); 352 this.txtUserCalculatedJobs.Name = "txtUserCalculatedJobs"; 353 this.txtUserCalculatedJobs.Size = new System.Drawing.Size(100, 20); 354 this.txtUserCalculatedJobs.TabIndex = 12; 355 this.txtUserCalculatedJobs.Text = "125"; 356 // 357 // txtUserPriority 358 // 359 this.txtUserPriority.Location = new System.Drawing.Point(163, 136); 360 this.txtUserPriority.Name = "txtUserPriority"; 361 this.txtUserPriority.Size = new System.Drawing.Size(100, 20); 362 this.txtUserPriority.TabIndex = 13; 363 this.txtUserPriority.Text = "10"; 364 // 365 // txtUserEmail 366 // 367 this.txtUserEmail.Location = new System.Drawing.Point(162, 103); 368 this.txtUserEmail.Name = "txtUserEmail"; 369 this.txtUserEmail.Size = new System.Drawing.Size(100, 20); 370 this.txtUserEmail.TabIndex = 14; 371 this.txtUserEmail.Text = "ascheibe@mail.com"; 372 // 373 // txtUserRole 374 // 375 this.txtUserRole.Location = new System.Drawing.Point(162, 72); 376 this.txtUserRole.Name = "txtUserRole"; 377 this.txtUserRole.Size = new System.Drawing.Size(100, 20); 378 this.txtUserRole.TabIndex = 15; 379 this.txtUserRole.Text = "Hive Slave"; 380 // 381 // txtUserLastActivity 382 // 383 this.txtUserLastActivity.Location = new System.Drawing.Point(161, 41); 384 this.txtUserLastActivity.Name = "txtUserLastActivity"; 385 this.txtUserLastActivity.Size = new System.Drawing.Size(100, 20); 386 this.txtUserLastActivity.TabIndex = 16; 387 this.txtUserLastActivity.Text = "11.1.2010"; 388 // 389 // txtUserName 390 // 391 this.txtUserName.Location = new System.Drawing.Point(161, 6); 392 this.txtUserName.Name = "txtUserName"; 393 this.txtUserName.Size = new System.Drawing.Size(100, 20); 394 this.txtUserName.TabIndex = 17; 395 this.txtUserName.Text = "ascheibe"; 396 // 397 // tabUserDetails 398 // 399 this.tabUserDetails.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 400 | System.Windows.Forms.AnchorStyles.Left) 401 | System.Windows.Forms.AnchorStyles.Right))); 402 this.tabUserDetails.Controls.Add(this.tabUserInformation); 403 this.tabUserDetails.Controls.Add(this.tabUserJobs); 404 this.tabUserDetails.Location = new System.Drawing.Point(4, 4); 405 this.tabUserDetails.Name = "tabUserDetails"; 406 this.tabUserDetails.SelectedIndex = 0; 407 this.tabUserDetails.Size = new System.Drawing.Size(471, 501); 408 this.tabUserDetails.TabIndex = 1; 409 // 410 // tabUserInformation 411 // 412 this.tabUserInformation.Controls.Add(this.txtUserName); 413 this.tabUserInformation.Controls.Add(this.txtUserLastActivity); 414 this.tabUserInformation.Controls.Add(this.txtUserRole); 415 this.tabUserInformation.Controls.Add(this.label1); 416 this.tabUserInformation.Controls.Add(this.txtUserEmail); 417 this.tabUserInformation.Controls.Add(this.label2); 418 this.tabUserInformation.Controls.Add(this.txtUserPriority); 419 this.tabUserInformation.Controls.Add(this.label3); 420 this.tabUserInformation.Controls.Add(this.txtUserCalculatedJobs); 421 this.tabUserInformation.Controls.Add(this.label4); 422 this.tabUserInformation.Controls.Add(this.txtUserExecutionTime); 423 this.tabUserInformation.Controls.Add(this.label6); 424 this.tabUserInformation.Controls.Add(this.label8); 425 this.tabUserInformation.Controls.Add(this.label7); 426 this.tabUserInformation.Location = new System.Drawing.Point(4, 22); 427 this.tabUserInformation.Name = "tabUserInformation"; 428 this.tabUserInformation.Padding = new System.Windows.Forms.Padding(3); 429 this.tabUserInformation.Size = new System.Drawing.Size(463, 475); 430 this.tabUserInformation.TabIndex = 0; 431 this.tabUserInformation.Text = "User Information"; 432 this.tabUserInformation.UseVisualStyleBackColor = true; 433 // 434 // tabUserJobs 435 // 436 this.tabUserJobs.Location = new System.Drawing.Point(4, 22); 437 this.tabUserJobs.Name = "tabUserJobs"; 438 this.tabUserJobs.Padding = new System.Windows.Forms.Padding(3); 439 this.tabUserJobs.Size = new System.Drawing.Size(463, 475); 440 this.tabUserJobs.TabIndex = 1; 441 this.tabUserJobs.Text = "Jobs"; 442 this.tabUserJobs.UseVisualStyleBackColor = true; 225 443 // 226 444 // scheduleControl1 … … 244 462 this.hiveJobListViewSlaves.TabIndex = 0; 245 463 // 464 // label9 465 // 466 this.label9.AutoSize = true; 467 this.label9.Location = new System.Drawing.Point(7, 38); 468 this.label9.Name = "label9"; 469 this.label9.Size = new System.Drawing.Size(35, 13); 470 this.label9.TabIndex = 0; 471 this.label9.Text = "Name"; 472 // 473 // label10 474 // 475 this.label10.AutoSize = true; 476 this.label10.Location = new System.Drawing.Point(7, 63); 477 this.label10.Name = "label10"; 478 this.label10.Size = new System.Drawing.Size(29, 13); 479 this.label10.TabIndex = 1; 480 this.label10.Text = "CPU"; 481 // 482 // label11 483 // 484 this.label11.AutoSize = true; 485 this.label11.Location = new System.Drawing.Point(7, 89); 486 this.label11.Name = "label11"; 487 this.label11.Size = new System.Drawing.Size(44, 13); 488 this.label11.TabIndex = 2; 489 this.label11.Text = "Memory"; 490 // 491 // label12 492 // 493 this.label12.AutoSize = true; 494 this.label12.Location = new System.Drawing.Point(6, 115); 495 this.label12.Name = "label12"; 496 this.label12.Size = new System.Drawing.Size(82, 13); 497 this.label12.TabIndex = 3; 498 this.label12.Text = "Calculated Jobs"; 499 // 500 // txtDetailsCalculatedJobs 501 // 502 this.txtDetailsCalculatedJobs.Location = new System.Drawing.Point(123, 108); 503 this.txtDetailsCalculatedJobs.Name = "txtDetailsCalculatedJobs"; 504 this.txtDetailsCalculatedJobs.Size = new System.Drawing.Size(100, 20); 505 this.txtDetailsCalculatedJobs.TabIndex = 4; 506 this.txtDetailsCalculatedJobs.Text = "33"; 507 // 508 // txtMemory 509 // 510 this.txtMemory.Location = new System.Drawing.Point(123, 82); 511 this.txtMemory.Name = "txtMemory"; 512 this.txtMemory.Size = new System.Drawing.Size(100, 20); 513 this.txtMemory.TabIndex = 5; 514 this.txtMemory.Text = "2048 MB"; 515 // 516 // txtCPU 517 // 518 this.txtCPU.Location = new System.Drawing.Point(123, 56); 519 this.txtCPU.Name = "txtCPU"; 520 this.txtCPU.Size = new System.Drawing.Size(100, 20); 521 this.txtCPU.TabIndex = 6; 522 this.txtCPU.Text = "Intel Core 2 Duo @ 2.4 Ghz"; 523 // 524 // txtName 525 // 526 this.txtName.Location = new System.Drawing.Point(123, 30); 527 this.txtName.Name = "txtName"; 528 this.txtName.Size = new System.Drawing.Size(100, 20); 529 this.txtName.TabIndex = 7; 530 this.txtName.Text = "ascheibepc"; 531 // 246 532 // HiveAdministrationView 247 533 // … … 251 537 this.Name = "HiveAdministrationView"; 252 538 this.Size = new System.Drawing.Size(745, 546); 539 this.Load += new System.EventHandler(this.HiveAdministrationView_Load); 253 540 this.tabAdmin.ResumeLayout(false); 254 541 this.tabSlaves.ResumeLayout(false); … … 258 545 this.splitSlaves.ResumeLayout(false); 259 546 this.tabSlaveGroup.ResumeLayout(false); 547 this.tabDetails.ResumeLayout(false); 548 this.tabDetails.PerformLayout(); 260 549 this.tabSchedule.ResumeLayout(false); 261 550 this.tabJobs.ResumeLayout(false); … … 265 554 ((System.ComponentModel.ISupportInitialize)(this.splitUsers)).EndInit(); 266 555 this.splitUsers.ResumeLayout(false); 556 this.tabStatistics.ResumeLayout(false); 557 this.tabStatistics.PerformLayout(); 558 this.tabUserDetails.ResumeLayout(false); 559 this.tabUserInformation.ResumeLayout(false); 560 this.tabUserInformation.PerformLayout(); 267 561 this.ResumeLayout(false); 268 562 … … 283 577 private System.Windows.Forms.SplitContainer splitUsers; 284 578 private System.Windows.Forms.ListView lstUsers; 285 private System.Windows.Forms.GroupBox grpUsersInfo;286 579 private HiveJobListView hiveJobListViewSlaves; 580 private System.Windows.Forms.Label label3; 581 private System.Windows.Forms.Label label2; 582 private System.Windows.Forms.Label label1; 583 private System.Windows.Forms.Label label4; 584 private System.Windows.Forms.TabPage tabStatistics; 585 private System.Windows.Forms.Label label5; 586 private System.Windows.Forms.Label label8; 587 private System.Windows.Forms.Label label7; 588 private System.Windows.Forms.Label label6; 589 private System.Windows.Forms.TextBox txtUserName; 590 private System.Windows.Forms.TextBox txtUserLastActivity; 591 private System.Windows.Forms.TextBox txtUserRole; 592 private System.Windows.Forms.TextBox txtUserEmail; 593 private System.Windows.Forms.TextBox txtUserPriority; 594 private System.Windows.Forms.TextBox txtUserCalculatedJobs; 595 private System.Windows.Forms.TextBox txtUserExecutionTime; 596 private System.Windows.Forms.TabControl tabUserDetails; 597 private System.Windows.Forms.TabPage tabUserInformation; 598 private System.Windows.Forms.TabPage tabUserJobs; 599 private System.Windows.Forms.Label label12; 600 private System.Windows.Forms.Label label11; 601 private System.Windows.Forms.Label label10; 602 private System.Windows.Forms.Label label9; 603 private System.Windows.Forms.TextBox txtName; 604 private System.Windows.Forms.TextBox txtCPU; 605 private System.Windows.Forms.TextBox txtMemory; 606 private System.Windows.Forms.TextBox txtDetailsCalculatedJobs; 287 607 } 288 608 } -
branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.cs
r5457 r5472 20 20 #endregion 21 21 22 using System.Collections.Generic; 22 23 using System.Windows.Forms; 23 24 using HeuristicLab.Clients.Hive.Administration; 24 25 using HeuristicLab.Core.Views; 25 26 using HeuristicLab.MainForm; 27 //using HeuristicLab.Services.Hive.Common.DataTransfer; 26 28 27 29 namespace HeuristicLab.Clients.Hive.Views.Administration { … … 63 65 } 64 66 67 /*List<SlaveGroup> slaveGroups; 68 List<Slave> slaves;*/ 69 70 private void HiveAdministrationView_Load(object sender, System.EventArgs e) { 71 72 /* using (HeuristicLab.Clients.Common.Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) { 73 slaveGroups = new List<SlaveGroup>(service.Obj.GetSlaveGroups()); 74 slaves = new List<Slave>(service.Obj.GetSlaves()); 75 76 foreach (SlaveGroup g in slaveGroups) { 77 TreeNode tn = new TreeNode(); 78 tn.Text = "Group " + g.Name; 79 foreach (Slave s in slaves.FindAll(s => s.ParentResourceId != null && s.ParentResourceId == g.Id)) { 80 tn.Nodes.Add(new TreeNode(s.Name)); 81 } 82 treeSlaveGroup.Nodes.Add(tn); 83 } 84 85 TreeNode ungrp = new TreeNode("UNGROUPED"); 86 foreach (Slave s in slaves.FindAll(s => s.ParentResourceId == null)) { 87 ungrp.Nodes.Add(new TreeNode(s.Name)); 88 } 89 treeSlaveGroup.Nodes.Add(ungrp); 90 91 }*/ 92 } 93 94 private void treeSlaveGroup_Click(object sender, System.EventArgs e) { 95 string text = treeSlaveGroup.SelectedNode.Text; 96 97 /*Slave slave = slaves.Find(s => s.Name == text); 98 if (slave != null) { 99 100 } */ 101 102 } 103 65 104 #region Event Handlers 66 105 // TODO: Put event handlers here
Note: See TracChangeset
for help on using the changeset viewer.