Revision bb534368
Added by Cherian Mathew about 9 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java | ||
---|---|---|
21 | 21 |
|
22 | 22 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
23 | 23 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; |
24 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
|
24 | 25 |
import eu.etaxonomy.cdm.model.description.DescriptionBase; |
25 | 26 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
26 | 27 |
import eu.etaxonomy.cdm.model.description.SpecimenDescription; |
... | ... | |
29 | 30 |
import eu.etaxonomy.cdm.model.occurrence.FieldUnit; |
30 | 31 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; |
31 | 32 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
33 |
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; |
|
32 | 34 |
import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; |
33 | 35 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
34 | 36 |
|
... | ... | |
47 | 49 |
@Override |
48 | 50 |
public Object[] getChildren(Object parentElement) { |
49 | 51 |
|
50 |
if (parentElement instanceof TaxonEditorInput) { |
|
51 |
Taxon taxon = ((TaxonEditorInput) parentElement).getTaxon(); |
|
52 |
if (parentElement instanceof TaxonEditorInput || parentElement instanceof Taxon) { |
|
53 |
|
|
54 |
Taxon taxon = null; |
|
55 |
if (parentElement instanceof TaxonEditorInput){ |
|
56 |
taxon = ((TaxonEditorInput) parentElement).getTaxon(); |
|
57 |
} else{ |
|
58 |
taxon = HibernateProxyHelper.deproxy(parentElement, Taxon.class); |
|
59 |
} |
|
60 |
|
|
52 | 61 |
if(taxon == null){ |
53 | 62 |
MessagingUtils.error(getClass(), "Taxon is null", null); |
54 | 63 |
return NO_CHILDREN; |
Also available in: Unified diff
merge from trunk