Project

General

Profile

« Previous | Next » 

Revision db183545

Added by Andreas Müller almost 7 years ago

ref #6630 and ref #6368 remove generics from TaxonName

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HybridRelationship.java
68 68 
    @XmlSchemaType(name = "IDREF")
69 69 
    @ManyToOne(fetch=FetchType.LAZY)
70 70 
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
71 
	private TaxonName<?,?> relatedFrom;
71 
	private TaxonName relatedFrom;
72 72 

  		




  73
  73
  
    
	@XmlElement(name = "RelatedTo")


  		




  74
  74
  
    
    @XmlIDREF


  		




  75
  75
  
    
    @XmlSchemaType(name = "IDREF")


  		




  76
  76
  
    
    @ManyToOne(fetch=FetchType.LAZY)


  		




  77
  77
  
    
    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})


  		




  78
  
  
    
	private TaxonName<?,?> relatedTo;


  		




  
  78
  
    
	private TaxonName relatedTo;


  		




  79
  79
  
    

  		




  80
  80
  
    
    @XmlElement(name = "Type")


  		




  81
  81
  
    
    @XmlIDREF


  		




  ......




  222
  222
  
    
		if (compareType != 0){


  		




  223
  223
  
    
			return compareType;


  		




  224
  224
  
    
		}else{


  		




  225
  
  
    
		    TaxonName<?,?> related1 = this.getRelatedFrom();


  		




  226
  
  
    
		    TaxonName<?,?> related2 = rel2.getRelatedFrom();


  		




  
  225
  
    
		    TaxonName related1 = this.getRelatedFrom();


  		




  
  226
  
    
		    TaxonName related2 = rel2.getRelatedFrom();


  		




  227
  227
  
    
			if (related1 != related2){


  		




  228
  228
  
    
				related1 = this.getRelatedTo();


  		




  229
  229
  
    
				related2 = rel2.getRelatedTo();


  		












Also available in:  Unified diff