- Timestamp:
- 09/25/15 14:39:59 (9 years ago)
- Location:
- branches/gteufl
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/gteufl
- Property svn:ignore
-
old new 8 8 FxCopResults.txt 9 9 Google.ProtocolBuffers-0.9.1.dll 10 Google.ProtocolBuffers-2.4.1.473.dll 10 11 HeuristicLab 3.3.5.1.ReSharper.user 11 12 HeuristicLab 3.3.6.0.ReSharper.user 12 13 HeuristicLab.4.5.resharper.user 13 14 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development 14 16 HeuristicLab.resharper.user 15 17 ProtoGen.exe … … 17 19 _ReSharper.HeuristicLab 18 20 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests 19 22 _ReSharper.HeuristicLab.ExtLibs 20 23 bin 21 24 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 25 obj
-
- Property svn:mergeinfo changed
-
Property
svn:global-ignores
set to
*.nuget
packages
- Property svn:ignore
-
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/ExtensionMethods/TreeNodeExtensions.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj
r10150 r12969 11 11 <RootNamespace>HeuristicLab.Clients.Hive.JobManager</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Clients.Hive.JobManager-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 0</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 <TargetFrameworkProfile /> 15 16 </PropertyGroup> 16 17 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> … … 23 24 <WarningLevel>4</WarningLevel> 24 25 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 26 <Prefer32Bit>false</Prefer32Bit> 25 27 </PropertyGroup> 26 28 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> … … 34 36 </DocumentationFile> 35 37 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 38 <Prefer32Bit>false</Prefer32Bit> 36 39 </PropertyGroup> 37 40 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> … … 43 46 <ErrorReport>prompt</ErrorReport> 44 47 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 48 <Prefer32Bit>false</Prefer32Bit> 45 49 </PropertyGroup> 46 50 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> … … 54 58 <ErrorReport>prompt</ErrorReport> 55 59 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 60 <Prefer32Bit>false</Prefer32Bit> 56 61 </PropertyGroup> 57 62 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> … … 63 68 <ErrorReport>prompt</ErrorReport> 64 69 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 70 <Prefer32Bit>false</Prefer32Bit> 65 71 </PropertyGroup> 66 72 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> … … 74 80 <ErrorReport>prompt</ErrorReport> 75 81 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 82 <Prefer32Bit>false</Prefer32Bit> 76 83 </PropertyGroup> 77 84 <PropertyGroup> -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs
r9523 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/CreateHiveJobMenuItem.cs
r10170 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 48 48 Type contentType = content.GetType(); 49 49 ToolStripItem.Enabled = ItemTask.IsTypeSupported(contentType); 50 } else { 51 ToolStripItem.Enabled = false; 50 return; 52 51 } 53 52 } 53 ToolStripItem.Enabled = false; 54 54 } 55 55 -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs
r10170 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs
r10170 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 50 50 Type contentType = content.GetType(); 51 51 ToolStripItem.Enabled = ItemTask.IsTypeSupported(contentType); 52 } else { 53 ToolStripItem.Enabled = false; 52 return; 54 53 } 55 54 } 55 ToolStripItem.Enabled = false; 56 56 } 57 57 -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame
r10037 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 24 24 namespace HeuristicLab.Clients.Hive.JobManager { 25 [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3. 9.$WCREV$")]25 [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.12.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Clients.Hive.JobManager-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Clients.Hive", "3.3")] -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Properties/AssemblyInfo.cs.frame
r10037 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 [assembly: AssemblyCompany("HEAL")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 3HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3. 9.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.12.$WCREV$")] -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.Designer.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs
r9894 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.Designer.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs
r9894 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs
r9456 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 70 70 this.toolTip = new System.Windows.Forms.ToolTip(this.components); 71 71 this.refreshButton = new System.Windows.Forms.Button(); 72 this.isPrivilegedCheckBox = new System.Windows.Forms.CheckBox();73 72 this.UnloadButton = new System.Windows.Forms.Button(); 74 73 this.refreshAutomaticallyCheckBox = new System.Windows.Forms.CheckBox(); … … 332 331 this.resourceNamesTextBox.Location = new System.Drawing.Point(70, 52); 333 332 this.resourceNamesTextBox.Name = "resourceNamesTextBox"; 334 this.resourceNamesTextBox.Size = new System.Drawing.Size( 385, 20);333 this.resourceNamesTextBox.Size = new System.Drawing.Size(471, 20); 335 334 this.resourceNamesTextBox.TabIndex = 2; 336 335 this.resourceNamesTextBox.Validated += new System.EventHandler(this.resourceNamesTextBox_Validated); … … 365 364 this.refreshButton.UseVisualStyleBackColor = true; 366 365 this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click); 367 //368 // isPrivilegedCheckBox369 //370 this.isPrivilegedCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));371 this.isPrivilegedCheckBox.AutoSize = true;372 this.isPrivilegedCheckBox.Location = new System.Drawing.Point(491, 54);373 this.isPrivilegedCheckBox.Name = "isPrivilegedCheckBox";374 this.isPrivilegedCheckBox.Size = new System.Drawing.Size(72, 17);375 this.isPrivilegedCheckBox.TabIndex = 3;376 this.isPrivilegedCheckBox.Text = "Privileged";377 this.toolTip.SetToolTip(this.isPrivilegedCheckBox, "If checked, the task will be executed in a privileged sandbox on the slave.");378 this.isPrivilegedCheckBox.UseVisualStyleBackColor = true;379 this.isPrivilegedCheckBox.CheckedChanged += new System.EventHandler(this.isPrivilegedCheckBox_CheckChanged);380 366 // 381 367 // UnloadButton … … 475 461 this.searchButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 476 462 this.searchButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Zoom; 477 this.searchButton.Location = new System.Drawing.Point( 461, 50);463 this.searchButton.Location = new System.Drawing.Point(547, 50); 478 464 this.searchButton.Name = "searchButton"; 479 465 this.searchButton.Size = new System.Drawing.Size(24, 24); … … 487 473 this.Controls.Add(this.UnloadButton); 488 474 this.Controls.Add(this.searchButton); 489 this.Controls.Add(this.isPrivilegedCheckBox);490 475 this.Controls.Add(this.infoGroupBox); 491 476 this.Controls.Add(this.refreshAutomaticallyCheckBox); … … 542 527 private System.Windows.Forms.Label calculatingLabel; 543 528 private System.Windows.Forms.Label jobsLabel; 544 private System.Windows.Forms.CheckBox isPrivilegedCheckBox;545 529 private System.Windows.Forms.TabPage stateTabPage; 546 530 private HeuristicLab.MainForm.WindowsForms.ViewHost stateLogViewHost; -
branches/gteufl/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs
r10150 r12969 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 3Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 119 119 executionTimeTextBox.Text = string.Empty; 120 120 resourceNamesTextBox.Text = string.Empty; 121 isPrivilegedCheckBox.Checked = false;122 121 refreshAutomaticallyCheckBox.Checked = false; 123 122 lock (runCollectionViewLocker) { … … 132 131 executionTimeTextBox.Text = Content.ExecutionTime.ToString(); 133 132 resourceNamesTextBox.Text = Content.Job.ResourceNames; 134 isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;135 133 refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically; 136 134 logView.Content = Content.Log; … … 163 161 searchButton.Enabled = !Locked; 164 162 jobsTreeView.Enabled = !Locked; 165 isPrivilegedCheckBox.Enabled = !Locked;166 163 refreshAutomaticallyCheckBox.Enabled = !Locked; 167 164 refreshButton.Enabled = !Locked; … … 191 188 this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing; 192 189 193 this.isPrivilegedCheckBox.Enabled = HiveClient.Instance.IsAllowedPrivileged && Content.IsControllable && !(Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded) && !Content.IsProgressing;194 190 this.refreshAutomaticallyCheckBox.Enabled = Content.IsControllable && alreadyUploaded && jobsLoaded && Content.ExecutionState == ExecutionState.Started && !Content.IsProgressing; 195 191 this.refreshButton.Enabled = Content.IsDownloadable && alreadyUploaded && !Content.IsProgressing; … … 279 275 lock (runCollectionViewLocker) { 280 276 runCollectionViewHost.Content = GetAllRunsFromJob(Content); 281 }282 if (InvokeRequired) {283 Invoke(new Action(() => { isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged; }));284 } else {285 isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;286 277 } 287 278 } … … 423 414 } 424 415 425 private void isPrivilegedCheckBox_CheckChanged(object sender, EventArgs e) {426 if (Content != null && !SuppressEvents) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked;427 }428 429 416 private void refreshButton_Click(object sender, EventArgs e) { 430 417 var invoker = new Action<RefreshableJob>(HiveClient.LoadJob); … … 468 455 private void jobsTreeView_DragEnter(object sender, DragEventArgs e) { 469 456 e.Effect = DragDropEffects.None; 470 var obj = e.Data.GetData(Constants.DragDropDataFormat) as IDeepCloneable; 457 var obj = (IDeepCloneable)e.Data.GetData(Constants.DragDropDataFormat); 458 471 459 Type objType = obj.GetType(); 472 473 var hiveTaskFound = ItemTask.IsTypeSupported(objType); 474 if (hiveTaskFound) { 460 if (ItemTask.IsTypeSupported(objType)) { 475 461 if (Content.Id != Guid.Empty) e.Effect = DragDropEffects.None; 476 462 else if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link; // ALT key … … 481 467 private void jobsTreeView_DragDrop(object sender, DragEventArgs e) { 482 468 if (e.Effect != DragDropEffects.None) { 483 var obj = e.Data.GetData(Constants.DragDropDataFormat) as IItem;469 var obj = (IItem)e.Data.GetData(Constants.DragDropDataFormat); 484 470 485 471 IItem newObj = null; 486 472 if (e.Effect.HasFlag(DragDropEffects.Copy)) { 487 newObj = obj.Clone(new Cloner()) as IItem;473 newObj = (IItem)obj.Clone(); 488 474 } else { 489 475 newObj = obj; … … 495 481 } 496 482 if (newObj is IExecutable) { 497 IExecutable exec = newObj as IExecutable;483 IExecutable exec = (IExecutable)newObj; 498 484 if (exec.ExecutionState != ExecutionState.Prepared) { 499 485 exec.Prepare();
Note: See TracChangeset
for help on using the changeset viewer.