From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Wed, 5 Mar 2014 17:18:31 +0000 (+0000)
Subject: avoiding NPE and other exceptions
X-Git-Tag: 3.6.0~735
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/839cb4cd5d34dbb36f64abb5c0057981aa34ea68

avoiding NPE and other exceptions
---

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index a95b3255b..36af4805f 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -110,7 +110,7 @@ public class TaxonNavigator extends CommonNavigator implements
 	 */
 	public void refresh() {
 		if(getConversationHolder() != null){
-			getConversationHolder().bind();			
+			getConversationHolder().bind();
 			//FIXME : Need to make sure this is a stable fix (ticket 3822)
 			getConversationHolder().commit();
 		}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
index 86387f9e9..37c96972e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
@@ -481,6 +481,8 @@ public class EntitySelectionElement<T extends ICdmBase> extends
 	}
 
 	private void updateButtonStates() {
+	    if(button_edit != null && !button_selection.isDisposed()){
 		button_edit.setEnabled(isEditable && button_selection.isEnabled() && getEntity() != null  && CdmStore.currentAuthentiationHasPermission(StoreUtil.getCdmEntity(getEntity()), UPDATE));
+	    }
 	}
 }