Project

General

Profile

« Previous | Next » 

Revision 056bb8db

Added by Patrick Plitzner about 9 years ago

  • used most significant identifier for derivate labels
    • refactored session loading

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
234 234 
                    label += collection.getName()!=null?collection.getName()+" ":emptyString;
235 235 
                    label += collection.getCode()!=null?"("+collection.getCode()+"), ":emptyString;
236 236 
                }
237 
                label += derivedUnit.getAccessionNumber()!=null?derivedUnit.getAccessionNumber()+separator:emptyString;
237 
                String mostSignificantIdentifier = CdmStore.getService(IOccurrenceService.class).getMostSignificantIdentifier(derivedUnit);
238 
                label += mostSignificantIdentifier!=null?mostSignificantIdentifier+separator:emptyString;
238 239 
                label += derivedUnit.getBarcode()!=null?derivedUnit.getBarcode():emptyString;
239 240 
            }
240 241 
            else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){
......
300 301 
        if(element instanceof TreeNode){
301 302 
            element = ((TreeNode) element).getValue();
302 303 
        }
303 
        if(element instanceof FieldUnit){
304 
            return ImageResources.getImage(ImageResources.FIELD_UNIT);
305 
        }
306 
        else if(element instanceof DerivedUnit){
307 
            DerivedUnit derivedUnit = (DerivedUnit)element;
308 
            if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.FieldUnit){
304 
        if(element instanceof CdmBase){
305 
            CdmBase cdmBase = (CdmBase)element;
306 
//            boolean hasCharacterData = false;
307 
//            if(cdmBase.isInstanceOf(SpecimenOrObservationBase.class)){
308 
//                SpecimenOrObservationBase specimen = HibernateProxyHelper.deproxy(cdmBase, SpecimenOrObservationBase.class);
309 
//                if(!CdmStore.getService(IOccurrenceService.class).getCharacterDataForSpecimen(specimen).isEmpty()){
310 
//                    hasCharacterData = true;
311 
//                    return ImageResources.getImage(ImageResources.CHARACTER_DATA_DERIVATE);
312 
//                }
313 
//            }
314 
            if(cdmBase.isInstanceOf(FieldUnit.class)){
309 315 
                return ImageResources.getImage(ImageResources.FIELD_UNIT);
310 316 
            }
311 
            else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.DnaSample){
312 
                return ImageResources.getImage(ImageResources.DNA_SAMPLE_DERIVATE);
313 
            }
314 
            else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){
315 
                return ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE);
316 
            }
317 
            else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){
318 
                return ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE);
319 
            }
320 
            else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.Media){
321 
                if(derivedUnit.getKindOfUnit()!=null){
322 
                    if(derivedUnit.getKindOfUnit().equals(getArtworkTerm())){
323 
                        return ImageResources.getImage(ImageResources.ARTWORK_DERIVATE);
324 
                    }
325 
                    else if(derivedUnit.getKindOfUnit().equals(getLivingPlantPhotoTerm())){
326 
                        return ImageResources.getImage(ImageResources.LIVING_PLANT_PHOTO_DERIVATE);
327 
                    }
328 
                    else if(derivedUnit.getKindOfUnit().equals(getSpecimenScanTerm())){
329 
                        return ImageResources.getImage(ImageResources.SPECIMEN_SCAN_DERIVATE);
330 
                    }
331 
                    else if(derivedUnit.getKindOfUnit().equals(getDetailImageTerm())){
332 
                        return ImageResources.getImage(ImageResources.DETAIL_IMAGE_DERIVATE);
317 
            else if(cdmBase.isInstanceOf(DerivedUnit.class)){
318 
                DerivedUnit derivedUnit = (DerivedUnit)element;
319 
                if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.FieldUnit){
320 
                    return ImageResources.getImage(ImageResources.FIELD_UNIT);
321 
                }
322 
                else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.DnaSample){
323 
                    return ImageResources.getImage(ImageResources.DNA_SAMPLE_DERIVATE);
324 
                }
325 
                else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){
326 
                    return ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE);
327 
                }
328 
                else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){
329 
                    return ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE);
330 
                }
331 
                else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.Media){
332 
                    if(derivedUnit.getKindOfUnit()!=null){
333 
                        if(derivedUnit.getKindOfUnit().equals(getArtworkTerm())){
334 
                            return ImageResources.getImage(ImageResources.ARTWORK_DERIVATE);
335 
                        }
336 
                        else if(derivedUnit.getKindOfUnit().equals(getLivingPlantPhotoTerm())){
337 
                            return ImageResources.getImage(ImageResources.LIVING_PLANT_PHOTO_DERIVATE);
338 
                        }
339 
                        else if(derivedUnit.getKindOfUnit().equals(getSpecimenScanTerm())){
340 
                            return ImageResources.getImage(ImageResources.SPECIMEN_SCAN_DERIVATE);
341 
                        }
342 
                        else if(derivedUnit.getKindOfUnit().equals(getDetailImageTerm())){
343 
                            return ImageResources.getImage(ImageResources.DETAIL_IMAGE_DERIVATE);
344 
                        }
333 345 
                    }
334 346 
                }
335 347 
            }
336 
        }
337 
        else if(element instanceof Sequence){
338 
            return ImageResources.getImage(ImageResources.SEQUENCE_DERIVATE);
339 
        }
340 

  		




  341
  
  
    
        else if(element instanceof SingleRead){


  		




  342
  
  
    
            if(multiLinkSingleReads.contains(element)){


  		




  343
  
  
    
                return ImageResources.getImage(ImageResources.SINGLE_READ_DERIVATE_MULTILINK);


  		




  
  348
  
    
            else if(cdmBase.isInstanceOf(Sequence.class)){


  		




  
  349
  
    
                return ImageResources.getImage(ImageResources.SEQUENCE_DERIVATE);


  		




  344
  350
  
    
            }


  		




  345
  
  
    
            else{


  		




  346
  
  
    
                return ImageResources.getImage(ImageResources.SINGLE_READ_DERIVATE);


  		




  
  351
  
    

  		




  
  352
  
    
            else if(cdmBase.isInstanceOf(SingleRead.class)){


  		




  
  353
  
    
                if(multiLinkSingleReads.contains(element)){


  		




  
  354
  
    
                    return ImageResources.getImage(ImageResources.SINGLE_READ_DERIVATE_MULTILINK);


  		




  
  355
  
    
                }


  		




  
  356
  
    
                else{


  		




  
  357
  
    
                    return ImageResources.getImage(ImageResources.SINGLE_READ_DERIVATE);


  		




  
  358
  
    
                }


  		




  347
  359
  
    
            }


  		




  348
  360
  
    
        }


  		




  349
  361
  
    
        return super.getImage(element);


  		












Also available in:  Unified diff