Changeset 5837 for trunk/sources/HeuristicLab.Optimization.Views/3.3

Timestamp:

03/28/11 14:53:01 (14 years ago)

Author:

swagner

Message:

Implemented review comments of mkommend (#1112)

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• AlgorithmView.cs (modified) (2 diffs)
• BatchRunView.cs (modified) (2 diffs)
• RunCollectionBubbleChartView.cs (modified) (1 diff)
• RunCollectionView.cs (modified) (3 diffs)
• RunView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -278 +278 @@
     protected virtual void problemTabPage_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      if (!ReadOnly && (e.Data.GetData("HeuristicLab") != null) && Content.ProblemType.IsAssignableFrom(e.Data.GetData("HeuristicLab").GetType())) {
+      if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) != null) && Content.ProblemType.IsAssignableFrom(e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat).GetType())) {
         if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
@@ -288 +288 @@
     protected virtual void problemTabPage_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        IProblem problem = e.Data.GetData("HeuristicLab") as IProblem;
+        IProblem problem = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IProblem;
         if (e.Effect.HasFlag(DragDropEffects.Copy)) problem = (IProblem)problem.Clone();
         Content.Problem = problem;

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

@@ -253 +253 @@
     private void optimizerTabPage_DragEnterOver(object sender, DragEventArgs e) {
       e.Effect = DragDropEffects.None;
-      if (!ReadOnly && (e.Data.GetData("HeuristicLab") is IOptimizer)) {
+      if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IOptimizer)) {
         if ((e.KeyState & 32) == 32) e.Effect = DragDropEffects.Link;  // ALT key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
@@ -263 +263 @@
     private void optimizerTabPage_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        IOptimizer optimizer = e.Data.GetData("HeuristicLab") as IOptimizer;
+        IOptimizer optimizer = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as IOptimizer;
         if (e.Effect.HasFlag(DragDropEffects.Copy)) optimizer = (IOptimizer)optimizer.Clone();
         Content.Optimizer = optimizer;

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -493 +493 @@
         if (this.draggedRun != null && h.ChartElementType != ChartElementType.DataPoint) {
           DataObject data = new DataObject();
-          data.SetData("HeuristicLab", draggedRun);
+          data.SetData(HeuristicLab.Common.Constants.DragDropDataFormat, draggedRun);
           if (ReadOnly)
             DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -273 +273 @@
         if (items.Count > 0) {
           DataObject data = new DataObject();
-          if (items.Count == 1) data.SetData("HeuristicLab", items[0]);
-          else data.SetData("HeuristicLab", items);
+          if (items.Count == 1) data.SetData(HeuristicLab.Common.Constants.DragDropDataFormat, items[0]);
+          else data.SetData(HeuristicLab.Common.Constants.DragDropDataFormat, items);
           if (Content.IsReadOnly || ReadOnly) {
             DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
@@ -288 +288 @@
     private void itemsListView_DragEnter(object sender, DragEventArgs e) {
       validDragOperation = false;
-      if (e.Data.GetData("HeuristicLab") is IRun) {
+      if (!Content.IsReadOnly && !ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IRun)) {
         validDragOperation = true;
-      } else if (e.Data.GetData("HeuristicLab") is IEnumerable) {
+      } else if (!Content.IsReadOnly && !ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable)) {
         validDragOperation = true;
-        IEnumerable items = (IEnumerable)e.Data.GetData("HeuristicLab");
+        IEnumerable items = (IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
         foreach (object item in items)
           validDragOperation = validDragOperation && (item is IRun);
       }
-      validDragOperation = validDragOperation && !Content.IsReadOnly && !ReadOnly;
     }
     private void itemsListView_DragOver(object sender, DragEventArgs e) {
@@ -310 +309 @@
     private void itemsListView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        if (e.Data.GetData("HeuristicLab") is IRun) {
-          IRun item = (IRun)e.Data.GetData("HeuristicLab");
+        if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IRun) {
+          IRun item = (IRun)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
           Content.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (IRun)item.Clone() : item);
-        } else if (e.Data.GetData("HeuristicLab") is IEnumerable) {
-          IEnumerable<IRun> items = ((IEnumerable)e.Data.GetData("HeuristicLab")).Cast<IRun>();
+        } else if (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is IEnumerable) {
+          IEnumerable<IRun> items = ((IEnumerable)e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat)).Cast<IRun>();
           foreach (IRun item in items)
             Content.Add(e.Effect.HasFlag(DragDropEffects.Copy) ? (IRun)item.Clone() : item);

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunView.cs

@@ -149 +149 @@
         if (item != null) {
           DataObject data = new DataObject();
-          data.SetData("HeuristicLab", item);
+          data.SetData(HeuristicLab.Common.Constants.DragDropDataFormat, item);
           DragDropEffects result = DoDragDrop(data, DragDropEffects.Copy);
         }