Changeset 2713 for trunk/sources/HeuristicLab.Optimizer

Timestamp:

01/29/10 01:44:57 (15 years ago)

Author:

swagner

Message:

Adapted HL 3.3 plugins according to changes in MainForm (#857)

Location:

trunk/sources/HeuristicLab.Optimizer/3.3

Files:

• FileManager.cs (modified) (10 diffs)
• MenuItems/CloseAllMenuItem.cs (modified) (2 diffs)
• MenuItems/CloseMenuItem.cs (modified) (2 diffs)
• MenuItems/ExitMenuItem.cs (modified) (1 diff)
• MenuItems/NewMenuItem.cs (modified) (1 diff)
• MenuItems/OpenMenuItem.cs (modified) (1 diff)
• MenuItems/OperatorsMenuItem.cs (modified) (1 diff)
• MenuItems/SaveAllMenuItem.cs (modified) (2 diffs)
• MenuItems/SaveAsMenuItem.cs (modified) (2 diffs)
• MenuItems/SaveMenuItem.cs (modified) (2 diffs)
• ToolBarItems/SaveAllToolBarItem.cs (modified) (1 diff)
• ToolBarItems/SaveToolBarItem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimizer/3.3/FileManager.cs

@@ -32 +32 @@
     #endregion
 
-    private static Dictionary<IObjectView, FileInfo> files;
+    private static Dictionary<IContentView, FileInfo> files;
     private static NewItemDialog newItemDialog;
     private static OpenFileDialog openFileDialog;
@@ -40 +40 @@
 
     static FileManager() {
-      files = new Dictionary<IObjectView, FileInfo>();
+      files = new Dictionary<IContentView, FileInfo>();
       newItemDialog = null;
       openFileDialog = null;
@@ -56 +56 @@
           MessageBox.Show("There is no view for the new item. It cannot be displayed. ", "No View Available", MessageBoxButtons.OK, MessageBoxIcon.Error);
         } else {
-          if (view is IObjectView) {
+          if (view is IContentView) {
             view.Caption = "Item" + newDocumentsCounter.ToString() + ".hl";
             newDocumentsCounter++;
@@ -82 +82 @@
 
     public static void Save() {
-      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
-      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType()))) {
+      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
+      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType()))) {
         Save(activeView);
       }
     }
-    private static void Save(IObjectView view) {
+    private static void Save(IContentView view) {
       if ((!files.ContainsKey(view)) || (!File.Exists(files[view].Filename))) {
         SaveAs(view);
@@ -99 +99 @@
 
     public static void SaveAs() {
-      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
-      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType()))) {
+      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
+      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType()))) {
         SaveAs(activeView);
       }
     }
-    public static void SaveAs(IObjectView view) {
+    public static void SaveAs(IContentView view) {
       if (saveFileDialog == null) {
         saveFileDialog = new SaveFileDialog();
@@ -135 +135 @@
     public static void SaveAll() {
       var views = from v in MainFormManager.MainForm.Views
-                  where v is IObjectView
-                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
-                  select v as IObjectView;
-
-      foreach (IObjectView view in views) {
+                  where v is IContentView
+                  where CreatableAttribute.IsCreatable(((IContentView)v).Content.GetType())
+                  select v as IContentView;
+
+      foreach (IContentView view in views) {
         Save(view);
       }
@@ -146 +146 @@
     // NOTE: This event is fired by the main form. It is registered in HeuristicLabOptimizerApplication.
     internal static void ViewClosed(object sender, ViewEventArgs e) {
-      IObjectView view = e.View as IObjectView;
+      IContentView view = e.View as IContentView;
       if (view != null) files.Remove(view);
     }
@@ -159 +159 @@
     }
 
-    private static void SaveItemAsync(IObjectView view, string filename, int compression) {
+    private static void SaveItemAsync(IContentView view, string filename, int compression) {
       ThreadPool.QueueUserWorkItem(
         new WaitCallback(
@@ -166 +166 @@
               DisableView(view);
               SetWaitingCursor();
-              XmlGenerator.Serialize(view.Object, filename, compression);
+              XmlGenerator.Serialize(view.Content, filename, compression);
               Invoke(delegate() {
                 view.Caption = Path.GetFileName(filename);
@@ -191 +191 @@
               IItem item = (IItem)XmlParser.Deserialize(filename);
               Invoke(delegate() {
-                IObjectView view = MainFormManager.CreateDefaultView(item) as IObjectView;
+                IContentView view = MainFormManager.CreateDefaultView(item) as IContentView;
                 if (view == null) {
                   MessageBox.Show("There is no view for the loaded item. It cannot be displayed. ", "No View Available", MessageBoxButtons.OK, MessageBoxIcon.Error);

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/CloseAllMenuItem.cs

@@ -20 +20 @@
       get { return 1700; }
     }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.Text; }
-    }
 
     protected override void OnToolStripItemSet(EventArgs e) {
@@ -28 +25 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
+      ToolStripItem.Enabled = MainFormManager.MainForm.Views.Any<IView>(v => v.IsShown);
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs

@@ -20 +20 @@
       get { return 1600; }
     }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.Text; }
-    }
 
     protected override void OnToolStripItemSet(EventArgs e) {
@@ -28 +25 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
+      ToolStripItem.Enabled = MainFormManager.MainForm.ActiveView != null;
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/ExitMenuItem.cs

@@ -20 +20 @@
       get { return 1999; }
     }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.Text; }
-    }
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.X; }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/NewMenuItem.cs

@@ -19 +19 @@
       get { return 1100; }
     }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.ImageAndText; }
-    }
     public override Image Image {
       get { return Resources.NewIcon; }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/OpenMenuItem.cs

@@ -19 +19 @@
       get { return 1200; }
     }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.ImageAndText; }
-    }
     public override Image Image {
       get { return Resources.OpenIcon; }

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/OperatorsMenuItem.cs

@@ -24 +24 @@
     public override int Position {
       get { return 2100; }
-    }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.Text; }
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAllMenuItem.cs

@@ -22 +22 @@
       get { return 1500; }
     }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.ImageAndText; }
-    }
     public override Image Image {
       get { return Resources.SaveAllIcon; }
@@ -34 +31 @@
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
       var views = from v in MainFormManager.MainForm.Views
-                  where v is IObjectView
-                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
+                  where v is IContentView
+                  where CreatableAttribute.IsCreatable(((IContentView)v).Content.GetType())
                   select v;
       ToolStripItem.Enabled = views.FirstOrDefault() != null;

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveAsMenuItem.cs

@@ -22 +22 @@
       get { return 1400; }
     }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.ImageAndText; }
-    }
     public override Keys ShortCutKeys {
       get { return Keys.Control | Keys.Shift | Keys.S; }
@@ -33 +30 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
-      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
+      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType())));
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/MenuItems/SaveMenuItem.cs

@@ -22 +22 @@
       get { return 1300; }
     }
-    public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
-      get { return ToolStripItemDisplayStyle.ImageAndText; }
-    }
     public override Image Image {
       get { return Resources.SaveIcon; }
@@ -36 +33 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
-      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
+      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType())));
     }
 

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveAllToolBarItem.cs

@@ -31 +31 @@
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
       var views = from v in MainFormManager.MainForm.Views
-                  where v is IObjectView
-                  where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
+                  where v is IContentView
+                  where CreatableAttribute.IsCreatable(((IContentView)v).Content.GetType())
                   select v;
       ToolStripItem.Enabled = views.FirstOrDefault() != null;

trunk/sources/HeuristicLab.Optimizer/3.3/ToolBarItems/SaveToolBarItem.cs

@@ -30 +30 @@
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
-      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
+      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
+      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType())));
     }