Changeset 2999

Timestamp:

03/11/10 03:50:29 (14 years ago)

Author:

swagner

Message:

Fixed exception handling in TypeSelector (#906)

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -128 +128 @@
                   typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
                 }
-                catch (Exception) {
-                }
+                catch (Exception) { }
               }
               typeNode.SelectedImageIndex = typeNode.ImageIndex;
@@ -199 +198 @@
 
     public virtual object CreateInstanceOfSelectedType(params object[] args) {
-      if (SelectedType != null) {
-      try {
+      if (SelectedType == null)
+        throw new InvalidOperationException("No type selected.");
+      else
         return Activator.CreateInstance(SelectedType, args);
-      } catch(Exception) { }
-      }
-      return null;
     }
 
@@ -248 +245 @@
       TreeNode node = (TreeNode)e.Item;
       Type type = node.Tag as Type;
-      if (type != null) {
-        try {
-          object o = Activator.CreateInstance(type);
-          DataObject data = new DataObject();
-          data.SetData("Type", type);
-          data.SetData("Value", o);
-          DoDragDrop(data, DragDropEffects.Copy);
-        } catch (Exception) {
-        }
+      if ((type != null) && (!type.IsInterface) && (!type.IsAbstract) && (!type.HasElementType) && (!type.ContainsGenericParameters)) {
+        object o = Activator.CreateInstance(type);
+        DataObject data = new DataObject();
+        data.SetData("Type", type);
+        data.SetData("Value", o);
+        DoDragDrop(data, DragDropEffects.Copy);
       }
     }