From 757377b53d9817ec44b81ac4cdcf78c198dd3f06 Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Fri, 17 Jun 2016 14:57:29 +0200
Subject: [PATCH] fix concurrentModificationException

---
 .../AbstractFilteredCdmResourceSelectionDialog.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
index 230cb9837..6ad564e44 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
@@ -14,6 +14,7 @@ import java.lang.reflect.Field;
 import java.text.Collator;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
@@ -223,8 +224,6 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
 	/** {@inheritDoc} */
 	@Override
 	public void refresh() {
-		//initModel();
-		filterExcludedObjects();
 		super.refresh();
 	}
 
@@ -312,7 +311,11 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
 		try {
 			if(model != null){
 				progressMonitor.beginTask("Looking for entities", model.size());
-				for(UuidAndTitleCache<T> element : model){
+				filterExcludedObjects();
+				Iterator<UuidAndTitleCache<T>> iterator = model.iterator();
+				UuidAndTitleCache<T> element;
+				while(iterator.hasNext()){
+				    element = iterator.next();
 					contentProvider.add(element, itemsFilter);
 					if (progressMonitor.isCanceled()) {
 						throw new OperationCanceledException();
@@ -486,9 +489,7 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
 			            if (status == IStatus.OK) {
 
 			                T entity = (T) wizard.getEntity();
-			                model.add(new UuidAndTitleCache<T>(entity.getUuid(),
-			                        entity.getId(),
-			                        getTitle(entity)));
+			               // model.add(new UuidAndTitleCache<T>(entity.getUuid(), entity.getId(), getTitle(entity)));
 			                refresh();
 			                setPattern(entity);
 			                getConversationHolder().bind();
-- 
2.34.1