From 23e15aded387e0108de0e7021c5d2bee0a7e51de Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Mon, 17 Mar 2014 08:43:08 +0000
Subject: [PATCH] - removed StoreUtil.getCdmEntity() invocation (#4091)
---
.../navigation/navigator/TaxonNodeLabelProvider.java | 3 ++-
.../ui/section/AbstractIdentifiableEntityDetailElement.java | 4 ++--
.../taxeditor/ui/selection/EntitySelectionElement.java | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
index 94e7b8f1c..eddf15d58 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.ui.navigator.IDescriptionProvider;
import org.hibernate.LazyInitializationException;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
+import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -96,7 +97,7 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
public StyledString getStyledText(Object element) {
// determine style base on user grants
Styler styler = null;
- if(!CdmStore.currentAuthentiationHasPermission(StoreUtil.getCdmEntity(element), RequiredPermissions.TAXONNODE_EDIT)){
+ if(!CdmStore.currentAuthentiationHasPermission((CdmBase) element, RequiredPermissions.TAXONNODE_EDIT)){
styler = getNotGrantedStyler();
}
return new StyledString(getText(element), styler);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java
index 36bb1fe01..2541c85bd 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java
@@ -6,10 +6,10 @@ package eu.etaxonomy.taxeditor.ui.section;
import java.util.Arrays;
import java.util.EnumSet;
+import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
@@ -57,7 +57,7 @@ public abstract class AbstractIdentifiableEntityDetailElement 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));
+ button_edit.setEnabled(isEditable && button_selection.isEnabled() && getEntity() != null && CdmStore.currentAuthentiationHasPermission((CdmBase) getEntity(), UPDATE));
}
}
}
--
2.34.1