Project

General

Profile

« Previous | Next » 

Revision 97e308a9

Added by Andreas Müller almost 3 years ago

cleanup and remove generics from Identifier class

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java
261 261 
        else if(derivate instanceof DnaSample
262 262 
                && ((DnaSample) derivate).getRecordBasis()==SpecimenOrObservationType.DnaSample){
263 263 
            DnaSample dnaSample = (DnaSample)derivate;
264 
            if(((DnaSample) derivate).getRecordBasis()==SpecimenOrObservationType.DnaSample){
265 
                Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(dnaSample);
264 
            if(dnaSample.getRecordBasis()==SpecimenOrObservationType.DnaSample){
265 
                Identifier currentSampleDesignation = getCurrentSampleDesignation(dnaSample);
266 266 
                if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
267 267 
                    label += currentSampleDesignation.getIdentifier()+separator;
268 268 
                }
......
307 307 
                if(derivedUnit.getKindOfUnit()!=null){
308 308 
                    label += derivedUnit.getKindOfUnit()+separator;
309 309 
                }
310 
                Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(derivedUnit);
310 
                Identifier currentSampleDesignation = getCurrentSampleDesignation(derivedUnit);
311 311 
                if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
312 312 
                    label += currentSampleDesignation.getIdentifier() + separator;
313 313 
                }
......
319 319 
        //Sequence
320 320 
        else if(derivate instanceof Sequence){
321 321 
            Sequence sequence = (Sequence)derivate;
322 
            Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(sequence);
322 
            Identifier currentSampleDesignation = getCurrentSampleDesignation(sequence);
323 323 
            if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
324 324 
                label += currentSampleDesignation.getIdentifier()+separator;
325 325 
            }
......
333 333 
            SingleRead singleRead = (SingleRead)derivate;
334 334 
            if(parentNode!=null && parentNode.getValue() instanceof Sequence){
335 335 
                Sequence sequence = (Sequence) parentNode.getValue();
336 
                Identifier<DnaSample> currentSampleDesignation = getCurrentSampleDesignation(sequence);
336 
                Identifier currentSampleDesignation = getCurrentSampleDesignation(sequence);
337 337 
                if(currentSampleDesignation!=null && currentSampleDesignation.getIdentifier()!=null){
338 338 
                    label = currentSampleDesignation.getIdentifier()+separator;
339 339 
                }
......
434 434 
        return ImageResources.getImage(ImageResources.DEFAULT_DERIVATIVE);
435 435 
    }
436 436 

  		




  437
  
  
    
    public static Identifier<DnaSample> getCurrentSampleDesignation(CdmBase entity) {


  		




  
  437
  
    
    public static Identifier getCurrentSampleDesignation(CdmBase entity) {


  		




  438
  438
  
    
        if(entity.isInstanceOf(DnaSample.class)){


  		




  439
  439
  
    
            DnaSample dnaSample = HibernateProxyHelper.deproxy(entity, DnaSample.class);


  		




  440
  
  
    
            for (Identifier<DnaSample> identifier : dnaSample.getIdentifiers()) {


  		




  
  440
  
    
            for (Identifier identifier : dnaSample.getIdentifiers()) {


  		




  441
  441
  
    
                if(identifier.getType()!=null && identifier.getType().equals(DerivateLabelProvider.getSampleDesignationTerm())){


  		




  442
  442
  
    
                    //first sample designation is the current


  		




  443
  443
  
    
                    return identifier;


  		












Also available in:  Unified diff