Ignore:
Timestamp:
07/07/15 18:07:59 (4 years ago)
Author:
ascheibe
Message:

#2329 merged r12473,r12478,r12659 into stable

Location:
stable
Files:
4 edited
3 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

    r12009 r12662  
    2727using System.Threading.Tasks;
    2828using System.Windows.Documents;
    29 using HeuristicLab.Common;
    3029using ICSharpCode.AvalonEdit;
    3130using ICSharpCode.AvalonEdit.AddIn;
     
    3736using ICSharpCode.AvalonEdit.Search;
    3837using ICSharpCode.NRefactory.Editor;
    39 using ICSharpCode.NRefactory.TypeSystem;
    4038using ICSharpCode.SharpDevelop.Editor;
    4139using Forms = System.Windows.Forms;
     
    4442
    4543namespace HeuristicLab.CodeEditor {
    46   public partial class CodeEditor : Forms.UserControl {
     44  public partial class CodeEditor : CodeEditorBase {
    4745    private static readonly Media.Color WarningColor = Media.Colors.Blue;
    4846    private static readonly Media.Color ErrorColor = Media.Colors.Red;
     
    7371    private ITextMarker prefixMarker;
    7472    private string prefix = string.Empty;
    75     public string Prefix {
     73    public override string Prefix {
    7674      get { return prefix; }
    7775      set {
     
    9189    private ITextMarker suffixMarker;
    9290    private string suffix = string.Empty;
    93     public string Suffix {
     91    public override string Suffix {
    9492      get { return suffix; }
    9593      set {
     
    108106    }
    109107
    110     public string UserCode {
     108    public override string UserCode {
    111109      get { return Doc.GetText(prefix.Length, Doc.TextLength - suffix.Length - prefix.Length); }
    112110      set {
     
    163161    #endregion
    164162
    165     public bool ReadOnly {
     163    public override bool ReadOnly {
    166164      get { return TextEditor.IsReadOnly; }
    167165      set { TextEditor.IsReadOnly = value; }
     
    259257
    260258    #region Assembly Management
    261     public void AddAssembly(Assembly a) {
     259    public override void AddAssembly(Assembly a) {
    262260      assemblyLoader.AddAssembly(a);
    263261    }
    264262
    265     public void AddAssemblies(IEnumerable<Assembly> assemblies) {
     263    public override void AddAssemblies(IEnumerable<Assembly> assemblies) {
    266264      assemblyLoader.AddAssemblies(assemblies);
    267265    }
    268266
    269     public async Task AddAssembliesAsync(IEnumerable<Assembly> assemblies) {
     267    public override async Task AddAssembliesAsync(IEnumerable<Assembly> assemblies) {
    270268      await assemblyLoader.AddAssembliesAsync(assemblies);
    271269    }
    272270
    273     public void RemoveAssembly(Assembly a) {
     271    public override void RemoveAssembly(Assembly a) {
    274272      assemblyLoader.RemoveAssembly(a);
    275273    }
    276274    #endregion
    277275
    278     public void ScrollToPosition(int line, int column) {
     276    public override void ScrollToPosition(int line, int column) {
    279277      var segment = GetSegmentAtLocation(line, column);
    280278      TextEditor.CaretOffset = segment.Offset + segment.Length;
     
    282280    }
    283281
    284     public void ScrollAfterPrefix() {
     282    public override void ScrollAfterPrefix() {
    285283      var location = Doc.GetLocation(prefix.Length);
    286284      ScrollToPosition(location.Line, location.Column);
     
    399397
    400398    #region Compiler Errors
    401     public void ShowCompileErrors(CompilerErrorCollection compilerErrors) {
     399    public override void ShowCompileErrors(CompilerErrorCollection compilerErrors) {
    402400      if (compilerErrors == null) return;
    403401
     
    446444      }
    447445    }
    448 
    449     #region Events
    450     public event EventHandler TextEditorTextChanged;
    451     private void OnTextEditorTextChanged() {
    452       var handler = TextEditorTextChanged;
    453       if (handler != null) handler(this, EventArgs.Empty);
    454     }
    455 
    456     public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesLoading;
    457     private void OnAssembliesLoading(IEnumerable<Assembly> args) {
    458       var handler = AssembliesLoading;
    459       if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
    460     }
    461 
    462     public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesLoaded;
    463     private void OnAssembliesLoaded(IEnumerable<Assembly> args) {
    464       var handler = AssembliesLoaded;
    465       if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
    466     }
    467 
    468     public event EventHandler<EventArgs<IEnumerable<IUnresolvedAssembly>>> InternalAssembliesLoaded;
    469     private void OnInternalAssembliesLoaded(IEnumerable<IUnresolvedAssembly> args) {
    470       var handler = InternalAssembliesLoaded;
    471       if (handler != null) handler(this, new EventArgs<IEnumerable<IUnresolvedAssembly>>(args));
    472     }
    473 
    474     public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesUnloading;
    475     private void OnAssembliesUnloading(IEnumerable<Assembly> args) {
    476       var handler = AssembliesUnloading;
    477       if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
    478     }
    479 
    480     public event EventHandler<EventArgs<IEnumerable<Assembly>>> AssembliesUnloaded;
    481     private void OnAssembliesUnloaded(IEnumerable<Assembly> args) {
    482       var handler = AssembliesUnloaded;
    483       if (handler != null) handler(this, new EventArgs<IEnumerable<Assembly>>(args));
    484     }
    485 
    486     public event EventHandler<EventArgs<IEnumerable<IUnresolvedAssembly>>> InternalAssembliesUnloaded;
    487     private void OnInternalAssembliesUnloaded(IEnumerable<IUnresolvedAssembly> args) {
    488       var handler = InternalAssembliesUnloaded;
    489       if (handler != null) handler(this, new EventArgs<IEnumerable<IUnresolvedAssembly>>(args));
    490     }
    491     #endregion
    492446  }
    493447}
  • stable/HeuristicLab.CodeEditor/3.4/CodeEditorBase.cs

    r12473 r12662  
    2525using System.Reflection;
    2626using System.Threading.Tasks;
     27using System.Windows.Forms;
    2728using HeuristicLab.Common;
    2829using ICSharpCode.NRefactory.TypeSystem;
    2930
    3031namespace HeuristicLab.CodeEditor {
    31   public class CodeEditorBase : System.Windows.Forms.UserControl {
     32  public class CodeEditorBase : UserControl {
    3233    public virtual string UserCode { get; set; }
    3334
     
    6061    #region Events
    6162    public event EventHandler TextEditorTextChanged;
    62     protected virtual void TextEditor_TextChanged(object sender, EventArgs e) {
    63       if (TextEditorTextChanged != null) {
    64         TextEditorTextChanged(this, new EventArgs());
    65       }
    66     }
    6763    protected virtual void OnTextEditorTextChanged() {
    6864      var handler = TextEditorTextChanged;
  • stable/HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj

    r12007 r12662  
    136136    <Compile Include="GoToLineDialog.Designer.cs">
    137137      <DependentUpon>GoToLineDialog.cs</DependentUpon>
     138    </Compile>
     139    <Compile Include="CodeEditorBase.cs">
     140      <SubType>UserControl</SubType>
    138141    </Compile>
    139142    <Compile Include="LanguageFeatures\CodeFolding\CodeFoldingResult.cs" />
     
    173176      <DependentUpon>CodeEditor.cs</DependentUpon>
    174177    </Compile>
     178    <Compile Include="SimpleCodeEditor.cs">
     179      <SubType>UserControl</SubType>
     180    </Compile>
     181    <Compile Include="SimpleCodeEditor.Designer.cs">
     182      <DependentUpon>SimpleCodeEditor.cs</DependentUpon>
     183    </Compile>
    175184    <Compile Include="AvalonEditWrapper.xaml.cs">
    176185      <DependentUpon>AvalonEditWrapper.xaml</DependentUpon>
  • stable/HeuristicLab.CodeEditor/3.4/Plugin.cs.frame

    r12009 r12662  
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
    2828  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     29  [PluginDependency("HeuristicLab.NRefactory", "5.5.0")]
     30#if !__MonoCS__
    2931  [PluginDependency("HeuristicLab.AvalonEdit", "5.0.1")]
    30   [PluginDependency("HeuristicLab.NRefactory", "5.5.0")]
     32#endif
    3133  public class HeuristicLabCodeEditorPlugin : PluginBase {
    3234  }
  • stable/HeuristicLab.CodeEditor/3.4/SimpleCodeEditor.Designer.cs

    r12473 r12662  
    2929      // TextEditor
    3030      //
    31       this.TextEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    32             | System.Windows.Forms.AnchorStyles.Left)
     31      this.TextEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     32            | System.Windows.Forms.AnchorStyles.Left) 
    3333            | System.Windows.Forms.AnchorStyles.Right)));
    3434      this.TextEditor.Location = new System.Drawing.Point(3, 3);
     
    3737      this.TextEditor.Size = new System.Drawing.Size(158, 57);
    3838      this.TextEditor.TabIndex = 0;
     39      this.TextEditor.TextChanged += new System.EventHandler(this.TextEditor_TextChanged);
    3940      //
    40       // CodeEditor
     41      // SimpleCodeEditor
    4142      //
    4243      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    4344      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    4445      this.Controls.Add(this.TextEditor);
    45       this.Name = "CodeEditor";
     46      this.Name = "SimpleCodeEditor";
    4647      this.Size = new System.Drawing.Size(164, 63);
    4748      this.ResumeLayout(false);
  • stable/HeuristicLab.CodeEditor/3.4/SimpleCodeEditor.cs

    r12473 r12662  
    2020#endregion
    2121
     22using System;
     23
    2224namespace HeuristicLab.CodeEditor {
    2325  public partial class SimpleCodeEditor : CodeEditorBase {
     
    3436      }
    3537    }
     38
     39    protected virtual void TextEditor_TextChanged(object sender, EventArgs e) {
     40      OnTextEditorTextChanged();
     41    }
    3642  }
    3743}
Note: See TracChangeset for help on using the changeset viewer.