Changeset 15973 for branches/2522_RefactorPluginInfrastructure/HeuristicLab.Data/3.3/StringArray.cs

Timestamp:

06/28/18 11:13:37 (6 years ago)

Author:

gkronber

Message:

#2522: merged trunk changes from r13402:15972 to branch resolving conflicts where necessary

Location:

branches/2522_RefactorPluginInfrastructure

Files:

• . (modified) (2 props)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3/StringArray.cs (modified) (12 diffs)

branches/2522_RefactorPluginInfrastructure

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

@@ -24 +24 @@
 protoc.exe
 obj
+.vs

branches/2522_RefactorPluginInfrastructure/HeuristicLab.Data/3.3/StringArray.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -61 +61 @@
     public virtual int Length {
       get { return array.Length; }
-      protected set {
+      set {
         if (ReadOnly) throw new NotSupportedException("Length cannot be set. StringArray is read-only.");
         if (value != Length) {
@@ -72 +72 @@
       }
     }
+    [Storable]
+    protected bool resizable = true;
+    public bool Resizable {
+      get { return resizable; }
+      set {
+        if (resizable != value) {
+          resizable = value;
+          OnResizableChanged();
+        }
+      }
+    }
+
     public virtual string this[int index] {
       get { return array[index]; }
@@ -102 +114 @@
       this.array = (string[])original.array.Clone();
       this.readOnly = original.readOnly;
+      this.resizable = original.resizable;
       this.elementNames = new List<string>(original.elementNames);
     }
@@ -107 +120 @@
       array = new string[0];
       readOnly = false;
+      resizable = true;
       elementNames = new List<string>();
     }
@@ -114 +128 @@
         array[i] = string.Empty;
       readOnly = false;
+      resizable = true;
       elementNames = new List<string>();
     }
@@ -122 +137 @@
         array[i] = elements[i] == null ? string.Empty : elements[i];
       readOnly = false;
+      resizable = true;
       elementNames = new List<string>();
     }
@@ -133 +149 @@
       readOnlyStringArray.readOnly = true;
       return readOnlyStringArray;
+    }
+    IValueTypeArray IValueTypeArray.AsReadOnly() {
+      return AsReadOnly();
     }
 
@@ -155 +174 @@
       return array.Cast<string>().GetEnumerator();
     }
-
     IEnumerator IEnumerable.GetEnumerator() {
       return GetEnumerator();
@@ -181 +199 @@
     }
 
+    public event EventHandler ResizableChanged;
+    protected virtual void OnResizableChanged() {
+      EventHandler handler = ResizableChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
+    }
     public event EventHandler ElementNamesChanged;
     protected virtual void OnElementNamesChanged() {
@@ -187 +211 @@
         handler(this, EventArgs.Empty);
     }
-
     public event EventHandler<EventArgs<int>> ItemChanged;
     protected virtual void OnItemChanged(int index) {
@@ -203 +226 @@
 
     #region IStringConvertibleArray Members
-    int IStringConvertibleArray.Length {
-      get { return Length; }
-      set { Length = value; }
-    }
     bool IStringConvertibleArray.Validate(string value, out string errorMessage) {
       return Validate(value, out errorMessage);

@@ -24 +24 @@
 protoc.exe
 obj
+.vs