From 87348c2d80aff07e3438b7042bc11cdea074a360 Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Thu, 15 Sep 2016 14:23:27 +0200
Subject: [PATCH] fix #5702: filter for current name in name details view if
 select new name

---
 .../AbstractFilteredCdmResourceSelectionDialog.java         | 6 +++---
 .../ui/section/name/NonViralNameDetailSection.java          | 2 +-
 2 files changed, 4 insertions(+), 4 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 2536fcdf4..e274fe48f 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
@@ -99,9 +99,9 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
 		initModel();
 		shell.setCursor(cursor);
 		String objectTitle = getTitle(cdmObject);
-		if (objectTitle != null) {
-			setInitialPattern(objectTitle);
-		}
+//		if (objectTitle != null) {
+//			setInitialPattern(objectTitle);
+//		}
 
 		setListLabelProvider(createListLabelProvider());
 		setDetailsLabelProvider(createDetailsLabelProvider());
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
index 1449fb113..878200294 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
@@ -73,7 +73,7 @@ public class NonViralNameDetailSection extends AbstractCdmDetailSection<NonViral
 	            Action chooseNameAction = new Action("Choose Name", IAction.AS_PUSH_BUTTON){
 	                @Override
 	                public void run() {
-	                    TaxonNameBase taxonName = NameSelectionDialog.select(getShell(), getConversationHolder(), null);
+	                    TaxonNameBase taxonName = NameSelectionDialog.select(getShell(), getConversationHolder(), getEntity());
 	                    if(taxonName!=null){
 	                        if(taxonName.isInstanceOf(NonViralName.class)){
 	                            CdmStore.getService(ITaxonNodeService.class).list(TaxonNode.class, null, null, null, null);
-- 
2.34.1