Project

General

Profile

« Previous | Next » 

Revision 016cfa57

Added by Patrick Plitzner over 7 years ago

Compare taxon editor input based on taxon instead of taxon node (Revert
93c6e0a894d2e4b0c9df6c7c3feff2f20e0b9e38)

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
337 337
    @Override
338 338
    public boolean equals(Object obj) {
339 339
        if (TaxonEditorInput.class.equals(obj.getClass())
340
                && getTaxonNode() != null
341
                && getTaxonNode().equals(((TaxonEditorInput) obj).getTaxonNode())
342
                ){
343
            if(((TaxonEditorInput) obj).getInitiallySelectedTaxonBase() != null){
340
                && getTaxon() != null
341
                && getTaxon().equals(((TaxonEditorInput) obj).getTaxon())) {
342
            if (((TaxonEditorInput) obj).getInitiallySelectedTaxonBase() != null){
344 343
                setInitiallySelectedTaxonBase(((TaxonEditorInput) obj).getInitiallySelectedTaxonBase());
345 344
            }
346 345
            return true;
......
456 455
    @Override
457 456
    public void merge() {
458 457
       CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
459
       
458

  
460 459
    }
461 460

  
462 461
    @Override

Also available in: Unified diff