Changeset 10891 for stable/HeuristicLab.HLScript.Views/3.3/VariableStoreView.cs

Timestamp:

05/26/14 16:38:08 (11 years ago)

Author:

abeham

Message:

#2136: merged r10359, r10391, r10401, r10506 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.HLScript.Views (copied) (copied from trunk/sources/HeuristicLab.HLScript.Views)
• HeuristicLab.HLScript.Views/3.3 (modified) (1 prop)
• HeuristicLab.HLScript.Views/3.3/VariableStoreView.cs (modified) (6 diffs)

stable/HeuristicLab.HLScript.Views/3.3/VariableStoreView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
 using System.Drawing;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
@@ -36 +37 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.HLScript.Views {
+namespace HeuristicLab.Scripting.Views {
   [View("ItemCollection View")]
   [Content(typeof(VariableStore), true)]
@@ -114 +115 @@
         removeButton.Enabled = !Locked && !ReadOnly && variableListView.SelectedItems.Count > 0;
         variableListView.Enabled = true;
+        variableListView.LabelEdit = !Locked && !ReadOnly;
       }
     }
@@ -287 +289 @@
     }
 
+    private readonly Regex SafeVariableNameRegex = new Regex("^[@]?[_a-zA-Z][_a-zA-Z0-9]*$");
     private void variableListView_AfterLabelEdit(object sender, LabelEditEventArgs e) {
-      if (!string.IsNullOrEmpty(e.Label)) {
+      string name = e.Label;
+      if (!string.IsNullOrEmpty(name) && SafeVariableNameRegex.IsMatch(name)) {
         var variable = (KeyValuePair<string, object>)variableListView.Items[e.Item].Tag;
-        if (!Content.ContainsKey(e.Label)) {
+        if (!Content.ContainsKey(name)) {
           Content.Remove(variable.Key);
-          Content.Add(e.Label, variable.Value);
+          Content.Add(name, variable.Value);
         }
       }
@@ -389 +393 @@
     }
     protected virtual void AdjustListViewColumnSizes() {
-      if (variableListView.Items.Count > 0) {
-        for (int i = 0; i < variableListView.Columns.Count; i++)
-          variableListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
-      }
+      foreach (ColumnHeader ch in variableListView.Columns)
+        ch.Width = -2;
     }
     protected virtual void RebuildImageList() {