Changeset 11807 for trunk/sources/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs

Timestamp:

01/21/15 10:12:08 (9 years ago)

Author:

jkarder

Message:

#2077: merged r11700:11806 back to trunk

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs

@@ -82 +82 @@
       base.OnContentChanged();
       if (ProgrammableOperator == null) {
-        codeEditor.UserCode = "";
+        codeEditor.UserCode = string.Empty;
         assembliesTreeView.Nodes.Clear();
         parameterCollectionView.Content = null;
       } else {
         codeEditor.Prefix = GetGeneratedPrefix();
-        codeEditor.Suffix = String.Format("    {0}\n  }}\n}}", ProgrammableOperator.MethodSuffix);
+        codeEditor.Suffix = String.Format("    {0}{1}  }}{1}}}", ProgrammableOperator.MethodSuffix, Environment.NewLine);
         codeEditor.UserCode = ProgrammableOperator.Code;
-        if (codeEditor.UserCode == "")
-          codeEditor.UserCode = "    \n    \n    \n    \n";
+        if (codeEditor.UserCode == string.Empty)
+          codeEditor.UserCode = string.Format("    {0}", Environment.NewLine);
         InitializeAssemblyList();
         InitializeNamespacesList();
-        foreach (var a in ProgrammableOperator.SelectedAssemblies) {
-          codeEditor.AddAssembly(a);
-        }
+        codeEditor.AddAssemblies(ProgrammableOperator.SelectedAssemblies);
         codeEditor.ScrollAfterPrefix();
-        codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors, "ProgrammableOperator");
-        showCodeButton.Enabled =
-          ProgrammableOperator.CompilationUnitCode != null &&
-          ProgrammableOperator.CompilationUnitCode.Length > 0;
+        codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors);
+        showCodeButton.Enabled = !string.IsNullOrEmpty(ProgrammableOperator.CompilationUnitCode);
         parameterCollectionView.Content = ProgrammableOperator.Parameters;
         if (ProgrammableOperator.CompileErrors == null) {