Changeset 12662

Timestamp:

07/07/15 18:07:59 (9 years ago)

Author:

ascheibe

Message:

#2329 merged r12473,r12478,r12659 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.CodeEditor/3.4/CodeEditor.cs (modified) (11 diffs)
• HeuristicLab.CodeEditor/3.4/CodeEditorBase.cs (copied) (copied from trunk/sources/HeuristicLab.CodeEditor/3.4/CodeEditorBase.cs) (2 diffs)
• HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj (modified) (2 diffs)
• HeuristicLab.CodeEditor/3.4/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.CodeEditor/3.4/SimpleCodeEditor.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.CodeEditor/3.4/SimpleCodeEditor.Designer.cs) (2 diffs)
• HeuristicLab.CodeEditor/3.4/SimpleCodeEditor.cs (copied) (copied from trunk/sources/HeuristicLab.CodeEditor/3.4/SimpleCodeEditor.cs) (2 diffs)
• HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs (modified) (2 diffs)
• HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs (modified) (4 diffs)

stable/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

@@ -27 +27 @@
 using System.Threading.Tasks;
 using System.Windows.Documents;
-using HeuristicLab.Common;
 using ICSharpCode.AvalonEdit;
 using ICSharpCode.AvalonEdit.AddIn;
@@ -37 +36 @@
 using ICSharpCode.AvalonEdit.Search;
 using ICSharpCode.NRefactory.Editor;
-using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop.Editor;
 using Forms = System.Windows.Forms;
@@ -44 +42 @@
 
 namespace HeuristicLab.CodeEditor {
-  public partial class CodeEditor : Forms.UserControl {
+  public partial class CodeEditor : CodeEditorBase {
     private static readonly Media.Color WarningColor = Media.Colors.Blue;
     private static readonly Media.Color ErrorColor = Media.Colors.Red;
@@ -73 +71 @@
     private ITextMarker prefixMarker;
     private string prefix = string.Empty;
-    public string Prefix {
+    public override string Prefix {
       get { return prefix; }
       set {
@@ -91 +89 @@
     private ITextMarker suffixMarker;
     private string suffix = string.Empty;
-    public string Suffix {
+    public override string Suffix {
       get { return suffix; }
       set {
@@ -108 +106 @@
     }
 
-    public string UserCode {
+    public override string UserCode {
       get { return Doc.GetText(prefix.Length, Doc.TextLength - suffix.Length - prefix.Length); }
       set {
@@ -163 +161 @@
     #endregion
 
-    public bool ReadOnly {
+    public override bool ReadOnly {
       get { return TextEditor.IsReadOnly; }
       set { TextEditor.IsReadOnly = value; }
@@ -259 +257 @@
 
     #region Assembly Management
-    public void AddAssembly(Assembly a) {
+    public override void AddAssembly(Assembly a) {
       assemblyLoader.AddAssembly(a);
     }
 
-    public void AddAssemblies(IEnumerable<Assembly> assemblies) {
+    public override void AddAssemblies(IEnumerable<Assembly> assemblies) {
       assemblyLoader.AddAssemblies(assemblies);
     }
 
-    public async Task AddAssembliesAsync(IEnumerable<Assembly> assemblies) {
+    public override async Task AddAssembliesAsync(IEnumerable<Assembly> assemblies) {
       await assemblyLoader.AddAssembliesAsync(assemblies);
     }
 
-    public void RemoveAssembly(Assembly a) {
+    public override void RemoveAssembly(Assembly a) {
       assemblyLoader.RemoveAssembly(a);
     }
     #endregion
 
-    public void ScrollToPosition(int line, int column) {
+    public override void ScrollToPosition(int line, int column) {
       var segment = GetSegmentAtLocation(line, column);
       TextEditor.CaretOffset = segment.Offset + segment.Length;
@@ -282 +280 @@
     }
 
-    public void ScrollAfterPrefix() {
+    public override void ScrollAfterPrefix() {
       var location = Doc.GetLocation(prefix.Length);
       ScrollToPosition(location.Line, location.Column);
@@ -399 +397 @@
 
     #region Compiler Errors
-    public void ShowCompileErrors(CompilerErrorCollection compilerErrors) {
+    public override void ShowCompileErrors(CompilerErrorCollection compilerErrors) {
       if (compilerErrors == null) return;
 
@@ -446 +444 @@
       }
     }
-
-    #region Events
-    public event EventHandler TextEditorTextChanged;
-    private void OnTextEditorTextChanged() {
-      var handler = TextEditorTextChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesLoading;
-    private void OnAssembliesLoading(IEnumerable<Assembly> args) {
-      var handler = AssembliesLoading;
-      if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
-    }
-
-    public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesLoaded;
-    private void OnAssembliesLoaded(IEnumerable<Assembly> args) {
-      var handler = AssembliesLoaded;
-      if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
-    }
-
-    public event EventHandler<EventArgs<IEnumerable<IUnresolvedAssembly>>> InternalAssembliesLoaded;
-    private void OnInternalAssembliesLoaded(IEnumerable<IUnresolvedAssembly> args) {
-      var handler = InternalAssembliesLoaded;
-      if (handler != null) handler(this, new EventArgs<IEnumerable<IUnresolvedAssembly>>(args));
-    }
-
-    public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesUnloading;
-    private void OnAssembliesUnloading(IEnumerable<Assembly> args) {
-      var handler = AssembliesUnloading;
-      if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
-    }
-
-    public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesUnloaded;
-    private void OnAssembliesUnloaded(IEnumerable<Assembly> args) {
-      var handler = AssembliesUnloaded;
-      if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
-    }
-
-    public event EventHandler<EventArgs<IEnumerable<IUnresolvedAssembly>>> InternalAssembliesUnloaded;
-    private void OnInternalAssembliesUnloaded(IEnumerable<IUnresolvedAssembly> args) {
-      var handler = InternalAssembliesUnloaded;
-      if (handler != null) handler(this, new EventArgs<IEnumerable<IUnresolvedAssembly>>(args));
-    }
-    #endregion
   }
 }

stable/HeuristicLab.CodeEditor/3.4/CodeEditorBase.cs

@@ -25 +25 @@
 using System.Reflection;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using HeuristicLab.Common;
 using ICSharpCode.NRefactory.TypeSystem;
 
 namespace HeuristicLab.CodeEditor {
-  public class CodeEditorBase : System.Windows.Forms.UserControl {
+  public class CodeEditorBase : UserControl {
     public virtual string UserCode { get; set; }
 
@@ -60 +61 @@
     #region Events
     public event EventHandler TextEditorTextChanged;
-    protected virtual void TextEditor_TextChanged(object sender, EventArgs e) {
-      if (TextEditorTextChanged != null) {
-        TextEditorTextChanged(this, new EventArgs());
-      }
-    }
     protected virtual void OnTextEditorTextChanged() {
       var handler = TextEditorTextChanged;

stable/HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj

@@ -136 +136 @@
     <Compile Include="GoToLineDialog.Designer.cs">
       <DependentUpon>GoToLineDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CodeEditorBase.cs">
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="LanguageFeatures\CodeFolding\CodeFoldingResult.cs" />
@@ -173 +176 @@
       <DependentUpon>CodeEditor.cs</DependentUpon>
     </Compile>
+    <Compile Include="SimpleCodeEditor.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SimpleCodeEditor.Designer.cs">
+      <DependentUpon>SimpleCodeEditor.cs</DependentUpon>
+    </Compile>
     <Compile Include="AvalonEditWrapper.xaml.cs">
       <DependentUpon>AvalonEditWrapper.xaml</DependentUpon>

stable/HeuristicLab.CodeEditor/3.4/Plugin.cs.frame

@@ -27 +27 @@
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
+  [PluginDependency("HeuristicLab.NRefactory", "5.5.0")]
+#if !__MonoCS__
   [PluginDependency("HeuristicLab.AvalonEdit", "5.0.1")]
-  [PluginDependency("HeuristicLab.NRefactory", "5.5.0")]
+#endif
   public class HeuristicLabCodeEditorPlugin : PluginBase {
   }

stable/HeuristicLab.CodeEditor/3.4/SimpleCodeEditor.Designer.cs

@@ -29 +29 @@
       // TextEditor
       // 
-      this.TextEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.TextEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.TextEditor.Location = new System.Drawing.Point(3, 3);
@@ -37 +37 @@
       this.TextEditor.Size = new System.Drawing.Size(158, 57);
       this.TextEditor.TabIndex = 0;
+      this.TextEditor.TextChanged += new System.EventHandler(this.TextEditor_TextChanged);
       // 
-      // CodeEditor
+      // SimpleCodeEditor
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.TextEditor);
-      this.Name = "CodeEditor";
+      this.Name = "SimpleCodeEditor";
       this.Size = new System.Drawing.Size(164, 63);
       this.ResumeLayout(false);

stable/HeuristicLab.CodeEditor/3.4/SimpleCodeEditor.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+
 namespace HeuristicLab.CodeEditor {
   public partial class SimpleCodeEditor : CodeEditorBase {
@@ -34 +36 @@
       }
     }
+
+    protected virtual void TextEditor_TextChanged(object sender, EventArgs e) {
+      OnTextEditorTextChanged();
+    }
   }
 }

stable/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.Designer.cs

@@ -55 +55 @@
       this.showCodeButton = new System.Windows.Forms.Button();
       this.compileButton = new System.Windows.Forms.Button();
+#if __MonoCS__
+      this.codeEditor = new HeuristicLab.CodeEditor.SimpleCodeEditor();
+#else
       this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor();
+#endif
       this.tabControl1 = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
       this.tabPage1 = new System.Windows.Forms.TabPage();
@@ -324 +328 @@
     private HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView;
     private System.Windows.Forms.SplitContainer splitContainer1;
-    private HeuristicLab.CodeEditor.CodeEditor codeEditor;
+    private HeuristicLab.CodeEditor.CodeEditorBase codeEditor;
     private System.Windows.Forms.Button compileButton;
     private System.Windows.Forms.Button showCodeButton;

stable/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs

@@ -131 +131 @@
     }
     private void showCodeButton_Click(object sender, EventArgs e) {
+#if __MonoCS__
+      new TextDialog("CodeViewer", ProgrammableOperator.CompilationUnitCode, true).ShowDialog(this);
+#else
       new CodeViewer(ProgrammableOperator.CompilationUnitCode).ShowDialog(this);
+#endif
     }
     private void codeEditor_Validated(object sender, EventArgs e) {
@@ -199 +203 @@
       try {
         ProgrammableOperator.Compile();
-      } catch (Exception ex) {
+      }
+      catch (Exception ex) {
         ErrorHandling.ShowErrorDialog(this, ex);
       }

stable/HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
-using System.Reflection;
-using HeuristicLab.Common;
 
 namespace HeuristicLab.Scripting.Views {
@@ -64 +61 @@
       this.columnColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
       this.descriptionColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+#if __MonoCS__
+      this.codeEditor = new HeuristicLab.CodeEditor.SimpleCodeEditor();
+#else
       this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor();
+#endif
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
@@ -225 +226 @@
       // splitContainer1
       // 
-      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.splitContainer1.Location = new System.Drawing.Point(0, 56);
@@ -287 +288 @@
     protected System.Windows.Forms.ColumnHeader columnColumnHeader;
     protected System.Windows.Forms.ColumnHeader descriptionColumnHeader;
-    protected CodeEditor.CodeEditor codeEditor;
+    protected CodeEditor.CodeEditorBase codeEditor;
     protected System.Windows.Forms.SplitContainer splitContainer1;
   }