Changeset 10566 for trunk/sources

Timestamp:

03/07/14 16:31:17 (11 years ago)

Author:

abeham

Message:

#2136:

• Made Variables class public (could be used in other scripts as well)
• Renamed ItemName to "C# Script"

Location:

trunk/sources/HeuristicLab.Scripting/3.3

Files:

• HeuristicLab.Scripting-3.3.csproj (modified) (1 diff)
• Script.cs (modified) (1 diff)
• UserScriptBase.cs (modified) (1 diff)
• Variables.cs (added)

trunk/sources/HeuristicLab.Scripting/3.3/HeuristicLab.Scripting-3.3.csproj

@@ -85 +85 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Variables.cs" />
     <Compile Include="VariableStore.cs" />
     <None Include="Plugin.cs.frame" />

trunk/sources/HeuristicLab.Scripting/3.3/Script.cs

@@ -38 +38 @@
 
 namespace HeuristicLab.Scripting {
-  [Item("Script", "An empty C# script.")]
+  [Item("C# Script", "An empty C# script.")]
   [Creatable("Scripts")]
   [StorableClass]

trunk/sources/HeuristicLab.Scripting/3.3/UserScriptBase.cs

@@ -52 +52 @@
       var handler = ConsoleOutputChanged;
       if (handler != null) handler(null, new EventArgs<string>(args));
-    }
-
-    protected class Variables : DynamicObject, IEnumerable<KeyValuePair<string, object>> {
-      private readonly VariableStore variableStore;
-
-      public ICollection<string> Keys {
-        get { return variableStore.Keys; }
-      }
-
-      public ICollection<object> Values {
-        get { return variableStore.Values; }
-      }
-
-      public Variables(VariableStore variableStore) {
-        this.variableStore = variableStore;
-      }
-
-      public override bool TryGetMember(GetMemberBinder binder, out object result) {
-        return variableStore.TryGetValue(binder.Name, out result);
-      }
-
-      public override bool TrySetMember(SetMemberBinder binder, object value) {
-        variableStore[binder.Name] = value;
-        return true;
-      }
-
-      public bool Contains(string variableName) {
-        return variableStore.ContainsKey(variableName);
-      }
-
-      public IEnumerator<KeyValuePair<string, object>> GetEnumerator() {
-        return variableStore.GetEnumerator();
-      }
-
-      IEnumerator IEnumerable.GetEnumerator() {
-        return GetEnumerator();
-      }
     }