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 a95b3255bed4d3f40ca68bd9378c9515b7c7dde0..36af4805f740a3a63b30023b6d1db892519b8407 100644 (file)
--- 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 86387f9e945b3577da60523cd2866f5d40c46f86..37c96972ef5db07da3f3f3db2984b72fab72709a 100644 (file)
--- 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));
+           }
        }
 }