Changeset 2456

Timestamp:

10/30/09 11:06:10 (15 years ago)

Author:

mkommend

Message:

implemented last changes in MainForm as discussed with SWA (ticket #771)

Location:

branches/Mainform refactoring

Files:

• HeuristicLab.MainForm.Test/3.2/EditorView.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/FormView.cs (modified) (1 diff)
• HeuristicLab.MainForm.Test/3.2/FormView2.cs (modified) (1 diff)
• HeuristicLab.MainForm.WindowsForms/3.2/ViewBase.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/DefaultViewAttribute.cs (copied) (copied from branches/Mainform refactoring/HeuristicLab.MainForm/3.2/DefaultView.cs) (1 diff)
• HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/Interfaces/IView.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.2/MainFormManager.cs (modified) (3 diffs)
• HeuristicLab.MainForm/3.2/UserInterfaceItemBase.cs (modified) (2 diffs)

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/EditorView.cs

@@ -11 +11 @@
 
 namespace HeuristicLab.MainForm.Test {
-  [DefaultView]
+  [DefaultViewAttribute]
   public partial class EditorView : ViewBase<ArrayList> {
     public EditorView() {

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView.cs

@@ -11 +11 @@
 
 namespace HeuristicLab.MainForm.Test {
-  [DefaultView]
+  [DefaultViewAttribute]
   public partial class FormView1 : ViewBase<ICollection> {
     private int[] array;

branches/Mainform refactoring/HeuristicLab.MainForm.Test/3.2/FormView2.cs

@@ -10 +10 @@
 
 namespace HeuristicLab.MainForm.Test {
-  public partial class FormView2 : ViewBase<IEnumerable>  {
+  public partial class FormView2 : ViewBase<IEnumerable> {
     private int[] array;
     public FormView2() {

branches/Mainform refactoring/HeuristicLab.MainForm.WindowsForms/3.2/ViewBase.cs

@@ -31 +31 @@
 namespace HeuristicLab.MainForm.WindowsForms {
   public partial class ViewBase<T> : UserControl, IView<T> {
-    protected T item;
+   
     public ViewBase() {
       InitializeComponent();
       item = default(T);
     }
+
+    private T item;
+    public virtual T Item {
+      get { return this.item; }
+      protected set { this.item = value; }
+    }
+
     public virtual void View(T item) {
     }

branches/Mainform refactoring/HeuristicLab.MainForm/3.2/DefaultViewAttribute.cs

@@ -26 +26 @@
 namespace HeuristicLab.MainForm {
   [AttributeUsage(AttributeTargets.Class)]
-  public class DefaultView : Attribute {
-    public DefaultView() {
+  public class DefaultViewAttribute : Attribute {
+    public DefaultViewAttribute() {
+    }
+
+    public static bool IsDefaultView(Type t) {
+      object[] attributes = t.GetCustomAttributes(typeof(DefaultViewAttribute), false);
+      return attributes != null && attributes.Length > 0;
     }
   }

branches/Mainform refactoring/HeuristicLab.MainForm/3.2/HeuristicLab.MainForm-3.2.csproj

@@ -92 +92 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UserInterfaceItemBase.cs" />
-    <Compile Include="DefaultView.cs" />
+    <Compile Include="DefaultViewAttribute.cs" />
   </ItemGroup>
   <ItemGroup>

branches/Mainform refactoring/HeuristicLab.MainForm/3.2/Interfaces/IUserInterfaceItem.cs

@@ -31 +31 @@
     int Position { get; }
     Image Image { get; }
-    string ToolTipText { get; set; }
+    string ToolTipText { get; }
 
     void Execute();

branches/Mainform refactoring/HeuristicLab.MainForm/3.2/Interfaces/IView.cs

@@ -36 +36 @@
   public interface IView<T> : IView {
     void View(T item);
+    T Item { get; }
   }
 }

branches/Mainform refactoring/HeuristicLab.MainForm/3.2/MainFormManager.cs

@@ -56 +56 @@
                 views[viewableType].Add(t);
 
-                object[] attributes = t.GetCustomAttributes(typeof(DefaultView), false);
-                if (attributes != null && attributes.Length == 1) {
+                if (DefaultViewAttribute.IsDefaultView(t)) {
                   if (defaultViews.ContainsKey(viewableType))
                     throw new ArgumentException("DefaultView for type " + viewableType + " is " + defaultViews[viewableType] +
@@ -74 +73 @@
       IEnumerable<Type> interfaceTypes =
        from type in t.GetInterfaces()
-       where type.Namespace == "HeuristicLab.MainForm" && type.Name.StartsWith("IView")  &&
+       where type.Namespace == "HeuristicLab.MainForm" && type.Name.StartsWith("IView") &&
              type.IsGenericType && !type.IsGenericTypeDefinition
        select type;
 
-      foreach (Type interfaceType in interfaceTypes) {      
-          yield return interfaceType.GetGenericArguments()[0];
+      foreach (Type interfaceType in interfaceTypes) {
+        yield return interfaceType.GetGenericArguments()[0];
       }
     }
@@ -105 +104 @@
 
     public static Type GetDefaultViewType(Type viewableType) {
+      //check if viewableType has a default view
       if (defaultViews.ContainsKey(viewableType))
         return defaultViews[viewableType];
-      else {
-        List<Type> temp = (from t in defaultViews.Keys
-                           where t.IsAssignableFrom(viewableType)
-                           select t).ToList();
-        //no assignable type found
-        if (temp.Count == 0)
-          return null;
-        //only one assignable type found => return this one
-        else if (temp.Count == 1)
-          return defaultViews[temp[0]];
-        //more assignable types found => sort the types according to their assignable types
-        //and return most specific type => except there is a conflict
-        else {
-          temp.Sort(delegate(Type t1, Type t2) {
-            if (t1.IsAssignableFrom(t2))
-              return 1;
-            else if (t2.IsAssignableFrom(t1))
-              return -1;
-            else
-              return 0;
-          }
-          );
-          if (temp[1].IsAssignableFrom(temp[0]))
-            return defaultViews[temp[0]];
-          else
-            throw new Exception("Could not determine which is the default view for type " + viewableType.ToString() + ".");
-        }
+
+      //check base classes for default view
+      Type type = viewableType;
+      while (type.BaseType != null && !defaultViews.ContainsKey(type)) {
+        type = type.BaseType;
       }
+      if (defaultViews.ContainsKey(type))
+        return defaultViews[type];
+
+      //check if exact one implemented interface has a default view
+      List<Type> temp = (from t in defaultViews.Keys
+                         where t.IsAssignableFrom(viewableType) && t.IsInterface
+                         select t).ToList();
+      if (temp.Count == 1)
+        return defaultViews[temp[0]];
+      //more than one default view for implemented interfaces are found
+      if (temp.Count > 1)
+        throw new Exception("Could not determine which is the default view for type " + viewableType.ToString() + ". Because more than one implemented interfaces have a default view.");
+      return null;
     }
 

branches/Mainform refactoring/HeuristicLab.MainForm/3.2/UserInterfaceItemBase.cs

@@ -28 +28 @@
   public abstract class UserInterfaceItemBase : IUserInterfaceItem{
     protected UserInterfaceItemBase() {
-      this.toolTipText = string.Empty;
     }
 
@@ -38 +37 @@
     }
 
-    protected string toolTipText;
-    public virtual string ToolTipText { 
-      get { return toolTipText; }
-      set { this.toolTipText = value; }
+    public virtual string ToolTipText {
+      get { return string.Empty; }
     }