From: Andreas Müller <a.mueller@bgbm.org>
Date: Tue, 19 Jun 2012 17:00:10 +0000 (+0000)
Subject: merge fix for #2924 to trunk
X-Git-Tag: 3.6.0~1063
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/43f76656e79e5b5b9b23f5018fc8d977d084eac0

merge fix for #2924 to trunk
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
index 6c9e0f483..c07f8650f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java
@@ -9,18 +9,15 @@
 */
 package eu.etaxonomy.taxeditor.editor.definedterm;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.taxeditor.ui.section.vocabulary.AbstractTermBaseDetailElement;
 
 /**
  * @author l.morris
@@ -40,10 +37,13 @@ public class TermBasePropertyTester extends PropertyTester {
 			Object expectedValue) {
 		
 		IStructuredSelection selection = (IStructuredSelection) receiver;
-		TermBase selectedElement = (TermBase) selection.getFirstElement();
-		
-		if(IS_MODIFIABLE.equals(property)){
-			return isModifiable(selectedElement);
+		CdmBase selectedElement = (CdmBase)selection.getFirstElement();
+		if (selectedElement.isInstanceOf(TermBase.class)){
+			TermBase term = CdmBase.deproxy(selectedElement, TermBase.class);
+
+			if(IS_MODIFIABLE.equals(property)){
+				return isModifiable(term);
+			}
 		}
 		
 		return false;