Changeset 10876

Timestamp:

05/21/14 13:38:59 (11 years ago)

Author:

rstoll

Message:

• Do not open Search and Replace twice
• SelectionChanged event caused a NullPointer fixed

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (3 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

@@ -78 +78 @@
 
     void DataGridView_SelectionChanged(object sender, EventArgs e) {
-      if (!isSearching) {
+      if (!isSearching && Content != null) {
         Content.DataGridLogic.SetSelection(GetSelectedCells());
       }
@@ -155 +155 @@
 
     private void CreateFindAndReplaceDialog() {
-      findAndReplaceDialog = new SearchAndReplaceDialog();
-      findAndReplaceDialog.Show(this);
-      if (AreMultipleCellsSelected()) {
-        ResetHighlightedCellsBackground();
-        HightlightedCellsBackground = GetSelectedCells();
-        dataGridView.ClearSelection();
-      }
-      findAndReplaceDialog.FindAllEvent += findAndReplaceDialog_FindAllEvent;
-      findAndReplaceDialog.FindNextEvent += findAndReplaceDialog_FindNextEvent;
-      findAndReplaceDialog.ReplaceAllEvent += findAndReplaceDialog_ReplaceAllEvent;
-      findAndReplaceDialog.ReplaceNextEvent += findAndReplaceDialog_ReplaceEvent;
-      findAndReplaceDialog.FormClosing += findAndReplaceDialog_FormClosing;
-      searchIterator = null;
-      DataGridView.SelectionChanged += DataGridView_SelectionChanged_FindAndReplace;
+      if (findAndReplaceDialog == null || findAndReplaceDialog.IsDisposed) {
+        findAndReplaceDialog = new SearchAndReplaceDialog();
+        findAndReplaceDialog.Show(this);
+        if (AreMultipleCellsSelected()) {
+          ResetHighlightedCellsBackground();
+          HightlightedCellsBackground = GetSelectedCells();
+          dataGridView.ClearSelection();
+        }
+        findAndReplaceDialog.FindAllEvent += findAndReplaceDialog_FindAllEvent;
+        findAndReplaceDialog.FindNextEvent += findAndReplaceDialog_FindNextEvent;
+        findAndReplaceDialog.ReplaceAllEvent += findAndReplaceDialog_ReplaceAllEvent;
+        findAndReplaceDialog.ReplaceNextEvent += findAndReplaceDialog_ReplaceEvent;
+        findAndReplaceDialog.FormClosing += findAndReplaceDialog_FormClosing;
+        searchIterator = null;
+        DataGridView.SelectionChanged += DataGridView_SelectionChanged_FindAndReplace;
+      }
     }
 
@@ -198 +200 @@
 
     void findAndReplaceDialog_FindNextEvent(object sender, EventArgs e) {
-      if (searchIterator == null || 
-        currentSearchText != findAndReplaceDialog.GetSearchText() || 
+      if (searchIterator == null ||
+        currentSearchText != findAndReplaceDialog.GetSearchText() ||
         currentComparisonOperation != findAndReplaceDialog.GetComparisonOperation()) {
         searchIterator = new FindPreprocessingItemsIterator(FindAll(findAndReplaceDialog.GetSearchText()));