From 9edfe8ddcbc171d54987a1bd329f31eabb0cc222 Mon Sep 17 00:00:00 2001
From: Patrick Plitzner
Date: Mon, 18 Jan 2016 09:03:30 +0100
Subject: [PATCH] Fix potential NPE
---
.../DefaultOpenTaxonEditorForTaxonHandler.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
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 03db45a0c..7584a8062 100644
--- 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.taxeditor.editor.TaxonEditorInput;
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) {
- TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(entity.getUuid());
try {
- EditorUtil.open(input);
+ EditorUtil.openTaxonBase(entity.getUuid());
} 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);
}
}
--
2.34.1