From: Andreas Müller Date: Wed, 27 Jun 2012 10:06:14 +0000 (+0000) Subject: bugfix for CCE in TermBasePropertyTester.java (#2924 comment 2) integrated in trunk X-Git-Tag: 3.6.0~1056 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/a34568307dcc3e9919d9d9b4fa0080c0ed00b04b bugfix for CCE in TermBasePropertyTester.java (#2924 comment 2) integrated in 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 e7ca0952d..dfde1e7d8 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 @@ -12,7 +12,7 @@ package eu.etaxonomy.taxeditor.editor.definedterm; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.jface.viewers.IStructuredSelection; -import eu.etaxonomy.cdm.model.common.CdmBase; +import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.Marker; import eu.etaxonomy.cdm.model.common.MarkerType; @@ -37,9 +37,9 @@ public class TermBasePropertyTester extends PropertyTester { Object expectedValue) { IStructuredSelection selection = (IStructuredSelection) receiver; - CdmBase selectedElement = (CdmBase)selection.getFirstElement(); - if (selectedElement != null && selectedElement.isInstanceOf(TermBase.class)){ - TermBase term = CdmBase.deproxy(selectedElement, TermBase.class); + Object selectedElement = selection.getFirstElement(); + if (selectedElement != null && HibernateProxyHelper.isInstanceOf(selectedElement, TermBase.class)){ + TermBase term = HibernateProxyHelper.deproxy(selectedElement, TermBase.class); if(IS_MODIFIABLE.equals(property)){ return isModifiable(term);