Changeset 12505 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

Timestamp:

06/25/15 11:26:25 (9 years ago)

Author:

mkommend

Message:

#2276: Merged trunk changes into dataset refactoring branch.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

• . (modified) (2 props)
• HeuristicLab.CodeEditor/3.4/CodeEditor.cs (modified) (11 diffs)

branches/HeuristicLab.DatasetRefactor/sources/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
   }
 }