Merge branch 'release/4.6.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / MultiPageTaxonEditorDataChangeBehaviour.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java
index aa6dc659c686e2e0156a52e880c56f8c10557cfd..62152525891e2857f4a10c3fbb3229612f2efc2f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java
@@ -75,17 +75,16 @@ public class MultiPageTaxonEditorDataChangeBehaviour extends AbstractDataChangeB
        
        
        /** {@inheritDoc} */
        
        
        /** {@inheritDoc} */

+       //we do not really need this anymore as closing the editors is 
+       //now run before the delete operation in DeleteHandler

        @Override
        public void reactOnDelete(Vector<CdmDataChangeEvent> events){
                for(CdmDataChangeEvent event : events){
                        // close open editors
        @Override
        public void reactOnDelete(Vector<CdmDataChangeEvent> events){
                for(CdmDataChangeEvent event : events){
                        // close open editors

-                       if(event.getEntity() instanceof TaxonNode){
-                               logger.warn("taxon node");
-                       }

                        if((event.getEntity() instanceof TaxonNode) 
                                        && input.getTaxonNode().equals(event.getEntity())){
                        if((event.getEntity() instanceof TaxonNode) 
                                        && input.getTaxonNode().equals(event.getEntity())){

-                               EditorUtil.close(source);
-                               logger.debug("Closing open editor for deleted taxon.");
+                               //EditorUtil.close(source);
+                               logger.debug("Closing open editor for deleted taxon."); //$NON-NLS-1$

                        }
                }
        }
                        }
                }
        }


@@ -101,7 +100,7 @@ public class MultiPageTaxonEditorDataChangeBehaviour extends AbstractDataChangeB
                                if(input.getTaxon().getName().equals(event.getEntity())){
                                        // set the name of the editor window
                                        source.setPartName();
                                if(input.getTaxon().getName().equals(event.getEntity())){
                                        // set the name of the editor window
                                        source.setPartName();

-                                       logger.debug("Updating title of taxons editor.");
+                                       logger.debug("Updating title of taxons editor."); //$NON-NLS-1$

                                }
                        }
                        // TODO other stuff to happen
                                }
                        }
                        // TODO other stuff to happen