Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
index bbd7e4d2025753158b41e538665acdcb46c50013..c2978874b1a990ce1ac9e37636fe71b87580c3c0 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
@@ -288,7 +288,7 @@ public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDe
            isDirty = false;
           
            super.doSave(progressMonitor);
-
+           
            selectFirstItem();
           
                getSourceViewer().getTextWidget().setFocus();
@@ -321,7 +321,9 @@ public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDe
                                        return;
                                }
                        }
-
+                       conversation.commit();
+                       conversation.clear();
+                       
                        getEditorInput().performSearch(query);
 
                        refresh();

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
index 3f79f3a00a4566070076ad876293795714767a58..5452a0458934f0005106036673d3807183766aed 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
@@ -91,7 +91,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
        TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNodeUuid, null);
 
                if(taxonNode == null){
-                       MessagingUtils.warningDialog("Not yet implemented", TaxonEditorInput.class, "Selected element is not type TaxonBase.");
+                       MessagingUtils.warningDialog("Not yet implemented", TaxonEditorInput.class, "Selected element is not of type TaxonNode but [null].");
                        return null;
                }
 
@@ -116,7 +116,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 
                        if (taxon.getTaxonNodes().size() == 0 && taxon.isMisapplication()){
                                // TODO get accepted taxon
-                               MessagingUtils.info("trying to open Mispplied Name ");
+                               MessagingUtils.info("trying to open misapplied Name ");
 
                                Set<Taxon> acceptedTaxa = new HashSet<Taxon>();
                                Set<TaxonRelationship> relations = taxon.getRelationsFromThisTaxon();