BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 398b9c0)
fix #5702: filter for current name in name details view if select new name
authorKatja Luther <k.luther@bgbm.org>
Thu, 15 Sep 2016 12:23:27 +0000 (14:23 +0200)
committerKatja Luther <k.luther@bgbm.org>
Thu, 15 Sep 2016 12:23:27 +0000 (14:23 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java patch | blob | history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java patch | blob | history

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 2536fcdf44ada7d0f9862ca3abb49f1f67856f59..e274fe48f58069d666ceb66259393e3cce3115ca 100644 (file)
--- 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);
                initModel();
                shell.setCursor(cursor);
                String objectTitle = getTitle(cdmObject);
-               if (objectTitle != null) {
-                       setInitialPattern(objectTitle);
-               }
+//             if (objectTitle != null) {
+//                     setInitialPattern(objectTitle);
+//             }
 
                setListLabelProvider(createListLabelProvider());
                setDetailsLabelProvider(createDetailsLabelProvider());
 
                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 1449fb1130f1bf0416581a8a260f8b854c00bda2..8782002943f5f96008afb5d60278b8257e3289c2 100644 (file)
--- 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() {
                    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);
                            if(taxonName!=null){
                                if(taxonName.isInstanceOf(NonViralName.class)){
                                    CdmStore.getService(ITaxonNodeService.class).list(TaxonNode.class, null, null, null, null);