From 2d308c81108d760991a9f9283bc0698fd5a39679 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 15 Jun 2015 14:31:29 +0200 Subject: [PATCH] - fixed NPE (#4937) --- .../ui/section/name/ProtologueElement.java | 57 ++++++------------- 1 file changed, 18 insertions(+), 39 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueElement.java index a11e8e43b..5896a5e2a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueElement.java @@ -1,9 +1,9 @@ // $Id$ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ @@ -42,7 +42,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; */ public class ProtologueElement extends AbstractEntityCollectionElement implements ISelectableElement, IOpenUrlEnabled{ - private SelectionArbitrator selectionArbitrator; + private final SelectionArbitrator selectionArbitrator; private TextWithLabelElement protologueUriText; private MediaRepresentationPart mediaRepresentationPart; @@ -64,9 +64,6 @@ public class ProtologueElement extends AbstractEntityCollectionElementGetter for the field selectionArbitrator.

* * @return a {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator} object. */ - public SelectionArbitrator getSelectionArbitrator() { + @Override + public SelectionArbitrator getSelectionArbitrator() { return selectionArbitrator; } - - /* - * (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent(java.lang.Object) - */ + /** {@inheritDoc} */ @Override public void handleEvent(Object eventSource) { - if(eventSource == protologueUriText){ + if(eventSource == protologueUriText && protologueUriText.getText()!=null){ try { mediaRepresentationPart.setUri(new URI(protologueUriText.getText())); } catch (URISyntaxException e) { MessagingUtils.warningDialog("Could not parse URI", getClass(), e.getMessage()); } - } + } } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.openurl.IOpenUrlEnabled#setOpenUrl(java.net.URI) - */ @Override public void setOpenUrl(URI uri) { protologueUriText.setText(uri.toString()); firePropertyChangeEvent(new CdmPropertyChangeEvent(protologueUriText, null)); } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.openurl.IOpenUrlEnabled#getReference() - */ @Override public Reference getReference() { return (Reference) getName().getNomenclaturalReference(); } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.forms.openurl.IOpenUrlEnabled#getDetail() - */ @Override public String getDetail() { return getName().getNomenclaturalMicroReference(); } - + private TaxonNameBase getName(){ TaxonNameDescription description = (TaxonNameDescription) entity.getInDescription(); - + TaxonNameBase taxonName = description.getTaxonName(); - + return taxonName; } } -- 2.34.1