Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2713 for trunk


Ignore:
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
Files:
3 deleted
50 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r2663 r2713  
    5454Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab 3.3", "HeuristicLab 3.3\HeuristicLab 3.3.csproj", "{B1DCDECA-B56E-41D5-9850-EF0D3A77DEAF}"
    5555  ProjectSection(ProjectDependencies) = postProject
     56    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC} = {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}
    5657    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943} = {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}
    5758    {E226881D-315F-423D-B419-A766FE0D8685} = {E226881D-315F-423D-B419-A766FE0D8685}
    … …  
    109110EndProject
    110111Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators.Views-3.3", "HeuristicLab.Operators.Views\3.3\HeuristicLab.Operators.Views-3.3.csproj", "{C49CB749-8B24-4628-8003-E86475749410}"
     112EndProject
     113Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm.Test-3.2", "HeuristicLab.MainForm.Test\3.2\HeuristicLab.MainForm.Test-3.2.csproj", "{569E430B-B4CE-4B94-A44E-6246B6E4E3BC}"
    111114EndProject
    112115Global
    … …  
    510513    {C49CB749-8B24-4628-8003-E86475749410}.Release|x64.ActiveCfg = Release|Any CPU
    511514    {C49CB749-8B24-4628-8003-E86475749410}.Release|x86.ActiveCfg = Release|Any CPU
     515    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     516    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
     517    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x64.ActiveCfg = Debug|x64
     518    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x64.Build.0 = Debug|x64
     519    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x86.ActiveCfg = Debug|x86
     520    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Debug|x86.Build.0 = Debug|x86
     521    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
     522    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|Any CPU.Build.0 = Release|Any CPU
     523    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x64.ActiveCfg = Release|x64
     524    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x64.Build.0 = Release|x64
     525    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.ActiveCfg = Release|x86
     526    {569E430B-B4CE-4B94-A44E-6246B6E4E3BC}.Release|x86.Build.0 = Release|x86
    512527  EndGlobalSection
    513528  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab 3.3/Files.txt

    r2663 r2713  
    1616HeuristicLab.Logging\3.3:HeuristicLab.Logging-3.3.dll
    1717HeuristicLab.MainForm\3.2:HeuristicLab.MainForm-3.2.dll
     18HeuristicLab.MainForm.Test\3.2:HeuristicLab.MainForm.Test-3.2.dll
    1819HeuristicLab.MainForm.WindowsForms\3.2:HeuristicLab.MainForm.WindowsForms-3.2.dll
    1920HeuristicLab.Operators\3.3:HeuristicLab.Operators-3.3.dll

  • trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.Designer.cs

    r2687 r2713  
    8787                  | System.Windows.Forms.AnchorStyles.Right)));
    8888      this.operatorGraphView.Caption = "Operator Graph";
    89       this.operatorGraphView.Item = null;
    9089      this.operatorGraphView.Location = new System.Drawing.Point(6, 6);
    9190      this.operatorGraphView.Name = "operatorGraphView";
    92       this.operatorGraphView.Object = null;
    93       this.operatorGraphView.OperatorGraph = null;
    9491      this.operatorGraphView.Size = new System.Drawing.Size(782, 573);
    9592      this.operatorGraphView.TabIndex = 0;
    … …  
    10198                  | System.Windows.Forms.AnchorStyles.Right)));
    10299      this.scopeView.Caption = "Scope";
    103       this.scopeView.Item = null;
    104100      this.scopeView.Location = new System.Drawing.Point(6, 6);
    105101      this.scopeView.Name = "scopeView";
    106       this.scopeView.Object = null;
    107       this.scopeView.Scope = null;
    108102      this.scopeView.Size = new System.Drawing.Size(782, 573);
    109103      this.scopeView.TabIndex = 0;

  • trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.cs

    r2676 r2713  
    4343    /// </summary>
    4444    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="EditorBase"/>.</remarks>
    45     public Engine Engine {
    46       get { return (Engine)Item; }
    47       set { base.Item = value; }
     45    public new Engine Content {
     46      get { return (Engine)base.Content; }
     47      set { base.Content = value; }
    4848    }
    4949
    … …  
    5656    public EngineView(Engine engine)
    5757      : this() {
    58       Engine = engine;
     58      Content = engine;
    5959    }
    6060
    … …  
    6363    /// </summary>
    6464    /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    65     protected override void DeregisterObjectEvents() {
    66       Engine.OperatorGraphChanged -= new EventHandler(Engine_OperatorGraphChanged);
    67       Engine.Initialized -= new EventHandler(Engine_Initialized);
    68       Engine.Started -= new EventHandler(Engine_Started);
    69       Engine.Stopped -= new EventHandler(Engine_Stopped);
    70       Engine.ExecutionTimeChanged -= new EventHandler(Engine_ExecutionTimeChanged);
    71       Engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
    72       base.DeregisterObjectEvents();
     65    protected override void DeregisterContentEvents() {
     66      Content.OperatorGraphChanged -= new EventHandler(Content_OperatorGraphChanged);
     67      Content.Initialized -= new EventHandler(Content_Initialized);
     68      Content.Started -= new EventHandler(Content_Started);
     69      Content.Stopped -= new EventHandler(Content_Stopped);
     70      Content.ExecutionTimeChanged -= new EventHandler(Content_ExecutionTimeChanged);
     71      Content.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
     72      base.DeregisterContentEvents();
    7373    }
    7474
    … …  
    7777    /// </summary>
    7878    /// <remarks>Calls <see cref="ViewBase.AddItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    79     protected override void RegisterObjectEvents() {
    80       base.RegisterObjectEvents();
    81       Engine.OperatorGraphChanged += new EventHandler(Engine_OperatorGraphChanged);
    82       Engine.Initialized += new EventHandler(Engine_Initialized);
    83       Engine.Started += new EventHandler(Engine_Started);
    84       Engine.Stopped += new EventHandler(Engine_Stopped);
    85       Engine.ExecutionTimeChanged += new EventHandler(Engine_ExecutionTimeChanged);
    86       Engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
     79    protected override void RegisterContentEvents() {
     80      base.RegisterContentEvents();
     81      Content.OperatorGraphChanged += new EventHandler(Content_OperatorGraphChanged);
     82      Content.Initialized += new EventHandler(Content_Initialized);
     83      Content.Started += new EventHandler(Content_Started);
     84      Content.Stopped += new EventHandler(Content_Stopped);
     85      Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
     86      Content.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred);
    8787    }
    8888
    … …  
    9191    /// </summary>
    9292    /// <remarks>Calls <see cref="EditorBase.UpdateControls"/> of base class <see cref="EditorBase"/>.</remarks>
    93     protected override void OnObjectChanged() {
    94       base.OnObjectChanged();
     93    protected override void OnContentChanged() {
     94      base.OnContentChanged();
    9595      stopButton.Enabled = false;
    96       if (Engine == null) {
     96      if (Content == null) {
    9797        operatorGraphView.Enabled = false;
    9898        scopeView.Enabled = false;
    … …  
    101101        executionTimeTextBox.Enabled = false;
    102102      } else {
    103         operatorGraphView.OperatorGraph = Engine.OperatorGraph;
    104         scopeView.Scope = Engine.GlobalScope;
    105         startButton.Enabled = !Engine.Finished;
     103        operatorGraphView.Content = Content.OperatorGraph;
     104        scopeView.Content = Content.GlobalScope;
     105        startButton.Enabled = !Content.Finished;
    106106        resetButton.Enabled = true;
    107107        UpdateExecutionTimeTextBox();
    … …  
    110110    }
    111111
    112     #region Engine Events
    113     protected virtual void Engine_OperatorGraphChanged(object sender, EventArgs e) {
     112    #region Content Events
     113    protected virtual void Content_OperatorGraphChanged(object sender, EventArgs e) {
    114114      if (InvokeRequired)
    115         Invoke(new EventHandler(Engine_OperatorGraphChanged), sender, e);
     115        Invoke(new EventHandler(Content_OperatorGraphChanged), sender, e);
    116116      else
    117         operatorGraphView.OperatorGraph = Engine.OperatorGraph;
     117        operatorGraphView.Content = Content.OperatorGraph;
    118118    }
    119     protected virtual void Engine_Initialized(object sender, EventArgs e) {
     119    protected virtual void Content_Initialized(object sender, EventArgs e) {
    120120      if (InvokeRequired)
    121         Invoke(new EventHandler(Engine_Initialized), sender, e);
     121        Invoke(new EventHandler(Content_Initialized), sender, e);
    122122      else {
    123123        operatorGraphView.Enabled = true;
    124124        scopeView.Enabled = true;
    125         startButton.Enabled = !Engine.Finished;
     125        startButton.Enabled = !Content.Finished;
    126126        stopButton.Enabled = false;
    127127        resetButton.Enabled = true;
    … …  
    129129      }
    130130    }
    131     protected virtual void Engine_Started(object sender, EventArgs e) {
     131    protected virtual void Content_Started(object sender, EventArgs e) {
    132132      executionTimeCounter = 0;
    133133      if (InvokeRequired)
    134         Invoke(new EventHandler(Engine_Started), sender, e);
     134        Invoke(new EventHandler(Content_Started), sender, e);
    135135      else {
    136136        operatorGraphView.Enabled = false;
    … …  
    142142      }
    143143    }
    144     protected virtual void Engine_Stopped(object sender, EventArgs e) {
     144    protected virtual void Content_Stopped(object sender, EventArgs e) {
    145145      if (InvokeRequired)
    146         Invoke(new EventHandler(Engine_Stopped), sender, e);
     146        Invoke(new EventHandler(Content_Stopped), sender, e);
    147147      else {
    148148        operatorGraphView.Enabled = true;
    149149        scopeView.Enabled = true;
    150         startButton.Enabled = !Engine.Finished;
     150        startButton.Enabled = !Content.Finished;
    151151        stopButton.Enabled = false;
    152152        resetButton.Enabled = true;
    … …  
    154154      }
    155155    }
    156     protected virtual void Engine_ExecutionTimeChanged(object sender, EventArgs e) {
     156    protected virtual void Content_ExecutionTimeChanged(object sender, EventArgs e) {
    157157      executionTimeCounter++;
    158       if ((executionTimeCounter == 100) || !Engine.Running) {
     158      if ((executionTimeCounter == 100) || !Content.Running) {
    159159        executionTimeCounter = 0;
    160160        UpdateExecutionTimeTextBox();
    161161      }
    162162    }
    163     protected virtual void Engine_ExceptionOccurred(object sender, EventArgs<Exception> e) {
     163    protected virtual void Content_ExceptionOccurred(object sender, EventArgs<Exception> e) {
    164164      if (InvokeRequired)
    165         Invoke(new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred), sender, e);
     165        Invoke(new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred), sender, e);
    166166      else
    167167        Auxiliary.ShowErrorMessageBox(e.Value);
    … …  
    171171    #region Button events
    172172    protected virtual void startButton_Click(object sender, EventArgs e) {
    173       Engine.Start();
     173      Content.Start();
    174174    }
    175175    protected virtual void stopButton_Click(object sender, EventArgs e) {
    176       Engine.Stop();
     176      Content.Stop();
    177177    }
    178178    protected virtual void resetButton_Click(object sender, EventArgs e) {
    179       Engine.Initialize();
     179      Content.Initialize();
    180180    }
    181181    #endregion
    … …  
    186186        Invoke(new Action(UpdateExecutionTimeTextBox));
    187187      else
    188         executionTimeTextBox.Text = Engine.ExecutionTime.ToString();
     188        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
    189189    }
    190190    #endregion

  • trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

    r2684 r2713  
    8383      <DependentUpon>NamedItemView.cs</DependentUpon>
    8484    </Compile>
    85     <Compile Include="ObjectView.cs">
    86       <SubType>UserControl</SubType>
    87     </Compile>
    88     <Compile Include="ObjectView.Designer.cs">
    89       <DependentUpon>ObjectView.cs</DependentUpon>
    90     </Compile>
    9185    <Compile Include="OperatorGraphView.cs">
    9286      <SubType>UserControl</SubType>
    … …  
    167161      <DependentUpon>ItemListView.cs</DependentUpon>
    168162    </Compile>
    169     <Compile Include="IObjectView.cs" />
    170163    <Compile Include="ParameterView.cs">
    171164      <SubType>UserControl</SubType>

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs

    r2676 r2713  
    194194      this.viewHost.Location = new System.Drawing.Point(6, 19);
    195195      this.viewHost.Name = "viewHost";
    196       this.viewHost.Object = null;
     196      this.viewHost.Content = null;
    197197      this.viewHost.Size = new System.Drawing.Size(254, 310);
    198198      this.viewHost.TabIndex = 0;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

    r2708 r2713  
    3030using HeuristicLab.Common;
    3131using HeuristicLab.MainForm;
     32using HeuristicLab.MainForm.WindowsForms;
    3233
    3334namespace HeuristicLab.Core.Views {
    34   public partial class ItemCollectionView<T> : ObjectView where T : class, IItem {
    35     public IObservableCollection<T> ItemCollection {
    36       get { return (IObservableCollection<T>)Object; }
    37       set { base.Object = value; }
     35  public partial class ItemCollectionView<T> : ContentView where T : class, IItem {
     36    public new IObservableCollection<T> Content {
     37      get { return (IObservableCollection<T>)base.Content; }
     38      set { base.Content = value; }
    3839    }
    3940
    … …  
    4748    }
    4849
    49     protected override void DeregisterObjectEvents() {
    50       ItemCollection.ItemsAdded -= new CollectionItemsChangedEventHandler<T>(ItemCollection_ItemsAdded);
    51       ItemCollection.ItemsRemoved -= new CollectionItemsChangedEventHandler<T>(ItemCollection_ItemsRemoved);
    52       ItemCollection.CollectionReset -= new CollectionItemsChangedEventHandler<T>(ItemCollection_CollectionReset);
    53       base.DeregisterObjectEvents();
    54     }
    55     protected override void RegisterObjectEvents() {
    56       base.RegisterObjectEvents();
    57       ItemCollection.ItemsAdded += new CollectionItemsChangedEventHandler<T>(ItemCollection_ItemsAdded);
    58       ItemCollection.ItemsRemoved += new CollectionItemsChangedEventHandler<T>(ItemCollection_ItemsRemoved);
    59       ItemCollection.CollectionReset += new CollectionItemsChangedEventHandler<T>(ItemCollection_CollectionReset);
    60     }
    61 
    62     protected override void OnObjectChanged() {
    63       base.OnObjectChanged();
     50    protected override void DeregisterContentEvents() {
     51      Content.ItemsAdded -= new CollectionItemsChangedEventHandler<T>(Content_ItemsAdded);
     52      Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved);
     53      Content.CollectionReset -= new CollectionItemsChangedEventHandler<T>(Content_CollectionReset);
     54      base.DeregisterContentEvents();
     55    }
     56    protected override void RegisterContentEvents() {
     57      base.RegisterContentEvents();
     58      Content.ItemsAdded += new CollectionItemsChangedEventHandler<T>(Content_ItemsAdded);
     59      Content.ItemsRemoved += new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved);
     60      Content.CollectionReset += new CollectionItemsChangedEventHandler<T>(Content_CollectionReset);
     61    }
     62
     63    protected override void OnContentChanged() {
     64      base.OnContentChanged();
    6465      Caption = "Item Collection";
    6566      while (itemsListView.Items.Count > 0) RemoveListViewItem(itemsListView.Items[0]);
    6667      itemsListView.Enabled = false;
    6768      detailsGroupBox.Enabled = false;
    68       viewHost.Object = null;
     69      viewHost.Content = null;
    6970      addButton.Enabled = false;
    7071      sortAscendingButton.Enabled = false;
    … …  
    7273      removeButton.Enabled = false;
    7374
    74       if (ItemCollection != null) {
    75         Caption += " (" + ItemCollection.GetType().Name + ")";
     75      if (Content != null) {
     76        Caption += " (" + Content.GetType().Name + ")";
    7677        itemsListView.Enabled = true;
    77         addButton.Enabled = !ItemCollection.IsReadOnly;
    78         foreach (T item in ItemCollection)
     78        addButton.Enabled = !Content.IsReadOnly;
     79        foreach (T item in Content)
    7980          AddListViewItem(CreateListViewItem(item));
    8081        sortAscendingButton.Enabled = itemsListView.Items.Count > 0;
    … …  
    130131    #region ListView Events
    131132    protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
    132       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !ItemCollection.IsReadOnly;
     133      removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !Content.IsReadOnly;
    133134      if (itemsListView.SelectedItems.Count == 1) {
    134135        T item = (T)itemsListView.SelectedItems[0].Tag;
    135         viewHost.Object = item;
     136        viewHost.Content = item;
    136137        detailsGroupBox.Enabled = true;
    137138      } else {
    138         viewHost.Object = null;
     139        viewHost.Content = null;
    139140        detailsGroupBox.Enabled = false;
    140141      }
    … …  
    146147    protected virtual void itemsListView_KeyDown(object sender, KeyEventArgs e) {
    147148      if (e.KeyCode == Keys.Delete) {
    148         if ((itemsListView.SelectedItems.Count > 0) && !ItemCollection.IsReadOnly) {
     149        if ((itemsListView.SelectedItems.Count > 0) && !Content.IsReadOnly) {
    149150          foreach (ListViewItem item in itemsListView.SelectedItems)
    150             ItemCollection.Remove((T)item.Tag);
     151            Content.Remove((T)item.Tag);
    151152        }
    152153      }
    … …  
    165166      data.SetData("Type", item.GetType());
    166167      data.SetData("Value", item);
    167       if (ItemCollection.IsReadOnly) {
     168      if (Content.IsReadOnly) {
    168169        DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
    169170      } else {
    170171        DragDropEffects result = DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link | DragDropEffects.Move);
    171172        if ((result & DragDropEffects.Move) == DragDropEffects.Move)
    172           ItemCollection.Remove(item);
     173          Content.Remove(item);
    173174      }
    174175    }
    … …  
    176177      e.Effect = DragDropEffects.None;
    177178      Type type = e.Data.GetData("Type") as Type;
    178       if ((!ItemCollection.IsReadOnly) && (type != null) && (typeof(T).IsAssignableFrom(type))) {
     179      if ((!Content.IsReadOnly) && (type != null) && (typeof(T).IsAssignableFrom(type))) {
    179180        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
    180181        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    … …  
    188189        T item = e.Data.GetData("Value") as T;
    189190        if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) item = (T)item.Clone();
    190         ItemCollection.Add(item);
     191        Content.Add(item);
    191192      }
    192193    }
    … …  
    197198      T item = CreateItem();
    198199      if (item != null)
    199         ItemCollection.Add(item);
     200        Content.Add(item);
    200201    }
    201202    protected virtual void sortAscendingButton_Click(object sender, EventArgs e) {
    … …  
    208209      if (itemsListView.SelectedItems.Count > 0) {
    209210        foreach (ListViewItem item in itemsListView.SelectedItems)
    210           ItemCollection.Remove((T)item.Tag);
     211          Content.Remove((T)item.Tag);
    211212        itemsListView.SelectedItems.Clear();
    212213      }
    … …  
    214215    #endregion
    215216
    216     #region ItemCollection Events
    217     protected virtual void ItemCollection_ItemsAdded(object sender, CollectionItemsChangedEventArgs<T> e) {
    218       if (InvokeRequired)
    219         Invoke(new CollectionItemsChangedEventHandler<T>(ItemCollection_ItemsAdded), sender, e);
     217    #region Content Events
     218    protected virtual void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<T> e) {
     219      if (InvokeRequired)
     220        Invoke(new CollectionItemsChangedEventHandler<T>(Content_ItemsAdded), sender, e);
    220221      else
    221222        foreach (T item in e.Items)
    222223          AddListViewItem(CreateListViewItem(item));
    223224    }
    224     protected virtual void ItemCollection_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<T> e) {
    225       if (InvokeRequired)
    226         Invoke(new CollectionItemsChangedEventHandler<T>(ItemCollection_ItemsRemoved), sender, e);
     225    protected virtual void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<T> e) {
     226      if (InvokeRequired)
     227        Invoke(new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved), sender, e);
    227228      else {
    228229        foreach (T item in e.Items) {
    … …  
    234235      }
    235236    }
    236     protected virtual void ItemCollection_CollectionReset(object sender, CollectionItemsChangedEventArgs<T> e) {
    237       if (InvokeRequired)
    238         Invoke(new CollectionItemsChangedEventHandler<T>(ItemCollection_CollectionReset), sender, e);
     237    protected virtual void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<T> e) {
     238      if (InvokeRequired)
     239        Invoke(new CollectionItemsChangedEventHandler<T>(Content_CollectionReset), sender, e);
    239240      else {
    240241        foreach (T item in e.OldItems) {

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs

    r2676 r2713  
    192192      this.viewHost.Location = new System.Drawing.Point(6, 19);
    193193      this.viewHost.Name = "viewHost";
    194       this.viewHost.Object = null;
     194      this.viewHost.Content = null;
    195195      this.viewHost.Size = new System.Drawing.Size(271, 269);
    196196      this.viewHost.TabIndex = 0;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

    r2708 r2713  
    3030using HeuristicLab.Common;
    3131using HeuristicLab.MainForm;
     32using HeuristicLab.MainForm.WindowsForms;
    3233
    3334namespace HeuristicLab.Core.Views {
    … …  
    3536  /// The visual representation of all variables in a specified scope.
    3637  /// </summary>
    37   public partial class ItemListView<T> : ObjectView where T : class, IItem {
     38  public partial class ItemListView<T> : ContentView where T : class, IItem {
    3839    /// <summary>
    3940    /// Gets or sets the scope whose variables to represent visually.
    … …  
    4142    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
    4243    /// No won data storage present.</remarks>
    43     public IObservableList<T> ItemList {
    44       get { return (IObservableList<T>)Object; }
    45       set { base.Object = value; }
     44    public new IObservableList<T> Content {
     45      get { return (IObservableList<T>)base.Content; }
     46      set { base.Content = value; }
    4647    }
    4748
    … …  
    6263    /// </summary>
    6364    /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    64     protected override void DeregisterObjectEvents() {
    65       ItemList.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsAdded);
    66       ItemList.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsRemoved);
    67       ItemList.ItemsReplaced -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsReplaced);
    68       ItemList.ItemsMoved -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsMoved);
    69       ItemList.CollectionReset -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_CollectionReset);
    70       base.DeregisterObjectEvents();
     65    protected override void DeregisterContentEvents() {
     66      Content.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsAdded);
     67      Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsRemoved);
     68      Content.ItemsReplaced -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsReplaced);
     69      Content.ItemsMoved -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsMoved);
     70      Content.CollectionReset -= new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_CollectionReset);
     71      base.DeregisterContentEvents();
    7172    }
    7273
    … …  
    7576    /// </summary>
    7677    /// <remarks>Calls <see cref="ViewBase.AddItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    77     protected override void RegisterObjectEvents() {
    78       base.RegisterObjectEvents();
    79       ItemList.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsAdded);
    80       ItemList.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsRemoved);
    81       ItemList.ItemsReplaced += new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsReplaced);
    82       ItemList.ItemsMoved += new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsMoved);
    83       ItemList.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_CollectionReset);
    84     }
    85 
    86     protected override void OnObjectChanged() {
    87       base.OnObjectChanged();
     78    protected override void RegisterContentEvents() {
     79      base.RegisterContentEvents();
     80      Content.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsAdded);
     81      Content.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsRemoved);
     82      Content.ItemsReplaced += new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsReplaced);
     83      Content.ItemsMoved += new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsMoved);
     84      Content.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_CollectionReset);
     85    }
     86
     87    protected override void OnContentChanged() {
     88      base.OnContentChanged();
    8889      Caption = "Item List";
    8990      while (itemsListView.Items.Count > 0) RemoveListViewItem(itemsListView.Items[0]);
    9091      itemsListView.Enabled = false;
    9192      detailsGroupBox.Enabled = false;
    92       viewHost.Object = null;
     93      viewHost.Content = null;
    9394      addButton.Enabled = false;
    9495      moveUpButton.Enabled = false;
    … …  
    9697      removeButton.Enabled = false;
    9798
    98       if (ItemList != null) {
    99         Caption += " (" + ItemList.GetType().Name + ")";
     99      if (Content != null) {
     100        Caption += " (" + Content.GetType().Name + ")";
    100101        itemsListView.Enabled = true;
    101         addButton.Enabled = !ItemList.IsReadOnly;
    102         foreach (T item in ItemList)
     102        addButton.Enabled = !Content.IsReadOnly;
     103        foreach (T item in Content)
    103104          AddListViewItem(CreateListViewItem(item));
    104105      }
    … …  
    150151      moveUpButton.Enabled = itemsListView.SelectedItems.Count == 1 &&
    151152                             itemsListView.SelectedIndices[0] != 0 &&
    152                              !ItemList.IsReadOnly;
     153                             !Content.IsReadOnly;
    153154      moveDownButton.Enabled = itemsListView.SelectedItems.Count == 1 &&
    154155                               itemsListView.SelectedIndices[0] != itemsListView.Items.Count - 1 &&
    155                                !ItemList.IsReadOnly;
     156                               !Content.IsReadOnly;
    156157      removeButton.Enabled = itemsListView.SelectedItems.Count > 0 &&
    157                              !ItemList.IsReadOnly;
     158                             !Content.IsReadOnly;
    158159
    159160      if (itemsListView.SelectedItems.Count == 1) {
    160161        T item = (T)itemsListView.SelectedItems[0].Tag;
    161         viewHost.Object = item;
     162        viewHost.Content = item;
    162163        detailsGroupBox.Enabled = true;
    163164      } else {
    164         viewHost.Object = null;
     165        viewHost.Content = null;
    165166        detailsGroupBox.Enabled = false;
    166167      }
    … …  
    175176    protected virtual void itemsListView_KeyDown(object sender, KeyEventArgs e) {
    176177      if (e.KeyCode == Keys.Delete) {
    177         if ((itemsListView.SelectedItems.Count > 0) && !ItemList.IsReadOnly) {
     178        if ((itemsListView.SelectedItems.Count > 0) && !Content.IsReadOnly) {
    178179          foreach (ListViewItem item in itemsListView.SelectedItems)
    179             ItemList.RemoveAt(item.Index);
     180            Content.RemoveAt(item.Index);
    180181        }
    181182      }
    … …  
    196197      data.SetData("Type", item.GetType());
    197198      data.SetData("Value", item);
    198       if (ItemList.IsReadOnly) {
     199      if (Content.IsReadOnly) {
    199200        DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link);
    200201      } else {
    201202        DragDropEffects result = DoDragDrop(data, DragDropEffects.Copy | DragDropEffects.Link | DragDropEffects.Move);
    202203        if ((result & DragDropEffects.Move) == DragDropEffects.Move)
    203           ItemList.RemoveAt(listViewItem.Index);
     204          Content.RemoveAt(listViewItem.Index);
    204205      }
    205206    }
    … …  
    207208      e.Effect = DragDropEffects.None;
    208209      Type type = e.Data.GetData("Type") as Type;
    209       if ((!ItemList.IsReadOnly) && (type != null) && (typeof(T).IsAssignableFrom(type))) {
     210      if ((!Content.IsReadOnly) && (type != null) && (typeof(T).IsAssignableFrom(type))) {
    210211        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
    211212        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    … …  
    222223        Point p = itemsListView.PointToClient(new Point(e.X, e.Y));
    223224        ListViewItem listViewItem = itemsListView.GetItemAt(p.X, p.Y);
    224         if (listViewItem != null) ItemList.Insert(listViewItem.Index, item);
    225         else ItemList.Add(item);
     225        if (listViewItem != null) Content.Insert(listViewItem.Index, item);
     226        else Content.Add(item);
    226227      }
    227228    }
    … …  
    232233      T item = CreateItem();
    233234      if (item != null)
    234         ItemList.Add(item);
     235        Content.Add(item);
    235236    }
    236237    protected virtual void moveUpButton_Click(object sender, EventArgs e) {
    237238      if (itemsListView.SelectedItems.Count == 1) {
    238239        int index = itemsListView.SelectedIndices[0];
    239         T item = ItemList[index - 1];
    240         ItemList[index - 1] = ItemList[index];
     240        T item = Content[index - 1];
     241        Content[index - 1] = Content[index];
    241242        itemsListView.Items[index].Selected = false;
    242243        itemsListView.Items[index - 1].Selected = true;
    243         ItemList[index] = item;
     244        Content[index] = item;
    244245      }
    245246    }
    … …  
    247248      if (itemsListView.SelectedItems.Count == 1) {
    248249        int index = itemsListView.SelectedIndices[0];
    249         T item = ItemList[index + 1];
    250         ItemList[index + 1] = ItemList[index];
     250        T item = Content[index + 1];
     251        Content[index + 1] = Content[index];
    251252        itemsListView.Items[index].Selected = false;
    252253        itemsListView.Items[index + 1].Selected = true;
    253         ItemList[index] = item;
     254        Content[index] = item;
    254255      }
    255256    }
    … …  
    257258      if (itemsListView.SelectedItems.Count > 0) {
    258259        foreach (ListViewItem item in itemsListView.SelectedItems)
    259           ItemList.RemoveAt(item.Index);
     260          Content.RemoveAt(item.Index);
    260261      }
    261262    }
    262263    #endregion
    263264
    264     #region NamedItemCollection Events
    265     protected virtual void ItemList_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
    266       if (InvokeRequired)
    267         Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsAdded), sender, e);
     265    #region Content Events
     266    protected virtual void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
     267      if (InvokeRequired)
     268        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsAdded), sender, e);
    268269      else
    269270        foreach (IndexedItem<T> item in e.Items)
    270271          InsertListViewItem(item.Index, CreateListViewItem(item.Value));
    271272    }
    272     protected virtual void ItemList_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
    273       if (InvokeRequired)
    274         Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsRemoved), sender, e);
     273    protected virtual void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
     274      if (InvokeRequired)
     275        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsRemoved), sender, e);
    275276      else {
    276277        List<ListViewItem> listViewItems = new List<ListViewItem>();
    … …  
    281282      }
    282283    }
    283     protected virtual void ItemList_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
    284       if (InvokeRequired)
    285         Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsReplaced), sender, e);
     284    protected virtual void Content_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
     285      if (InvokeRequired)
     286        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsReplaced), sender, e);
    286287      else {
    287288        int[] selected = new int[itemsListView.SelectedIndices.Count];
    … …  
    301302      }
    302303    }
    303     protected virtual void ItemList_ItemsMoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
    304       if (InvokeRequired)
    305         Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_ItemsMoved), sender, e);
     304    protected virtual void Content_ItemsMoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
     305      if (InvokeRequired)
     306        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_ItemsMoved), sender, e);
    306307      else {
    307308        foreach (IndexedItem<T> item in e.Items) {
    … …  
    312313      }
    313314    }
    314     protected virtual void ItemList_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
    315       if (InvokeRequired)
    316         Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(ItemList_CollectionReset), sender, e);
     315    protected virtual void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<T>> e) {
     316      if (InvokeRequired)
     317        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<T>>(Content_CollectionReset), sender, e);
    317318      else {
    318319        List<ListViewItem> listViewItems = new List<ListViewItem>();

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemParameterView.Designer.cs

    r2676 r2713  
    124124      this.viewHost.Location = new System.Drawing.Point(0, 0);
    125125      this.viewHost.Name = "viewHost";
    126       this.viewHost.Object = null;
     126      this.viewHost.Content = null;
    127127      this.viewHost.Size = new System.Drawing.Size(374, 115);
    128128      this.viewHost.TabIndex = 0;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemParameterView.cs

    r2694 r2713  
    4242    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
    4343    /// No own data storage present.</remarks>
    44     public new ItemParameter Parameter {
    45       get { return (ItemParameter)Item; }
    46       set { base.Item = value; }
     44    public new ItemParameter Content {
     45      get { return (ItemParameter)base.Content; }
     46      set { base.Content = value; }
    4747    }
    4848
    … …  
    6161    public ItemParameterView(ItemParameter parameter)
    6262      : this() {
    63       Parameter = parameter;
     63      Content = parameter;
    6464    }
    6565
    … …  
    6868    /// </summary>
    6969    /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    70     protected override void DeregisterObjectEvents() {
    71       Parameter.ActualNameChanged -= new EventHandler(Parameter_ActualNameChanged);
    72       Parameter.ValueChanged -= new EventHandler(Parameter_ValueChanged);
    73       base.DeregisterObjectEvents();
     70    protected override void DeregisterContentEvents() {
     71      Content.ActualNameChanged -= new EventHandler(Content_ActualNameChanged);
     72      Content.ValueChanged -= new EventHandler(Content_ValueChanged);
     73      base.DeregisterContentEvents();
    7474    }
    7575
    … …  
    7878    /// </summary>
    7979    /// <remarks>Calls <see cref="ViewBase.AddItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    80     protected override void RegisterObjectEvents() {
    81       base.RegisterObjectEvents();
    82       Parameter.ActualNameChanged += new EventHandler(Parameter_ActualNameChanged);
    83       Parameter.ValueChanged += new EventHandler(Parameter_ValueChanged);
     80    protected override void RegisterContentEvents() {
     81      base.RegisterContentEvents();
     82      Content.ActualNameChanged += new EventHandler(Content_ActualNameChanged);
     83      Content.ValueChanged += new EventHandler(Content_ValueChanged);
    8484    }
    8585
    86     protected override void OnObjectChanged() {
    87       base.OnObjectChanged();
    88       if (Parameter == null) {
     86    protected override void OnContentChanged() {
     87      base.OnContentChanged();
     88      if (Content == null) {
    8989        Caption = "Parameter";
    9090        actualNameTextBox.Text = "-";
    … …  
    9393        clearValueButton.Enabled = false;
    9494        valueGroupBox.Enabled = false;
    95         viewHost.Object = null;
     95        viewHost.Content = null;
    9696      } else {
    97         Caption = Parameter.Name + " (" + Parameter.GetType().Name + ")";
    98         actualNameTextBox.Text = Parameter.ActualName;
    99         actualNameTextBox.Enabled = Parameter.Value == null;
    100         setValueButton.Enabled = Parameter.Value == null;
    101         clearValueButton.Enabled = Parameter.Value != null;
     97        Caption = Content.Name + " (" + Content.GetType().Name + ")";
     98        actualNameTextBox.Text = Content.ActualName;
     99        actualNameTextBox.Enabled = Content.Value == null;
     100        setValueButton.Enabled = Content.Value == null;
     101        clearValueButton.Enabled = Content.Value != null;
    102102        valueGroupBox.Enabled = true;
    103         viewHost.Object = Parameter.Value;
     103        viewHost.Content = Content.Value;
    104104      }
    105105    }
    106106
    107     protected virtual void Parameter_ActualNameChanged(object sender, EventArgs e) {
     107    protected virtual void Content_ActualNameChanged(object sender, EventArgs e) {
    108108      if (InvokeRequired)
    109         Invoke(new EventHandler(Parameter_ActualNameChanged), sender, e);
     109        Invoke(new EventHandler(Content_ActualNameChanged), sender, e);
    110110      else
    111         actualNameTextBox.Text = Parameter.ActualName;
     111        actualNameTextBox.Text = Content.ActualName;
    112112    }
    113     protected virtual void Parameter_ValueChanged(object sender, EventArgs e) {
     113    protected virtual void Content_ValueChanged(object sender, EventArgs e) {
    114114      if (InvokeRequired)
    115         Invoke(new EventHandler(Parameter_ValueChanged), sender, e);
     115        Invoke(new EventHandler(Content_ValueChanged), sender, e);
    116116      else {
    117         actualNameTextBox.Enabled = Parameter.Value == null;
    118         setValueButton.Enabled = Parameter.Value == null;
    119         clearValueButton.Enabled = Parameter.Value != null;
    120         viewHost.Object = Parameter.Value;
     117        actualNameTextBox.Enabled = Content.Value == null;
     118        setValueButton.Enabled = Content.Value == null;
     119        clearValueButton.Enabled = Content.Value != null;
     120        viewHost.Content = Content.Value;
    121121      }
    122122    }
    123123
    124124    protected virtual void actualNameTextBox_Validated(object sender, EventArgs e) {
    125       Parameter.ActualName = actualNameTextBox.Text;
     125      Content.ActualName = actualNameTextBox.Text;
    126126    }
    127127    protected virtual void setValueButton_Click(object sender, EventArgs e) {
    … …  
    130130        typeSelectorDialog.Caption = "Select Value Type";
    131131      }
    132       typeSelectorDialog.TypeSelector.Configure(Parameter.DataType, false, false);
     132      typeSelectorDialog.TypeSelector.Configure(Content.DataType, false, false);
    133133      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK)
    134         Parameter.Value = (IItem)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
     134        Content.Value = (IItem)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
    135135    }
    136136    protected virtual void clearValueButton_Click(object sender, EventArgs e) {
    137       Parameter.Value = null;
     137      Content.Value = null;
    138138    }
    139139    protected virtual void valuePanel_DragEnterOver(object sender, DragEventArgs e) {
    140140      e.Effect = DragDropEffects.None;
    141141      Type type = e.Data.GetData("Type") as Type;
    142       if ((type != null) && (Parameter.DataType.IsAssignableFrom(type))) {
     142      if ((type != null) && (Content.DataType.IsAssignableFrom(type))) {
    143143        if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
    144144        else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
    … …  
    152152        IItem item = e.Data.GetData("Value") as IItem;
    153153        if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) item = (IItem)item.Clone();
    154         Parameter.Value = item;
     154        Content.Value = item;
    155155      }
    156156    }

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemSetView.cs

    r2655 r2713  
    3333namespace HeuristicLab.Core.Views {
    3434  public partial class ItemSetView<T> : ItemCollectionView<T> where T : class, IItem {
    35     public IObservableSet<T> ItemSet {
    36       get { return (IObservableSet<T>)Object; }
    37       set { base.Object = value; }
     35    public new IObservableSet<T> Content {
     36      get { return (IObservableSet<T>)base.Content; }
     37      set { base.Content = value; }
    3838    }
    3939
    … …  
    4949    }
    5050
    51     protected override void OnObjectChanged() {
    52       base.OnObjectChanged();
     51    protected override void OnContentChanged() {
     52      base.OnContentChanged();
    5353      Caption = "Item Set";
    54       if (ItemSet != null)
    55         Caption += " (" + ItemCollection.GetType().Name + ")";
     54      if (Content != null)
     55        Caption += " (" + Content.GetType().Name + ")";
    5656    }
    5757

  • trunk/sources/HeuristicLab.Core.Views/3.3/ItemView.cs

    r2664 r2713  
    3434  /// Base class for all visual representations.
    3535  /// </summary>
    36   public partial class ItemView : ObjectView {
    37     public IItem Item {
    38       get { return (IItem)base.Object; }
    39       set { base.Object = value; }
     36  public partial class ItemView : ContentView {
     37    public new IItem Content {
     38      get { return (IItem)base.Content; }
     39      set { base.Content = value; }
    4040    }
    4141
    … …  
    4848    }
    4949
    50     protected override void OnObjectChanged() {
    51       if (Item == null) {
     50    protected override void OnContentChanged() {
     51      base.OnContentChanged();
     52      if (Content == null) {
    5253        Caption = "View";
    5354      } else {
    54         Caption = Item.ItemName;
     55        Caption = Content.ItemName;
    5556      }
     57    }
     58
     59    /// <summary>
     60    /// Asynchron call of GUI updating.
     61    /// </summary>
     62    /// <param name="method">The delegate to invoke.</param>
     63    protected new void Invoke(Delegate method) {
     64      // enforce context switch to improve GUI response time
     65      System.Threading.Thread.Sleep(0);
     66
     67      // prevent blocking of worker thread in Invoke, if the control is disposed
     68      IAsyncResult result = BeginInvoke(method);
     69      while ((!result.AsyncWaitHandle.WaitOne(100, false)) && (!IsDisposed)) { }
     70      if (!IsDisposed) EndInvoke(result);
     71    }
     72    /// <summary>
     73    /// Asynchron call of GUI updating.
     74    /// </summary>
     75    /// <param name="method">The delegate to invoke.</param>
     76    /// <param name="args">The invoke arguments.</param>
     77    protected new void Invoke(Delegate method, params object[] args) {
     78      // enforce context switch to improve GUI response time
     79      System.Threading.Thread.Sleep(0);
     80
     81      // prevent blocking of worker thread in Invoke, if the control is disposed
     82      IAsyncResult result = BeginInvoke(method, args);
     83      while ((!result.AsyncWaitHandle.WaitOne(100, false)) && (!IsDisposed)) { }
     84      if (!IsDisposed) EndInvoke(result);
    5685    }
    5786  }

  • trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemCollectionView.cs

    r2676 r2713  
    3333namespace HeuristicLab.Core.Views {
    3434  public partial class NamedItemCollectionView<T> : ItemCollectionView<T> where T : class, INamedItem {
    35     public IObservableKeyedCollection<string, T> NamedItemCollection {
    36       get { return (IObservableKeyedCollection<string, T>)Object; }
    37       set { base.Object = value; }
     35    public new IObservableKeyedCollection<string, T> Content {
     36      get { return (IObservableKeyedCollection<string, T>)base.Content; }
     37      set { base.Content = value; }
    3838    }
    3939
    … …  
    4949    }
    5050
    51     protected override void DeregisterObjectEvents() {
    52       NamedItemCollection.ItemsReplaced -= new CollectionItemsChangedEventHandler<T>(NamedItemCollection_ItemsReplaced);
    53       base.DeregisterObjectEvents();
     51    protected override void DeregisterContentEvents() {
     52      Content.ItemsReplaced -= new CollectionItemsChangedEventHandler<T>(Content_ItemsReplaced);
     53      base.DeregisterContentEvents();
    5454    }
    55     protected override void RegisterObjectEvents() {
    56       base.RegisterObjectEvents();
    57       NamedItemCollection.ItemsReplaced += new CollectionItemsChangedEventHandler<T>(NamedItemCollection_ItemsReplaced);
     55    protected override void RegisterContentEvents() {
     56      base.RegisterContentEvents();
     57      Content.ItemsReplaced += new CollectionItemsChangedEventHandler<T>(Content_ItemsReplaced);
    5858    }
    5959
    … …  
    8282      if (e.Effect != DragDropEffects.None) {
    8383        T item = e.Data.GetData("Value") as T;
    84         if ((item == null) || (NamedItemCollection.ContainsKey(item.Name)))
     84        if ((item == null) || (Content.ContainsKey(item.Name)))
    8585          e.Effect = DragDropEffects.None;
    8686      }
    … …  
    8888    #endregion
    8989
    90     #region NamedItemCollection Events
    91     protected virtual void NamedItemCollection_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<T> e) {
     90    #region Content Events
     91    protected virtual void Content_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<T> e) {
    9292      if (InvokeRequired)
    93         Invoke(new CollectionItemsChangedEventHandler<T>(NamedItemCollection_ItemsReplaced), sender, e);
     93        Invoke(new CollectionItemsChangedEventHandler<T>(Content_ItemsReplaced), sender, e);
    9494      else {
    9595        foreach (T item in e.Items) {
    … …  
    103103    #region Helpers
    104104    protected virtual string GetUniqueName(string originalName) {
    105       if (!NamedItemCollection.ContainsKey(originalName))
     105      if (!Content.ContainsKey(originalName))
    106106        return originalName;
    107107      else {
    … …  
    111111          index++;
    112112          name = originalName + index.ToString();
    113         } while (NamedItemCollection.ContainsKey(name));
     113        } while (Content.ContainsKey(name));
    114114        return name;
    115115      }

  • trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemView.cs

    r2676 r2713  
    3535  [Content(typeof(NamedItem), true)]
    3636  public partial class NamedItemView : ItemView {
    37     public NamedItem NamedItem {
    38       get { return (NamedItem)Item; }
    39       set { base.Item = value; }
     37    public new NamedItem Content {
     38      get { return (NamedItem)base.Content; }
     39      set { base.Content = value; }
    4040    }
    4141
    … …  
    4848    public NamedItemView(NamedItem namedItem)
    4949      : this() {
    50       NamedItem = namedItem;
     50      Content = namedItem;
    5151    }
    5252
    53     protected override void DeregisterObjectEvents() {
    54       NamedItem.NameChanged -= new EventHandler(NamedItem_NameChanged);
    55       NamedItem.DescriptionChanged -= new EventHandler(NamedItem_DescriptionChanged);
    56       base.DeregisterObjectEvents();
     53    protected override void DeregisterContentEvents() {
     54      Content.NameChanged -= new EventHandler(Content_NameChanged);
     55      Content.DescriptionChanged -= new EventHandler(Content_DescriptionChanged);
     56      base.DeregisterContentEvents();
    5757    }
    58     protected override void RegisterObjectEvents() {
    59       base.RegisterObjectEvents();
    60       NamedItem.NameChanged += new EventHandler(NamedItem_NameChanged);
    61       NamedItem.DescriptionChanged += new EventHandler(NamedItem_DescriptionChanged);
     58    protected override void RegisterContentEvents() {
     59      base.RegisterContentEvents();
     60      Content.NameChanged += new EventHandler(Content_NameChanged);
     61      Content.DescriptionChanged += new EventHandler(Content_DescriptionChanged);
    6262    }
    6363
    64     protected override void OnObjectChanged() {
    65       base.OnObjectChanged();
    66       if (NamedItem == null) {
     64    protected override void OnContentChanged() {
     65      base.OnContentChanged();
     66      if (Content == null) {
    6767        Caption = "NamedItem";
    6868        nameTextBox.Text = "-";
    … …  
    7373        descriptionTextBox.Enabled = false;
    7474      } else {
    75         Caption = NamedItem.Name + " (" + NamedItem.GetType().Name + ")";
    76         nameTextBox.Text = NamedItem.Name;
    77         nameTextBox.ReadOnly = !NamedItem.CanChangeName;
     75        Caption = Content.Name + " (" + Content.GetType().Name + ")";
     76        nameTextBox.Text = Content.Name;
     77        nameTextBox.ReadOnly = !Content.CanChangeName;
    7878        nameTextBox.Enabled = true;
    79         descriptionTextBox.Text = NamedItem.Description;
    80         descriptionTextBox.ReadOnly = !NamedItem.CanChangeDescription;
     79        descriptionTextBox.Text = Content.Description;
     80        descriptionTextBox.ReadOnly = !Content.CanChangeDescription;
    8181        descriptionTextBox.Enabled = true;
    8282      }
    8383    }
    8484
    85     protected virtual void NamedItem_NameChanged(object sender, EventArgs e) {
     85    protected virtual void Content_NameChanged(object sender, EventArgs e) {
    8686      if (InvokeRequired)
    87         Invoke(new EventHandler(NamedItem_NameChanged), sender, e);
     87        Invoke(new EventHandler(Content_NameChanged), sender, e);
    8888      else
    89         nameTextBox.Text = NamedItem.Name;
     89        nameTextBox.Text = Content.Name;
    9090    }
    91     protected virtual void NamedItem_DescriptionChanged(object sender, EventArgs e) {
     91    protected virtual void Content_DescriptionChanged(object sender, EventArgs e) {
    9292      if (InvokeRequired)
    93         Invoke(new EventHandler(NamedItem_DescriptionChanged), sender, e);
     93        Invoke(new EventHandler(Content_DescriptionChanged), sender, e);
    9494      else
    95         descriptionTextBox.Text = NamedItem.Description;
     95        descriptionTextBox.Text = Content.Description;
    9696    }
    9797
    9898    protected virtual void nameTextBox_Validating(object sender, CancelEventArgs e) {
    99       if (NamedItem.CanChangeName) {
    100         NamedItem.Name = nameTextBox.Text;
     99      if (Content.CanChangeName) {
     100        Content.Name = nameTextBox.Text;
    101101
    102102        // check if variable name was set successfully
    103         if (!NamedItem.Name.Equals(nameTextBox.Text)) {
     103        if (!Content.Name.Equals(nameTextBox.Text)) {
    104104          e.Cancel = true;
    105105          errorProvider.SetError(nameTextBox, "Invalid Name");
    … …  
    115115        nameLabel.Focus();  // set focus on label to validate data
    116116      if (e.KeyCode == Keys.Escape) {
    117         nameTextBox.Text = NamedItem.Name;
     117        nameTextBox.Text = Content.Name;
    118118        nameLabel.Focus();  // set focus on label to validate data
    119119      }
    120120    }
    121121    protected virtual void descriptionTextBox_Validated(object sender, EventArgs e) {
    122       if (NamedItem.CanChangeDescription)
    123         NamedItem.Description = descriptionTextBox.Text;
     122      if (Content.CanChangeDescription)
     123        Content.Description = descriptionTextBox.Text;
    124124    }
    125125  }

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorCollectionView.cs

    r2676 r2713  
    3232    public OperatorCollectionView(IObservableCollection<IOperator> operatorCollection)
    3333      : this() {
    34       ItemCollection = operatorCollection;
     34      Content = operatorCollection;
    3535    }
    3636

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.Designer.cs

    r2676 r2713  
    8282                  | System.Windows.Forms.AnchorStyles.Right)));
    8383      this.operatorsView.Caption = "Operator Set";
    84       this.operatorsView.ItemCollection = null;
    85       this.operatorsView.ItemSet = null;
    8684      this.operatorsView.Location = new System.Drawing.Point(3, 3);
    8785      this.operatorsView.Name = "operatorsView";
    88       this.operatorsView.Object = null;
    8986      this.operatorsView.Size = new System.Drawing.Size(602, 309);
    9087      this.operatorsView.TabIndex = 0;
    … …  
    9794                  | System.Windows.Forms.AnchorStyles.Right)));
    9895      this.graphView.Caption = "Operator";
    99       this.graphView.Item = null;
    10096      this.graphView.Location = new System.Drawing.Point(6, 19);
    10197      this.graphView.Name = "graphView";
    102       this.graphView.Object = null;
    103       this.graphView.Operator = null;
    10498      this.graphView.Size = new System.Drawing.Size(590, 183);
    10599      this.graphView.TabIndex = 0;

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorGraphView.cs

    r2676 r2713  
    4343    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
    4444    /// No own data storage present.</remarks>
    45     public OperatorGraph OperatorGraph {
    46       get { return (OperatorGraph)Item; }
    47       set { base.Item = value; }
     45    public new OperatorGraph Content {
     46      get { return (OperatorGraph)base.Content; }
     47      set { base.Content = value; }
    4848    }
    4949
    … …  
    6363    public OperatorGraphView(OperatorGraph operatorGraph)
    6464      : this() {
    65       OperatorGraph = operatorGraph;
     65      Content = operatorGraph;
    6666    }
    6767
    … …  
    7070    /// </summary>
    7171    /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    72     protected override void DeregisterObjectEvents() {
    73       OperatorGraph.InitialOperatorChanged -= new EventHandler(OperatorGraph_InitialOperatorChanged);
    74       base.DeregisterObjectEvents();
     72    protected override void DeregisterContentEvents() {
     73      Content.InitialOperatorChanged -= new EventHandler(Content_InitialOperatorChanged);
     74      base.DeregisterContentEvents();
    7575    }
    7676
    … …  
    7979    /// </summary>
    8080    /// <remarks>Calls <see cref="ViewBase.AddItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    81     protected override void RegisterObjectEvents() {
    82       base.RegisterObjectEvents();
    83       OperatorGraph.InitialOperatorChanged += new EventHandler(OperatorGraph_InitialOperatorChanged);
     81    protected override void RegisterContentEvents() {
     82      base.RegisterContentEvents();
     83      Content.InitialOperatorChanged += new EventHandler(Content_InitialOperatorChanged);
    8484    }
    8585
    … …  
    8888    /// </summary>
    8989    /// <remarks>Calls <see cref="ViewBase.UpdateControls"/> of base class <see cref="ViewBase"/>.</remarks>
    90     protected override void OnObjectChanged() {
    91       base.OnObjectChanged();
    92       operatorsView.ItemSet = null;
     90    protected override void OnContentChanged() {
     91      base.OnContentChanged();
     92      operatorsView.Content = null;
    9393      operatorsView.Enabled = false;
    94       graphView.Operator = null;
     94      graphView.Content = null;
    9595      graphView.Enabled = false;
    96       if (OperatorGraph == null) {
     96      if (Content == null) {
    9797        Caption = "Operator Graph";
    98         operatorsView.ItemSet = null;
     98        operatorsView.Content = null;
    9999        operatorsView.Enabled = false;
    100         graphView.Operator = null;
     100        graphView.Content = null;
    101101        graphView.Enabled = false;
    102102      } else {
    103         Caption = OperatorGraph.ItemName + " (" + OperatorGraph.GetType().Name + ")";
    104         operatorsView.ItemSet = OperatorGraph.Operators;
     103        Caption = Content.ItemName + " (" + Content.GetType().Name + ")";
     104        operatorsView.Content = Content.Operators;
    105105        operatorsView.Enabled = true;
    106106        MarkInitialOperator();
    107         graphView.Operator = OperatorGraph.InitialOperator;
     107        graphView.Content = Content.InitialOperator;
    108108        graphView.Enabled = true;
    109109      }
    … …  
    112112    protected virtual void MarkInitialOperator() {
    113113      foreach (ListViewItem item in operatorsView.ItemsListView.Items) {
    114         if ((OperatorGraph.InitialOperator != null) && (((IOperator)item.Tag) == OperatorGraph.InitialOperator))
     114        if ((Content.InitialOperator != null) && (((IOperator)item.Tag) == Content.InitialOperator))
    115115          item.Font = new Font(operatorsView.ItemsListView.Font, FontStyle.Bold);
    116116        else
    … …  
    130130        initialOperatorToolStripMenuItem.Enabled = true;
    131131        initialOperatorToolStripMenuItem.Tag = op;
    132         if (op == OperatorGraph.InitialOperator)
     132        if (op == Content.InitialOperator)
    133133          initialOperatorToolStripMenuItem.Checked = true;
    134134      }
    … …  
    136136    protected virtual void initialOperatorToolStripMenuItem_Click(object sender, EventArgs e) {
    137137      if (initialOperatorToolStripMenuItem.Checked)
    138         OperatorGraph.InitialOperator = (IOperator)initialOperatorToolStripMenuItem.Tag;
     138        Content.InitialOperator = (IOperator)initialOperatorToolStripMenuItem.Tag;
    139139      else
    140         OperatorGraph.InitialOperator = null;
     140        Content.InitialOperator = null;
    141141    }
    142142    #endregion
    143143
    144     #region OperatorGraph Events
    145     protected virtual void OperatorGraph_InitialOperatorChanged(object sender, EventArgs e) {
     144    #region Content Events
     145    protected virtual void Content_InitialOperatorChanged(object sender, EventArgs e) {
    146146      if (InvokeRequired)
    147         Invoke(new EventHandler(OperatorGraph_InitialOperatorChanged), sender, e);
     147        Invoke(new EventHandler(Content_InitialOperatorChanged), sender, e);
    148148      else {
    149149        MarkInitialOperator();
    150         graphView.Operator = OperatorGraph.InitialOperator;
     150        graphView.Content = Content.InitialOperator;
    151151      }
    152152    }

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorListView.cs

    r2676 r2713  
    3232    public OperatorListView(IObservableList<IOperator> operatorList)
    3333      : this() {
    34       ItemList = operatorList;
     34      Content = operatorList;
    3535    }
    3636

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorSetView.cs

    r2676 r2713  
    3232    public OperatorSetView(IObservableSet<IOperator> operatorSet)
    3333      : this() {
    34       ItemSet = operatorSet;
     34      Content = operatorSet;
    3535    }
    3636

  • trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs

    r2708 r2713  
    4747    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
    4848    /// No own data storage present.</remarks>
    49     public IOperator Operator {
    50       get { return (IOperator)Item; }
    51       set { base.Item = value; }
     49    public new IOperator Content {
     50      get { return (IOperator)base.Content; }
     51      set { base.Content = value; }
    5252    }
    5353
    … …  
    7171    public OperatorTreeView(IOperator op)
    7272      : this() {
    73       Operator = op;
     73      Content = op;
    7474    }
    7575
    … …  
    7878    /// </summary>
    7979    /// <remarks>Calls <see cref="ViewBase.UpdateControls"/> of base class <see cref="ViewBase"/>.</remarks>
    80     protected override void OnObjectChanged() {
    81       base.OnObjectChanged();
     80    protected override void OnContentChanged() {
     81      base.OnContentChanged();
    8282      if (graphTreeView.Nodes.Count > 0)
    8383        RemoveTreeNode(graphTreeView.Nodes[0]);
    8484      graphTreeView.Enabled = false;
    8585      Caption = "Operator";
    86       if (Operator != null) {
    87         Caption = Operator.Name + " (" + Operator.GetType().Name + ")";
     86      if (Content != null) {
     87        Caption = Content.Name + " (" + Content.GetType().Name + ")";
    8888        TreeNode root = new TreeNode();
    89         FillTreeNode(root, Operator);
     89        FillTreeNode(root, Content);
    9090        graphTreeView.Nodes.Add(root);
    9191        graphTreeView.Enabled = true;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs

    r2676 r2713  
    3131    public ParameterCollectionView(IObservableKeyedCollection<string, IParameter> parameterCollection)
    3232      : this() {
    33       NamedItemCollection = parameterCollection;
     33      Content = parameterCollection;
    3434    }
    3535
    … …  
    3939      if (createParameterDialog.ShowDialog(this) == DialogResult.OK) {
    4040        IParameter param = createParameterDialog.Parameter;
    41         if (NamedItemCollection.ContainsKey(param.Name))
     41        if (Content.ContainsKey(param.Name))
    4242          param = (IParameter)Activator.CreateInstance(param.GetType(), GetUniqueName(param.Name), param.Description);
    4343        return param;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ParameterView.cs

    r2665 r2713  
    4040    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
    4141    /// No own data storage present.</remarks>
    42     public Parameter Parameter {
    43       get { return (Parameter)Item; }
    44       set { base.Item = value; }
     42    public new Parameter Content {
     43      get { return (Parameter)base.Content; }
     44      set { base.Content = value; }
    4545    }
    4646
    … …  
    5959    public ParameterView(Parameter parameter)
    6060      : this() {
    61       Parameter = parameter;
     61      Content = parameter;
    6262    }
    6363
    64     protected override void OnObjectChanged() {
    65       base.OnObjectChanged();
    66       if (Parameter == null) {
     64    protected override void OnContentChanged() {
     65      base.OnContentChanged();
     66      if (Content == null) {
    6767        Caption = "Parameter";
    6868        dataTypeTextBox.Text = "-";
    6969        dataTypeTextBox.Enabled = false;
    7070      } else {
    71         Caption = Parameter.Name + " (" + Parameter.GetType().Name + ")";
    72         dataTypeTextBox.Text = Parameter.DataType.Name;
     71        Caption = Content.Name + " (" + Content.GetType().Name + ")";
     72        dataTypeTextBox.Text = Content.DataType.Name;
    7373        dataTypeTextBox.Enabled = true;
    7474      }

  • trunk/sources/HeuristicLab.Core.Views/3.3/ScopeListView.cs

    r2687 r2713  
    3030    public ScopeListView(IObservableList<IScope> scopeList)
    3131      : this() {
    32       ItemList = scopeList;
     32      Content = scopeList;
    3333    }
    3434  }

  • trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.Designer.cs

    r2676 r2713  
    112112                  | System.Windows.Forms.AnchorStyles.Right)));
    113113      this.variableCollectionView.Caption = "VariableCollection";
    114       this.variableCollectionView.ItemCollection = null;
    115114      this.variableCollectionView.Location = new System.Drawing.Point(3, 3);
    116115      this.variableCollectionView.Name = "variableCollectionView";
    117       this.variableCollectionView.NamedItemCollection = null;
    118       this.variableCollectionView.Object = null;
    119116      this.variableCollectionView.Size = new System.Drawing.Size(394, 190);
    120117      this.variableCollectionView.TabIndex = 0;

  • trunk/sources/HeuristicLab.Core.Views/3.3/ScopeView.cs

    r2687 r2713  
    4646    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
    4747    /// No own data storage present.</remarks>
    48     public IScope Scope {
    49       get { return (IScope)Item; }
    50       set { base.Item = value; }
     48    public new IScope Content {
     49      get { return (IScope)base.Content; }
     50      set { base.Content = value; }
    5151    }
    5252
    … …  
    6969    public ScopeView(IScope scope)
    7070      : this() {
    71       Scope = scope;
     71      Content = scope;
    7272    }
    7373
    … …  
    7676    /// </summary>
    7777    /// <remarks>Calls <see cref="ViewBase.UpdateControls"/> of base class <see cref="ViewBase"/>.</remarks>
    78     protected override void OnObjectChanged() {
    79       base.OnObjectChanged();
     78    protected override void OnContentChanged() {
     79      base.OnContentChanged();
    8080      if (scopesTreeView.Nodes.Count > 0) {
    8181        RemoveTreeNode(scopesTreeView.Nodes[0]);
    8282        scopesTreeView.Nodes.Clear();
    8383      }
    84       variableCollectionView.NamedItemCollection = null;
     84      variableCollectionView.Content = null;
    8585      variableCollectionView.Enabled = false;
    86       if (Scope == null) {
     86      if (Content == null) {
    8787        Caption = "Scope";
    8888        scopesTreeView.Enabled = false;
    8989      } else {
    90         Caption = Scope.Name + " (" + Scope.GetType().Name + ")";
     90        Caption = Content.Name + " (" + Content.GetType().Name + ")";
    9191        scopesTreeView.Enabled = true;
    92         scopesTreeView.Nodes.Add(CreateTreeNode(Scope));
     92        scopesTreeView.Nodes.Add(CreateTreeNode(Content));
    9393      }
    9494    }
    … …  
    133133      TreeNode node = scopesTreeView.GetNodeAt(e.X, e.Y);
    134134      if ((node != null) && (node.Tag is IScope)) {
    135         variableCollectionView.NamedItemCollection = ((IScope)node.Tag).Variables;
     135        variableCollectionView.Content = ((IScope)node.Tag).Variables;
    136136        variableCollectionView.Enabled = true;
    137137      } else {
    138         variableCollectionView.NamedItemCollection = null;
     138        variableCollectionView.Content = null;
    139139        variableCollectionView.Enabled = false;
    140140        if (node == null) scopesTreeView.SelectedNode = null;

  • trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelectorDialog.cs

    r2676 r2713  
    6060    }
    6161
    62 
    6362    protected virtual void TypeSelectorDialog_Load(object sender, EventArgs e) {
    6463      this.typeSelector.TypesTreeView.DoubleClick += new System.EventHandler(TypesTreeView_DoubleClick);

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableCollectionView.cs

    r2687 r2713  
    3030    public VariableCollectionView(IObservableKeyedCollection<string, IVariable> variableCollection)
    3131      : this() {
    32       NamedItemCollection = variableCollection;
     32      Content = variableCollection;
    3333    }
    3434

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.Designer.cs

    r2676 r2713  
    125125      this.viewHost.Location = new System.Drawing.Point(0, 0);
    126126      this.viewHost.Name = "viewHost";
    127       this.viewHost.Object = null;
     127      this.viewHost.Content = null;
    128128      this.viewHost.Size = new System.Drawing.Size(347, 100);
    129129      this.viewHost.TabIndex = 0;

  • trunk/sources/HeuristicLab.Core.Views/3.3/VariableView.cs

    r2694 r2713  
    4242    /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
    4343    /// No own data storage present.</remarks>
    44     public Variable Variable {
    45       get { return (Variable)Item; }
    46       set { base.Item = value; }
     44    public new Variable Content {
     45      get { return (Variable)base.Content; }
     46      set { base.Content = value; }
    4747    }
    4848
    … …  
    6161    public VariableView(Variable variable)
    6262      : this() {
    63       Variable = variable;
     63      Content = variable;
    6464    }
    6565
    … …  
    6868    /// </summary>
    6969    /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    70     protected override void DeregisterObjectEvents() {
    71       Variable.ValueChanged -= new EventHandler(Variable_ValueChanged);
    72       base.DeregisterObjectEvents();
     70    protected override void DeregisterContentEvents() {
     71      Content.ValueChanged -= new EventHandler(Content_ValueChanged);
     72      base.DeregisterContentEvents();
    7373    }
    7474
    … …  
    7777    /// </summary>
    7878    /// <remarks>Calls <see cref="ViewBase.AddItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
    79     protected override void RegisterObjectEvents() {
    80       base.RegisterObjectEvents();
    81       Variable.ValueChanged += new EventHandler(Variable_ValueChanged);
     79    protected override void RegisterContentEvents() {
     80      base.RegisterContentEvents();
     81      Content.ValueChanged += new EventHandler(Content_ValueChanged);
    8282    }
    8383
    84     protected override void OnObjectChanged() {
    85       base.OnObjectChanged();
    86       if (Variable == null) {
     84    protected override void OnContentChanged() {
     85      base.OnContentChanged();
     86      if (Content == null) {
    8787        Caption = "Variable";
    8888        dataTypeTextBox.Text = "-";
    … …  
    9191        clearValueButton.Enabled = false;
    9292        valueGroupBox.Enabled = false;
    93         viewHost.Object = null;
     93        viewHost.Content = null;
    9494      } else {
    95         Caption = Variable.Name + " (" + Variable.GetType().Name + ")";
    96         dataTypeTextBox.Text = Variable.Value == null ? "-" : Variable.Value.GetType().FullName;
    97         dataTypeTextBox.Enabled = Variable.Value != null;
    98         setValueButton.Enabled = Variable.Value == null;
    99         clearValueButton.Enabled = Variable.Value != null;
     95        Caption = Content.Name + " (" + Content.GetType().Name + ")";
     96        dataTypeTextBox.Text = Content.Value == null ? "-" : Content.Value.GetType().FullName;
     97        dataTypeTextBox.Enabled = Content.Value != null;
     98        setValueButton.Enabled = Content.Value == null;
     99        clearValueButton.Enabled = Content.Value != null;
    100100        valueGroupBox.Enabled = true;
    101         viewHost.Object = Variable.Value;
     101        viewHost.Content = Content.Value;
    102102      }
    103103    }
    104104
    105     protected virtual void Variable_ValueChanged(object sender, EventArgs e) {
     105    protected virtual void Content_ValueChanged(object sender, EventArgs e) {
    106106      if (InvokeRequired)
    107         Invoke(new EventHandler(Variable_ValueChanged), sender, e);
     107        Invoke(new EventHandler(Content_ValueChanged), sender, e);
    108108      else {
    109         dataTypeTextBox.Text = Variable.Value == null ? "-" : Variable.Value.GetType().FullName;
    110         dataTypeTextBox.Enabled = Variable.Value != null;
    111         setValueButton.Enabled = Variable.Value == null;
    112         clearValueButton.Enabled = Variable.Value != null;
    113         viewHost.Object = Variable.Value;
     109        dataTypeTextBox.Text = Content.Value == null ? "-" : Content.Value.GetType().FullName;
     110        dataTypeTextBox.Enabled = Content.Value != null;
     111        setValueButton.Enabled = Content.Value == null;
     112        clearValueButton.Enabled = Content.Value != null;
     113        viewHost.Content = Content.Value;
    114114      }
    115115    }
    … …  
    122122      }
    123123      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
    124         Variable.Value = (IItem)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
     124        Content.Value = (IItem)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
    125125      }
    126126    }
    127127    protected virtual void clearValueButton_Click(object sender, EventArgs e) {
    128       Variable.Value = null;
     128      Content.Value = null;
    129129    }
    130130    protected virtual void valuePanel_DragEnterOver(object sender, DragEventArgs e) {
    … …  
    143143        IItem item = e.Data.GetData("Value") as IItem;
    144144        if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) item = (IItem)item.Clone();
    145         Variable.Value = item;
     145        Content.Value = item;
    146146      }
    147147    }

  • trunk/sources/HeuristicLab.Core.Views/3.3/ViewHost.cs

    r2708 r2713  
    3434    private Dictionary<Type, ToolStripMenuItem> typeMenuItemTable;
    3535
    36     private object obj;
    37     public object Object {
    38       get { return obj; }
     36    private object content;
     37    public object Content {
     38      get { return content; }
    3939      set {
    40         if (value != obj) {
    41           obj = value;
     40        if (value != content) {
     41          content = value;
    4242          Initialize();
    4343        }
    … …  
    6363      viewPanel.Visible = false;
    6464
    65       if (Object != null) {
    66         var viewTypes = from t in MainFormManager.GetViewTypes(Object.GetType())
     65      if (Content != null) {
     66        var viewTypes = from t in MainFormManager.GetViewTypes(Content.GetType())
    6767                        orderby t.Name ascending
    6868                        select t;
    … …  
    8484        }
    8585
    86         Control view = (Control)MainFormManager.CreateDefaultView(Object);
     86        Control view = (Control)MainFormManager.CreateDefaultView(Content);
    8787        if (view != null) {
    8888          viewPanel.Controls.Add(view);
    … …  
    9898
    9999    private void viewsLabel_DoubleClick(object sender, EventArgs e) {
    100       MainFormManager.CreateView(viewPanel.Tag.GetType(), Object).Show();
     100      MainFormManager.CreateView(viewPanel.Tag.GetType(), Content).Show();
    101101    }
    102102    protected void contextMenuStrip_ItemClicked(object sender, ToolStripItemClickedEventArgs e) {
    … …  
    111111      if (viewPanel.Controls.Count > 0) viewPanel.Controls[0].Dispose();
    112112      viewPanel.Controls.Clear();
    113       Control view = (Control)MainFormManager.CreateView(viewType, Object);
     113      Control view = (Control)MainFormManager.CreateView(viewType, Content);
    114114      viewPanel.Controls.Add(view);
    115115      viewPanel.Tag = view;

  • trunk/sources/HeuristicLab.Data.Views/3.3/BoolDataView.cs

    r2669 r2713  
    3434  [Content(typeof(BoolData), true)]
    3535  public partial class BoolDataView : ItemView {
    36     public BoolData BoolData {
    37       get { return (BoolData)Item; }
    38       set { base.Item = value; }
     36    public new BoolData Content {
     37      get { return (BoolData)base.Content; }
     38      set { base.Content = value; }
    3939    }
    4040
    … …  
    4545    public BoolDataView(BoolData boolData)
    4646      : this() {
    47       BoolData = boolData;
     47      Content = boolData;
    4848    }
    4949
    50     protected override void DeregisterObjectEvents() {
    51       BoolData.Changed -= new ChangedEventHandler(BoolData_Changed);
    52       base.DeregisterObjectEvents();
     50    protected override void DeregisterContentEvents() {
     51      Content.Changed -= new ChangedEventHandler(Content_Changed);
     52      base.DeregisterContentEvents();
    5353    }
    5454
    55     protected override void RegisterObjectEvents() {
    56       base.RegisterObjectEvents();
    57       BoolData.Changed += new ChangedEventHandler(BoolData_Changed);
     55    protected override void RegisterContentEvents() {
     56      base.RegisterContentEvents();
     57      Content.Changed += new ChangedEventHandler(Content_Changed);
    5858    }
    5959
    60     protected override void OnObjectChanged() {
    61       base.OnObjectChanged();
    62       if (BoolData == null) {
     60    protected override void OnContentChanged() {
     61      base.OnContentChanged();
     62      if (Content == null) {
    6363        Caption = "BoolData View";
    6464        valueCheckBox.Checked = false;
    6565        valueCheckBox.Enabled = false;
    6666      } else {
    67         Caption = BoolData.ToString() + " (" + BoolData.GetType().Name + ")";
    68         valueCheckBox.Checked = BoolData.Value;
     67        Caption = Content.ToString() + " (" + Content.GetType().Name + ")";
     68        valueCheckBox.Checked = Content.Value;
    6969        valueCheckBox.Enabled = true;
    7070      }
    7171    }
    7272
    73     private void BoolData_Changed(object sender, ChangedEventArgs e) {
     73    private void Content_Changed(object sender, ChangedEventArgs e) {
    7474      if (InvokeRequired)
    75         Invoke(new ChangedEventHandler(BoolData_Changed), sender, e);
     75        Invoke(new ChangedEventHandler(Content_Changed), sender, e);
    7676      else
    77         valueCheckBox.Checked = BoolData.Value;
     77        valueCheckBox.Checked = Content.Value;
    7878    }
    7979
    8080    private void valueCheckBox_CheckedChanged(object sender, EventArgs e) {
    81       BoolData.Value = valueCheckBox.Checked;
     81      Content.Value = valueCheckBox.Checked;
    8282    }
    8383  }

  • trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleDataView.cs

    r2694 r2713  
    3030using HeuristicLab.Core.Views;
    3131using HeuristicLab.MainForm;
     32using HeuristicLab.MainForm.WindowsForms;
    3233
    3334namespace HeuristicLab.Data.Views {
    3435  [Content(typeof(IStringConvertibleData), true)]
    35   public partial class StringConvertibleDataView : ObjectView {
    36     public IStringConvertibleData StringConvertibleData {
    37       get { return (IStringConvertibleData)Object; }
    38       set { base.Object = value; }
     36  public partial class StringConvertibleDataView : ContentView {
     37    public new IStringConvertibleData Content {
     38      get { return (IStringConvertibleData)base.Content; }
     39      set { base.Content = value; }
    3940    }
    4041
    … …  
    4748    public StringConvertibleDataView(IStringConvertibleData stringConvertibleData)
    4849      : this() {
    49       StringConvertibleData = stringConvertibleData;
     50      Content = stringConvertibleData;
    5051    }
    5152
    52     protected override void DeregisterObjectEvents() {
    53       StringConvertibleData.Changed -= new ChangedEventHandler(StringConvertibleData_Changed);
    54       base.DeregisterObjectEvents();
     53    protected override void DeregisterContentEvents() {
     54      Content.Changed -= new ChangedEventHandler(Content_Changed);
     55      base.DeregisterContentEvents();
    5556    }
    5657
    57     protected override void RegisterObjectEvents() {
    58       base.RegisterObjectEvents();
    59       StringConvertibleData.Changed += new ChangedEventHandler(StringConvertibleData_Changed);
     58    protected override void RegisterContentEvents() {
     59      base.RegisterContentEvents();
     60      Content.Changed += new ChangedEventHandler(Content_Changed);
    6061    }
    6162
    62     protected override void OnObjectChanged() {
    63       base.OnObjectChanged();
    64       if (StringConvertibleData == null) {
     63    protected override void OnContentChanged() {
     64      base.OnContentChanged();
     65      if (Content == null) {
    6566        Caption = "StringConvertibleData View";
    6667        valueTextBox.Text = string.Empty;
    6768        valueTextBox.Enabled = false;
    6869      } else {
    69         Caption = StringConvertibleData.GetValue() + " (" + StringConvertibleData.GetType().Name + ")";
    70         valueTextBox.Text = StringConvertibleData.GetValue();
     70        Caption = Content.GetValue() + " (" + Content.GetType().Name + ")";
     71        valueTextBox.Text = Content.GetValue();
    7172        valueTextBox.Enabled = true;
    7273      }
    7374    }
    7475
    75     private void StringConvertibleData_Changed(object sender, ChangedEventArgs e) {
     76    private void Content_Changed(object sender, ChangedEventArgs e) {
    7677      if (InvokeRequired)
    77         Invoke(new ChangedEventHandler(StringConvertibleData_Changed), sender, e);
     78        Invoke(new ChangedEventHandler(Content_Changed), sender, e);
    7879      else
    79         valueTextBox.Text = StringConvertibleData.GetValue();
     80        valueTextBox.Text = Content.GetValue();
    8081    }
    8182
    … …  
    8485        valueLabel.Focus();  // set focus on label to validate data
    8586      if (e.KeyCode == Keys.Escape) {
    86         valueTextBox.Text = StringConvertibleData.GetValue();
     87        valueTextBox.Text = Content.GetValue();
    8788        valueLabel.Focus();  // set focus on label to validate data
    8889      }
    … …  
    9091    private void valueTextBox_Validating(object sender, CancelEventArgs e) {
    9192      string errorMessage;
    92       if (!StringConvertibleData.Validate(valueTextBox.Text, out errorMessage)) {
     93      if (!Content.Validate(valueTextBox.Text, out errorMessage)) {
    9394        e.Cancel = true;
    9495        errorProvider.SetError(valueTextBox, errorMessage);
    … …  
    9798    }
    9899    private void valueTextBox_Validated(object sender, EventArgs e) {
    99       StringConvertibleData.SetValue(valueTextBox.Text);
     100      Content.SetValue(valueTextBox.Text);
    100101      errorProvider.SetError(valueTextBox, string.Empty);
    101102    }

  • trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixDataView.cs

    r2694 r2713  
    3131using HeuristicLab.Core.Views;
    3232using HeuristicLab.MainForm;
     33using HeuristicLab.MainForm.WindowsForms;
    3334
    3435namespace HeuristicLab.Data.Views {
    3536  [Content(typeof(IStringConvertibleMatrixData), true)]
    36   public partial class StringConvertibleMatrixDataView : ObjectView {
    37     public IStringConvertibleMatrixData StringConvertibleMatrixData {
    38       get { return (IStringConvertibleMatrixData)Object; }
    39       set { base.Object = value; }
     37  public partial class StringConvertibleMatrixDataView : ContentView {
     38    public new IStringConvertibleMatrixData Content {
     39      get { return (IStringConvertibleMatrixData)base.Content; }
     40      set { base.Content = value; }
    4041    }
    4142
    … …  
    5051    public StringConvertibleMatrixDataView(IStringConvertibleMatrixData stringConvertibleArrayData)
    5152      : this() {
    52       StringConvertibleMatrixData = stringConvertibleArrayData;
     53      Content = stringConvertibleArrayData;
    5354    }
    5455
    55     protected override void DeregisterObjectEvents() {
    56       StringConvertibleMatrixData.ItemChanged -= new EventHandler<EventArgs<int, int>>(StringConvertibleMatrixData_ItemChanged);
    57       StringConvertibleMatrixData.Reset -= new EventHandler(StringConvertibleMatrixData_Reset);
    58       base.DeregisterObjectEvents();
     56    protected override void DeregisterContentEvents() {
     57      Content.ItemChanged -= new EventHandler<EventArgs<int, int>>(Content_ItemChanged);
     58      Content.Reset -= new EventHandler(Content_Reset);
     59      base.DeregisterContentEvents();
    5960    }
    6061
    6162
    62     protected override void RegisterObjectEvents() {
    63       base.RegisterObjectEvents();
    64       StringConvertibleMatrixData.ItemChanged += new EventHandler<EventArgs<int, int>>(StringConvertibleMatrixData_ItemChanged);
    65       StringConvertibleMatrixData.Reset += new EventHandler(StringConvertibleMatrixData_Reset);
     63    protected override void RegisterContentEvents() {
     64      base.RegisterContentEvents();
     65      Content.ItemChanged += new EventHandler<EventArgs<int, int>>(Content_ItemChanged);
     66      Content.Reset += new EventHandler(Content_Reset);
    6667    }
    6768
    68     protected override void OnObjectChanged() {
    69       base.OnObjectChanged();
    70       if (StringConvertibleMatrixData == null) {
     69    protected override void OnContentChanged() {
     70      base.OnContentChanged();
     71      if (Content == null) {
    7172        Caption = "StringConvertibleMatrixData View";
    7273        rowsTextBox.Text = "";
    … …  
    7879        dataGridView.Enabled = false;
    7980      } else {
    80         Caption = "StringConvertibleMatrixData (" + StringConvertibleMatrixData.GetType().Name + ")";
    81         UpdateContent();
     81        Caption = "StringConvertibleMatrixData (" + Content.GetType().Name + ")";
     82        UpdateData();
    8283      }
    8384    }
    8485
    85     private void UpdateContent() {
    86       rowsTextBox.Text = StringConvertibleMatrixData.Rows.ToString();
    87       rowsTextBox.Enabled = (StringConvertibleMatrixData.Dimensions & StringConvertibleArrayDataDimensions.Rows) == StringConvertibleArrayDataDimensions.Rows;
    88       columnsTextBox.Text = StringConvertibleMatrixData.Columns.ToString();
    89       columnsTextBox.Enabled = (StringConvertibleMatrixData.Dimensions & StringConvertibleArrayDataDimensions.Columns) == StringConvertibleArrayDataDimensions.Columns;
     86    private void UpdateData() {
     87      rowsTextBox.Text = Content.Rows.ToString();
     88      rowsTextBox.Enabled = (Content.Dimensions & StringConvertibleArrayDataDimensions.Rows) == StringConvertibleArrayDataDimensions.Rows;
     89      columnsTextBox.Text = Content.Columns.ToString();
     90      columnsTextBox.Enabled = (Content.Dimensions & StringConvertibleArrayDataDimensions.Columns) == StringConvertibleArrayDataDimensions.Columns;
    9091      dataGridView.Rows.Clear();
    9192      dataGridView.Columns.Clear();
    92       if ((StringConvertibleMatrixData.Rows > 0) && (StringConvertibleMatrixData.Columns > 0)) {
    93         for (int i = 0; i < StringConvertibleMatrixData.Columns; i++) {
     93      if ((Content.Rows > 0) && (Content.Columns > 0)) {
     94        for (int i = 0; i < Content.Columns; i++) {
    9495          dataGridView.ColumnCount++;
    9596          dataGridView.Columns[dataGridView.ColumnCount - 1].FillWeight = float.Epsilon;  // sum of all fill weights must not be larger than 65535
    9697        }
    97         dataGridView.RowCount = StringConvertibleMatrixData.Rows;
    98         for (int i = 0; i < StringConvertibleMatrixData.Rows; i++) {
    99           for (int j = 0; j < StringConvertibleMatrixData.Columns; j++)
    100             dataGridView.Rows[i].Cells[j].Value = StringConvertibleMatrixData.GetValue(i, j);
     98        dataGridView.RowCount = Content.Rows;
     99        for (int i = 0; i < Content.Rows; i++) {
     100          for (int j = 0; j < Content.Columns; j++)
     101            dataGridView.Rows[i].Cells[j].Value = Content.GetValue(i, j);
    101102        }
    102         for (int i = 0; i < StringConvertibleMatrixData.Columns; i++)
     103        for (int i = 0; i < Content.Columns; i++)
    103104          dataGridView.Columns[i].Width = dataGridView.Columns[i].GetPreferredWidth(DataGridViewAutoSizeColumnMode.AllCells, true);
    104105      }
    … …  
    106107    }
    107108
    108     private void StringConvertibleMatrixData_ItemChanged(object sender, EventArgs<int, int> e) {
     109    private void Content_ItemChanged(object sender, EventArgs<int, int> e) {
    109110      if (InvokeRequired)
    110         Invoke(new EventHandler<EventArgs<int, int>>(StringConvertibleMatrixData_ItemChanged), sender, e);
     111        Invoke(new EventHandler<EventArgs<int, int>>(Content_ItemChanged), sender, e);
    111112      else {
    112         dataGridView.Rows[e.Value].Cells[e.Value2].Value = StringConvertibleMatrixData.GetValue(e.Value, e.Value2);
     113        dataGridView.Rows[e.Value].Cells[e.Value2].Value = Content.GetValue(e.Value, e.Value2);
    113114        Size size = dataGridView.Rows[e.Value].Cells[e.Value2].PreferredSize;
    114115        dataGridView.Columns[e.Value2].Width = Math.Max(dataGridView.Columns[e.Value2].Width, size.Width);
    115116      }
    116117    }
    117     private void StringConvertibleMatrixData_Reset(object sender, EventArgs e) {
     118    private void Content_Reset(object sender, EventArgs e) {
    118119      if (InvokeRequired)
    119         Invoke(new EventHandler(StringConvertibleMatrixData_Reset), sender, e);
     120        Invoke(new EventHandler(Content_Reset), sender, e);
    120121      else
    121         UpdateContent();
     122        UpdateData();
    122123    }
    123124
    … …  
    132133    }
    133134    private void rowsTextBox_Validated(object sender, EventArgs e) {
    134       StringConvertibleMatrixData.Rows = int.Parse(rowsTextBox.Text);
     135      Content.Rows = int.Parse(rowsTextBox.Text);
    135136      errorProvider.SetError(rowsTextBox, string.Empty);
    136137    }
    … …  
    139140        rowsLabel.Focus();  // set focus on label to validate data
    140141      if (e.KeyCode == Keys.Escape) {
    141         rowsTextBox.Text = StringConvertibleMatrixData.Columns.ToString();
     142        rowsTextBox.Text = Content.Columns.ToString();
    142143        rowsLabel.Focus();  // set focus on label to validate data
    143144      }
    … …  
    152153    }
    153154    private void columnsTextBox_Validated(object sender, EventArgs e) {
    154       StringConvertibleMatrixData.Columns = int.Parse(columnsTextBox.Text);
     155      Content.Columns = int.Parse(columnsTextBox.Text);
    155156      errorProvider.SetError(columnsTextBox, string.Empty);
    156157    }
    … …  
    159160        columnsLabel.Focus();  // set focus on label to validate data
    160161      if (e.KeyCode == Keys.Escape) {
    161         columnsTextBox.Text = StringConvertibleMatrixData.Columns.ToString();
     162        columnsTextBox.Text = Content.Columns.ToString();
    162163        columnsLabel.Focus();  // set focus on label to validate data
    163164      }
    … …  
    168169    private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
    169170      string errorMessage;
    170       if (!StringConvertibleMatrixData.Validate(e.FormattedValue.ToString(), out errorMessage)) {
     171      if (!Content.Validate(e.FormattedValue.ToString(), out errorMessage)) {
    171172        e.Cancel = true;
    172173        dataGridView.Rows[e.RowIndex].ErrorText = errorMessage;
    … …  
    175176    private void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
    176177      string value = e.Value.ToString();
    177       e.ParsingApplied = StringConvertibleMatrixData.SetValue(value, e.RowIndex, e.ColumnIndex);
    178       if (e.ParsingApplied) e.Value = StringConvertibleMatrixData.GetValue(e.RowIndex, e.ColumnIndex);
     178      e.ParsingApplied = Content.SetValue(value, e.RowIndex, e.ColumnIndex);
     179      if (e.ParsingApplied) e.Value = Content.GetValue(e.RowIndex, e.ColumnIndex);
    179180    }
    180181    private void dataGridView_CellEndEdit(object sender, DataGridViewCellEventArgs e) {

  • trunk/sources/HeuristicLab.Operators.Views/3.3/CombinedOperatorView.Designer.cs

    r2684 r2713  
    109109                  | System.Windows.Forms.AnchorStyles.Right)));
    110110      this.parameterCollectionView.Caption = "ParameterCollection";
    111       this.parameterCollectionView.ItemCollection = null;
    112111      this.parameterCollectionView.Location = new System.Drawing.Point(6, 6);
    113112      this.parameterCollectionView.Name = "parameterCollectionView";
    114       this.parameterCollectionView.NamedItemCollection = null;
    115       this.parameterCollectionView.Object = null;
    116113      this.parameterCollectionView.Size = new System.Drawing.Size(466, 326);
    117114      this.parameterCollectionView.TabIndex = 0;
    … …  
    123120                  | System.Windows.Forms.AnchorStyles.Right)));
    124121      this.operatorGraphView.Caption = "Operator Graph";
    125       this.operatorGraphView.Item = null;
    126122      this.operatorGraphView.Location = new System.Drawing.Point(6, 6);
    127123      this.operatorGraphView.Name = "operatorGraphView";
    128       this.operatorGraphView.Object = null;
    129       this.operatorGraphView.OperatorGraph = null;
    130124      this.operatorGraphView.Size = new System.Drawing.Size(466, 326);
    131125      this.operatorGraphView.TabIndex = 0;

  • trunk/sources/HeuristicLab.Operators.Views/3.3/CombinedOperatorView.cs

    r2684 r2713  
    3737  [Content(typeof(CombinedOperator), true)]
    3838  public partial class CombinedOperatorView : NamedItemView {
    39     public CombinedOperator CombinedOperator {
    40       get { return (CombinedOperator)base.Item; }
    41       set { base.Item = value; }
     39    public new CombinedOperator Content {
     40      get { return (CombinedOperator)base.Content; }
     41      set { base.Content = value; }
    4242    }
    4343
    … …  
    5454    public CombinedOperatorView(CombinedOperator combinedOperator)
    5555      : this() {
    56       CombinedOperator = combinedOperator;
     56      Content = combinedOperator;
    5757    }
    5858
    59     protected override void OnObjectChanged() {
    60       base.OnObjectChanged();
    61       if (CombinedOperator == null) {
    62         parameterCollectionView.NamedItemCollection = null;
    63         operatorGraphView.OperatorGraph = null;
     59    protected override void OnContentChanged() {
     60      base.OnContentChanged();
     61      if (Content == null) {
     62        parameterCollectionView.Content = null;
     63        operatorGraphView.Content = null;
    6464        tabControl.Enabled = false;
    6565      } else {
    66         parameterCollectionView.NamedItemCollection = ((IOperator)CombinedOperator).Parameters;
    67         operatorGraphView.OperatorGraph = CombinedOperator.OperatorGraph;
     66        parameterCollectionView.Content = ((IOperator)Content).Parameters;
     67        operatorGraphView.Content = Content.OperatorGraph;
    6868        tabControl.Enabled = true;
    6969      }

  • trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.Designer.cs

    r2676 r2713  
    6767                  | System.Windows.Forms.AnchorStyles.Right)));
    6868      this.parameterCollectionView.Caption = "ParameterCollection";
    69       this.parameterCollectionView.ItemCollection = null;
    7069      this.parameterCollectionView.Location = new System.Drawing.Point(0, 119);
    7170      this.parameterCollectionView.Name = "parameterCollectionView";
    72       this.parameterCollectionView.NamedItemCollection = null;
    73       this.parameterCollectionView.Object = null;
    7471      this.parameterCollectionView.Size = new System.Drawing.Size(490, 234);
    7572      this.parameterCollectionView.TabIndex = 4;

  • trunk/sources/HeuristicLab.Operators.Views/3.3/OperatorView.cs

    r2676 r2713  
    3737  [Content(typeof(Operator), true)]
    3838  public partial class OperatorView : NamedItemView {
    39     public Operator Operator {
    40       get { return (Operator)base.Item; }
    41       set { base.Item = value; }
     39    public new Operator Content {
     40      get { return (Operator)base.Content; }
     41      set { base.Content = value; }
    4242    }
    4343
    … …  
    5454    public OperatorView(Operator op)
    5555      : this() {
    56       Operator = op;
     56      Content = op;
    5757    }
    5858
    59     protected override void OnObjectChanged() {
    60       base.OnObjectChanged();
    61       if (Operator == null) {
    62         parameterCollectionView.NamedItemCollection = null;
     59    protected override void OnContentChanged() {
     60      base.OnContentChanged();
     61      if (Content == null) {
     62        parameterCollectionView.Content = null;
    6363      } else {
    64         parameterCollectionView.NamedItemCollection = ((IOperator)Operator).Parameters;
     64        parameterCollectionView.Content = ((IOperator)Content).Parameters;
    6565      }
    6666    }

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

    r2708 r2713  
    3232    #endregion
    3333
    34     private static Dictionary<IObjectView, FileInfo> files;
     34    private static Dictionary<IContentView, FileInfo> files;
    3535    private static NewItemDialog newItemDialog;
    3636    private static OpenFileDialog openFileDialog;
    … …  
    4040
    4141    static FileManager() {
    42       files = new Dictionary<IObjectView, FileInfo>();
     42      files = new Dictionary<IContentView, FileInfo>();
    4343      newItemDialog = null;
    4444      openFileDialog = null;
    … …  
    5656          MessageBox.Show("There is no view for the new item. It cannot be displayed. ", "No View Available", MessageBoxButtons.OK, MessageBoxIcon.Error);
    5757        } else {
    58           if (view is IObjectView) {
     58          if (view is IContentView) {
    5959            view.Caption = "Item" + newDocumentsCounter.ToString() + ".hl";
    6060            newDocumentsCounter++;
    … …  
    8282
    8383    public static void Save() {
    84       IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
    85       if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType()))) {
     84      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
     85      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType()))) {
    8686        Save(activeView);
    8787      }
    8888    }
    89     private static void Save(IObjectView view) {
     89    private static void Save(IContentView view) {
    9090      if ((!files.ContainsKey(view)) || (!File.Exists(files[view].Filename))) {
    9191        SaveAs(view);
    … …  
    9999
    100100    public static void SaveAs() {
    101       IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
    102       if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType()))) {
     101      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
     102      if ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType()))) {
    103103        SaveAs(activeView);
    104104      }
    105105    }
    106     public static void SaveAs(IObjectView view) {
     106    public static void SaveAs(IContentView view) {
    107107      if (saveFileDialog == null) {
    108108        saveFileDialog = new SaveFileDialog();
    … …  
    135135    public static void SaveAll() {
    136136      var views = from v in MainFormManager.MainForm.Views
    137                   where v is IObjectView
    138                   where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
    139                   select v as IObjectView;
    140 
    141       foreach (IObjectView view in views) {
     137                  where v is IContentView
     138                  where CreatableAttribute.IsCreatable(((IContentView)v).Content.GetType())
     139                  select v as IContentView;
     140
     141      foreach (IContentView view in views) {
    142142        Save(view);
    143143      }
    … …  
    146146    // NOTE: This event is fired by the main form. It is registered in HeuristicLabOptimizerApplication.
    147147    internal static void ViewClosed(object sender, ViewEventArgs e) {
    148       IObjectView view = e.View as IObjectView;
     148      IContentView view = e.View as IContentView;
    149149      if (view != null) files.Remove(view);
    150150    }
    … …  
    159159    }
    160160
    161     private static void SaveItemAsync(IObjectView view, string filename, int compression) {
     161    private static void SaveItemAsync(IContentView view, string filename, int compression) {
    162162      ThreadPool.QueueUserWorkItem(
    163163        new WaitCallback(
    … …  
    166166              DisableView(view);
    167167              SetWaitingCursor();
    168               XmlGenerator.Serialize(view.Object, filename, compression);
     168              XmlGenerator.Serialize(view.Content, filename, compression);
    169169              Invoke(delegate() {
    170170                view.Caption = Path.GetFileName(filename);
    … …  
    191191              IItem item = (IItem)XmlParser.Deserialize(filename);
    192192              Invoke(delegate() {
    193                 IObjectView view = MainFormManager.CreateDefaultView(item) as IObjectView;
     193                IContentView view = MainFormManager.CreateDefaultView(item) as IContentView;
    194194                if (view == null) {
    195195                  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

    r2708 r2713  
    2020      get { return 1700; }
    2121    }
    22     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    23       get { return ToolStripItemDisplayStyle.Text; }
    24     }
    2522
    2623    protected override void OnToolStripItemSet(EventArgs e) {
    … …  
    2825    }
    2926    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    30       ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
     27      ToolStripItem.Enabled = MainFormManager.MainForm.Views.Any<IView>(v => v.IsShown);
    3128    }
    3229

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

    r2708 r2713  
    2020      get { return 1600; }
    2121    }
    22     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    23       get { return ToolStripItemDisplayStyle.Text; }
    24     }
    2522
    2623    protected override void OnToolStripItemSet(EventArgs e) {
    … …  
    2825    }
    2926    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    30       ToolStripItem.Enabled = MainFormManager.MainForm.Views.FirstOrDefault() != null;
     27      ToolStripItem.Enabled = MainFormManager.MainForm.ActiveView != null;
    3128    }
    3229

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

    r2708 r2713  
    2020      get { return 1999; }
    2121    }
    22     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    23       get { return ToolStripItemDisplayStyle.Text; }
    24     }
    2522    public override Keys ShortCutKeys {
    2623      get { return Keys.Control | Keys.X; }

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

    r2708 r2713  
    1919      get { return 1100; }
    2020    }
    21     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    22       get { return ToolStripItemDisplayStyle.ImageAndText; }
    23     }
    2421    public override Image Image {
    2522      get { return Resources.NewIcon; }

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

    r2708 r2713  
    1919      get { return 1200; }
    2020    }
    21     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    22       get { return ToolStripItemDisplayStyle.ImageAndText; }
    23     }
    2421    public override Image Image {
    2522      get { return Resources.OpenIcon; }

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

    r2708 r2713  
    2424    public override int Position {
    2525      get { return 2100; }
    26     }
    27     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    28       get { return ToolStripItemDisplayStyle.Text; }
    2926    }
    3027

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

    r2708 r2713  
    2222      get { return 1500; }
    2323    }
    24     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    25       get { return ToolStripItemDisplayStyle.ImageAndText; }
    26     }
    2724    public override Image Image {
    2825      get { return Resources.SaveAllIcon; }
    … …  
    3431    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    3532      var views = from v in MainFormManager.MainForm.Views
    36                   where v is IObjectView
    37                   where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
     33                  where v is IContentView
     34                  where CreatableAttribute.IsCreatable(((IContentView)v).Content.GetType())
    3835                  select v;
    3936      ToolStripItem.Enabled = views.FirstOrDefault() != null;

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

    r2708 r2713  
    2222      get { return 1400; }
    2323    }
    24     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    25       get { return ToolStripItemDisplayStyle.ImageAndText; }
    26     }
    2724    public override Keys ShortCutKeys {
    2825      get { return Keys.Control | Keys.Shift | Keys.S; }
    … …  
    3330    }
    3431    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    35       IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
    36       ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
     32      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
     33      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType())));
    3734    }
    3835

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

    r2708 r2713  
    2222      get { return 1300; }
    2323    }
    24     public override ToolStripItemDisplayStyle ToolStripItemDisplayStyle {
    25       get { return ToolStripItemDisplayStyle.ImageAndText; }
    26     }
    2724    public override Image Image {
    2825      get { return Resources.SaveIcon; }
    … …  
    3633    }
    3734    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    38       IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
    39       ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
     35      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
     36      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType())));
    4037    }
    4138

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

    r2708 r2713  
    3131    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    3232      var views = from v in MainFormManager.MainForm.Views
    33                   where v is IObjectView
    34                   where CreatableAttribute.IsCreatable(((IObjectView)v).Object.GetType())
     33                  where v is IContentView
     34                  where CreatableAttribute.IsCreatable(((IContentView)v).Content.GetType())
    3535                  select v;
    3636      ToolStripItem.Enabled = views.FirstOrDefault() != null;

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

    r2708 r2713  
    3030    }
    3131    protected override void OnActiveViewChanged(object sender, EventArgs e) {
    32       IObjectView activeView = MainFormManager.MainForm.ActiveView as IObjectView;
    33       ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Object.GetType())));
     32      IContentView activeView = MainFormManager.MainForm.ActiveView as IContentView;
     33      ToolStripItem.Enabled = ((activeView != null) && (CreatableAttribute.IsCreatable(activeView.Content.GetType())));
    3434    }
    3535
Note: See TracChangeset for help on using the changeset viewer.