Context Navigation

← Previous Change
Next Change →

HeuristicLab.Clients.Hive.JobManager

Timestamp:

11/25/14 03:26:00 (10 years ago)

Author:

swagner

Message:

#2205: Merged changes r11062:11557 from trunk/sources into branches/OptimizationNetworks

Location:

branches/OptimizationNetworks

Files:

: 22 edited

. (modified) (1 prop)
HeuristicLab.Clients.Hive.JobManager/3.3/ExtensionMethods/TreeNodeExtensions.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/CreateHiveJobMenuItem.cs (modified) (2 diffs)
HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs (modified) (2 diffs)
HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Clients.Hive.JobManager/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/OptimizationNetworks

Property svn:mergeinfo changed

/branches/DataPreprocessing (added)	merged: 10085,10095,10134,10143-10148,10157-10169,10179-10189,10191-10194,10216-10221,10234-10260,10303-10304,10307-10308,10310-10317,10319-10320,10341-10345,10367,10369-10372,10374,10377,10380-10383,10532-10539,10542,10544,10546-10552,10554-10555,10557-10559,10571-10574,10580-10583,10585-10590,10609-10638,10657-10673,10676,10689-10719,10733-10742,10762-10766,10768-10773,10775-10786,10802-10821,10841-10849,10851-10854,10863,10866-10883,10898-10902,10904-10905,10908-10909,10911,10913-10916,10918,10921-10922,10925,10930-10935,10938-10940,10942-10952,10962,10964-10965,10967,10969-10973,10976-10982,10987,10990-10995,10997-11004,11009,11011,11037-11039,11042-11045,11064,11068,11070,11098
/stable	merged: 11170,11173,11175
/trunk/sources (added)	merged: 11065-11067,11071,11074-11082,11086-11088,11091-11093,11095-11097,11099,11102,11108,11111-11117,11123-11128,11131,11135,11153,11156,11161,11163,11171-11172,11174,11176,11214,11241,11248-11251,11256,11263,11274,11280,11282-11283,11285-11287,11290,11292,11294-11296,11298,11300,11302,11306,11308-11309,11313,11315,11317,11324,11326,11330-11332,11337-11348,11352-11353,11361-11362,11364-11367,11380-11382,11384,11389,11391-11392,11394,11403-11404,11410-11411,11417-11420,11422,11426-11430,11432,11434-11437,11439-11448,11450,11453,11455-11457,11464,11466-11467,11469-11472,11474,11477-11480,11483,11494-11498,11504,11514-11515,11523-11525,11532-11533,11536,11540-11542,11544-11545,11547-11549,11555,11557

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/ExtensionMethods/TreeNodeExtensions.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/ListViewItemDateComparer.cs

r9523	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/CreateHiveJobMenuItem.cs

r10170	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 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/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs

r10170	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/RunInHiveMenuItem.cs

r10170	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 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/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Plugin.cs.frame

-                      r10037
+                      r11576
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Clients.Hive.JobManager {
   [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.9.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.JobManager", "3.3.10.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.JobManager-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Properties/AssemblyInfo.cs.frame

-                      r10037
+                      r11576
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.9.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.Designer.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.Designer.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

r9894	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.Designer.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelectorDialog.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.Designer.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

r9894	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs

r9456	r11576
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

-                      r10150
+                      r11576
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     private void jobsTreeView_DragEnter(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
+      var obj = e.Data.GetData(Constants.DragDropDataFormat) as IDeepCloneable;
+      var obj = (IDeepCloneable)e.Data.GetData(Constants.DragDropDataFormat);
       Type objType = obj.GetType();
+      var hiveTaskFound = ItemTask.IsTypeSupported(objType);
+      if (hiveTaskFound) {
+      if (ItemTask.IsTypeSupported(objType)) {
         if (Content.Id != Guid.Empty) e.Effect = DragDropEffects.None;
         else if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
 …
     private void jobsTreeView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         var obj = e.Data.GetData(Constants.DragDropDataFormat) as IItem;
+        var obj = (IItem)e.Data.GetData(Constants.DragDropDataFormat);
         IItem newObj = null;
         if (e.Effect.HasFlag(DragDropEffects.Copy)) {
           newObj = obj.Clone(new Cloner()) as IItem;
+          newObj = (IItem)obj.Clone();
         } else {
           newObj = obj;
 …
+        }
         if (newObj is IExecutable) {
           IExecutable exec = newObj as IExecutable;
+          IExecutable exec = (IExecutable)newObj;
           if (exec.ExecutionState != ExecutionState.Prepared) {
             exec.Prepare();

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 11576 for branches/OptimizationNetworks/HeuristicLab.Clients.Hive.JobManager

Legend:

Download in other formats: