loading an aligmment w/ base alignment always emits an event

fixes #140
halestudio · Aug 24, 2016 · 849a9d7 · 849a9d7
1 parent cea6223
commit 849a9d7
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...oldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/align/internal/AlignmentServiceImpl.java b/...oldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/align/internal/AlignmentServiceImpl.java
@@ -211,6 +211,8 @@ public void addOrUpdateAlignment(MutableAlignment alignment) {
 //			_log.warn("Adding alignments currently does not support merging of base alignments. Import base alignments independently.");
 //		}
 
+		boolean addedBaseCells = false;
+
 		// add cells
 		synchronized (this) {
 
@@ -219,9 +221,13 @@ public void addOrUpdateAlignment(MutableAlignment alignment) {
 					this.alignment.addCell((MutableCell) cell);
 					added.add(cell);
 				}
-				else if (!(cell instanceof BaseAlignmentCell))
+				else if (!(cell instanceof BaseAlignmentCell)) {
 					throw new IllegalStateException(
 							"The given alignment contained a cell which is neither mutable nor from a base alignment.");
+				}
+				else {
+					addedBaseCells = true;
+				}
 			}
 		}
 
@@ -255,7 +261,7 @@ else if (!(cell instanceof BaseAlignmentCell))
 			}
 		}
 
-		if (!added.isEmpty() && addedFunctions) {
+		if (addedBaseCells || (!added.isEmpty() && addedFunctions)) {
 			// only emit one combined event (not to trigger multiple
 			// transformations)
 			notifyAlignmentChanged();