Project

General

Profile

« Previous | Next » 

Revision a5dfa142

Added by Katja Luther over 5 years ago

fix #7500: correct handling of MAN when opening in nameEditor

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

  
......
225 225
        if(taxa.size() == 1){
226 226
            Taxon taxon = taxa.iterator().next();
227 227
            Set<TaxonNode> nodes = taxon.getTaxonNodes();
228
            TaxonNode taxonNode = ChooseFromMultipleTaxonNodesDialog.choose(nodes);
228
            TaxonNode taxonNode = null;
229
            if (nodes.size()>1){
230
                taxonNode = ChooseFromMultipleTaxonNodesDialog.choose(nodes);
231
            }else if (nodes.size()==1){
232
                taxonNode = nodes.iterator().next();
233
            }else{
234
                MessagingUtils.warningDialog(INCORRECT_STATE,TaxonEditorInputE4.class,Messages.TaxonEditorInput_TAXON_NOT_IN_CLASSIFICATION);
235
            }
229 236
            init(taxonNode);
230 237
        }else if(taxa.size() > 1){
231 238
            Iterator<Taxon> taxonIterator = taxa.iterator();

Also available in: Unified diff