Fix potential NPE

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java
index 03db45a0ca2cab7075293292422880bb361be2ba..7584a8062b24d5208b031e7859a8e7a0d9b25363 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/defaultHandler/DefaultOpenTaxonEditorForTaxonHandler.java
@@ -7,7 +7,6 @@ import org.eclipse.ui.PartInitException;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;

-import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;

 import eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenHandlerBase;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenHandlerBase;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;


@@ -22,11 +21,10 @@ public class DefaultOpenTaxonEditorForTaxonHandler extends DefaultOpenHandlerBas
 
     @Override
     protected void open(ExecutionEvent event, TaxonBase entity) {
 
     @Override
     protected void open(ExecutionEvent event, TaxonBase entity) {

-        TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(entity.getUuid());

         try {
         try {

-            EditorUtil.open(input);
+            EditorUtil.openTaxonBase(entity.getUuid());

         } catch (PartInitException e) {
         } catch (PartInitException e) {

-            MessagingUtils.error(DefaultOpenTaxonEditorForTaxonHandler.class, "Could not open taxon editor for taxon "+input.getTaxon(), e);
+            MessagingUtils.error(DefaultOpenTaxonEditorForTaxonHandler.class, "Could not open taxon editor for taxon/synonym "+entity, e);

         }
     }
 
         }
     }