Changeset 4842

Timestamp:

11/19/10 09:38:55 (14 years ago)

Author:

swinkler

Message:

Improved management of formatters in view for display of symbolic expression trees as strings as discussed with mkommend. (#1270)

File:

• branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionView.cs (modified) (3 diffs)

branches/DataAnalysis.Extensions/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionView.cs

@@ -40 +40 @@
     public SymbolicExpressionView() {
       InitializeComponent();
-      IEnumerator<ISymbolicExpressionTreeStringFormatter> formatters = ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeStringFormatter>().GetEnumerator();
+      IEnumerable<ISymbolicExpressionTreeStringFormatter> formatters = ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeStringFormatter>();
       treeFormattersList = new List<ISymbolicExpressionTreeStringFormatter>();
-      formatters.MoveNext();
       int selectedIndex = -1;
-      while (formatters.Current != null) {
-        if (formatters.Current is SymbolicExpressionTreeStringFormatter)
+      foreach (ISymbolicExpressionTreeStringFormatter formatter in formatters) {
+        if (formatter is SymbolicExpressionTreeStringFormatter)
           selectedIndex = treeFormattersList.Count;
-        ISymbolicExpressionTreeStringFormatter formatter = formatters.Current.Clone() as ISymbolicExpressionTreeStringFormatter;
         treeFormattersList.Add(formatter);
         formattersComboBox.Items.Add(formatter.Name);
-        formatters.MoveNext();
       }
       formattersComboBox.SelectedIndex = selectedIndex;
@@ -57 +54 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      UpdateTextbox();
+    }
+
+    private void UpdateTextbox() {
       if (Content == null)
         textBox.Text = string.Empty;
@@ -70 +71 @@
 
     private void formattersComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
-      OnContentChanged();
+      UpdateTextbox();
     }
   }