Project

General

Profile

« Previous | Next » 

Revision f572c5c1

Added by Katja Luther over 5 years ago

fix #7500: adapt chooseAcceptedTaxon dialog also for taxa used as taxon and misapplication/proparte synonym

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
136 136
                Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class);
137 137
                setInitiallySelectedTaxonBase(taxon);
138 138

  
139
                if (taxon.getTaxonNodes().size() == 0 && taxon.isMisapplication()){
139
                if ( (taxon.isMisapplication() || taxon.isProparteSynonym())&& (taxon.getTaxonNodes().size() >0 || taxon.getRelationsFromThisTaxon().size() > 1)){
140 140
                    // TODO get accepted taxon
141 141
                    MessagingUtils.info(Messages.TaxonEditorInput_OPEN_MISSAPPLIED_NAME);
142 142

  
......
147 147
                            acceptedTaxa.add(relation.getToTaxon());
148 148
                        }
149 149
                    }
150
                    if (taxon.getTaxonNodes().size() > 0){
151
                        acceptedTaxa.add(taxon);
152
                    }
150 153
                    setInputForRelatedTaxa(conversation, acceptedTaxa);
151 154

  
152 155
                }else{
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
265 265
DescriptiveDataSetEditor_DELETE_FAIL_MESSAGE=You can only select top level elements
266 266
DescriptiveDataSetEditor_DELETE_FAIL_TITLE=Could not delete
267 267
ChooseFromMultipleAcceptedTaxaDialog_CHOOSE_ACCEPTED_TAXON=Choose accepted taxon
268
ChooseFromMultipleAcceptedTaxaDialog_CHOOSE_ACCEPTED_TAXON_MESSAGE=The taxon is related to different accepted taxa. Please choose the one you want to open.
268
ChooseFromMultipleAcceptedTaxaDialog_CHOOSE_ACCEPTED_TAXON_MESSAGE=The taxon is related to one or more accepted taxa. Please choose the one you want to open.
269 269

  
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
265 265
DescriptiveDataSetEditor_DELETE_FAIL_MESSAGE=Es k?nnen nur Elemente auf erster Ebene ausgew?hlt werden
266 266
DescriptiveDataSetEditor_DELETE_FAIL_TITLE=L?schen fehlgesschlagen
267 267
ChooseFromMultipleAcceptedTaxaDialog_CHOOSE_ACCEPTED_TAXON=Akzeptiertes Taxon w?hlen
268
ChooseFromMultipleAcceptedTaxaDialog_CHOOSE_ACCEPTED_TAXON_MESSAGE=Das Taxon ist ?ber eine Taxonrelation mit mehreren akzeptierten Taxa verkn?pft. Bitte w?hlen sie, welche sie ?ffnen m?chten.
268
ChooseFromMultipleAcceptedTaxaDialog_CHOOSE_ACCEPTED_TAXON_MESSAGE=Das Taxon ist ?ber eine Taxonrelation mit einem oder mehreren akzeptierten Taxa verkn?pft. Bitte w?hlen sie, welche sie ?ffnen m?chten.
269 269

  

Also available in: Unified diff