Project

General

Profile

« Previous | Next » 

Revision 0d672864

Added by Andreas Müller almost 3 years ago

ref #9594 use MediaSpecimen as base unit for MediaSpecimenGeneralDetailElement (cont.)

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
191 191
        if(input instanceof GbifResponse){
192 192
            input = ((GbifResponse) input).getDerivedUnitFacade();
193 193
        }
194
       if (input !=null && input instanceof DerivedUnit) {
194
        if (input instanceof MediaSpecimen && !(this.activePart.getClass().getSimpleName().equals("BulkEditorE4"))){
195
            //do nothing
196
        }else if (input instanceof DerivedUnit) {
195 197
            DerivedUnit derivedUnit = (DerivedUnit)input;
196 198
            try {
197 199
                input = DerivedUnitFacade.NewInstance(derivedUnit,
......
309 311

  
310 312
        } else if (input instanceof Media) {
311 313
            createMediaElementSection(rootElement);
312

  
313 314
        }
314 315
        //FIXME hack to show more informative message to the user when
315 316
        //DerivedUnit has more than one FieldUnit #4363
316
        else if (input instanceof DerivedUnit) {
317
        else if (input instanceof DerivedUnit && !(input instanceof MediaSpecimen)) {
317 318
            DerivedUnit derivedUnit = (DerivedUnit)input;
318 319
            try {
319 320
                input = DerivedUnitFacade.NewInstance(derivedUnit,
......
353 354
                else if(facade.innerDerivedUnit().getRecordBasis()==SpecimenOrObservationType.DnaSample){
354 355
                    createDnaSampleSection(rootElement);
355 356
                }
356
            }else if (((DerivedUnitFacade) input).innerDerivedUnit() instanceof MediaSpecimen){
357
                createMediaSpecimenSection(rootElement);
358
            }
359

  
360
            else{
357
            }else if (facade.innerDerivedUnit() instanceof MediaSpecimen){
358
                createEmptySection("Image specimen not supported by specimen list editor", rootElement);
359
            }else{
361 360
                createDerivedUnitBaseElementSection(rootElement);
362 361
            }
363 362
        } else if (input instanceof DnaSample){

Also available in: Unified diff