Ignore:
Timestamp:
05/26/14 16:38:08 (5 years ago)
Author:
abeham
Message:

#2136: merged r10359, r10391, r10401, r10506 to stable

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.CodeEditor/3.3/CodeEditor.cs

    r5287 r10891  
    140140      if (TextEditorValidated != null)
    141141        TextEditorValidated(this, EventArgs.Empty);
     142    }
     143
     144    public event EventHandler TextEditorTextChanged;
     145
     146    protected void OnTextEditorTextChanged() {
     147      if (TextEditorTextChanged != null)
     148        TextEditorTextChanged(this, EventArgs.Empty);
    142149    }
    143150
     
    188195
    189196      textEditor.Validated += (s, a) => { OnTextEditorValidated(); };
     197      textEditor.TextChanged += (s, a) => { OnTextEditorTextChanged(); };
    190198      InitializeImageList();
    191199    }
     
    298306    public void AddAssembly(Assembly a) {
    299307      ShowMessage("Loading " + a.GetName().Name + "...");
    300       if (assemblies.Contains(a))
    301         return;
    302       var reference = projectContentRegistry.GetProjectContentForReference(a.GetName().Name, a.Location);
    303       projectContent.AddReferencedContent(reference);
    304       assemblies.Add(a);
     308      if (!assemblies.Contains(a)) {
     309        var reference = projectContentRegistry.GetProjectContentForReference(a.GetName().Name, a.Location);
     310        projectContent.AddReferencedContent(reference);
     311        assemblies.Add(a);
     312      }
    305313      ShowMessage("Ready");
    306314    }
    307315    public void RemoveAssembly(Assembly a) {
    308316      ShowMessage("Unloading " + a.GetName().Name + "...");
    309       if (!assemblies.Contains(a))
    310         return;
    311       var content = projectContentRegistry.GetExistingProjectContent(a.Location);
    312       if (content != null) {
    313         projectContent.ReferencedContents.Remove(content);
    314         projectContentRegistry.UnloadProjectContent(content);
     317      if (assemblies.Contains(a)) {
     318        var content = projectContentRegistry.GetExistingProjectContent(a.Location);
     319        if (content != null) {
     320          projectContent.ReferencedContents.Remove(content);
     321          projectContentRegistry.UnloadProjectContent(content);
     322        }
    315323      }
    316324      ShowMessage("Ready");
Note: See TracChangeset for help on using the changeset viewer.