Project

General

Profile

« Previous | Next » 

Revision f1a25720

Added by Katja Luther over 6 years ago

  • ID f1a25720755daa96e8838a617a660dfced7b9f31
  • Parent 23e50194

first implementation for change from joda time to java8 time

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java
10 10 
package eu.etaxonomy.cdm.model.molecular;
11 11 

  		




  12
  12
  
    

  		




  
  13
  
    
import java.time.ZonedDateTime;


  		




  
  14
  
    

  		




  13
  15
  
    
import javax.persistence.Basic;


  		




  14
  16
  
    
import javax.persistence.Entity;


  		




  15
  17
  
    
import javax.persistence.FetchType;


  		




  ......




  30
  32
  
    
import org.hibernate.search.annotations.Analyze;


  		




  31
  33
  
    
import org.hibernate.search.annotations.Field;


  		




  32
  34
  
    
import org.hibernate.search.annotations.FieldBridge;


  		




  33
  
  
    
import org.joda.time.DateTime;


  		




  34
  35
  
    

  		




  35
  
  
    
import eu.etaxonomy.cdm.hibernate.search.DateTimeBridge;


  		




  
  36
  
    
import eu.etaxonomy.cdm.hibernate.search.ZonedDateTimeBridge;


  		




  36
  37
  
    
import eu.etaxonomy.cdm.jaxb.DateTimeAdapter;


  		




  37
  38
  
    
import eu.etaxonomy.cdm.model.common.OrderedTerm;


  		




  38
  39
  
    
import eu.etaxonomy.cdm.model.common.VersionableEntity;


  		




  ......




  86
  87
  
    
    @ManyToOne(fetch = FetchType.LAZY)


  		




  87
  88
  
    
	//FIXME preliminary as it is not yet decided if we will use a string or a MoME #4552


  		




  88
  89
  
    
    private MaterialOrMethodEvent typedPurificationMethod;


  		




  89
  
  
    
	


  		




  
  90
  
    

  		




  90
  91
  
    
    private String purificationMethod;


  		




  91
  92
  
    

  		




  92
  93
  
    

  		




  ......




  114
  115
  
    
    @Type(type="dateTimeUserType")


  		




  115
  116
  
    
    @Basic(fetch = FetchType.LAZY)


  		




  116
  117
  
    
    @Field(analyze = Analyze.NO)


  		




  117
  
  
    
    @FieldBridge(impl = DateTimeBridge.class)


  		




  
  118
  
    
    @FieldBridge(impl = ZonedDateTimeBridge.class)


  		




  118
  119
  
    
    @Audited


  		




  119
  
  
    
    private DateTime qualityCheckDate;


  		




  
  120
  
    
    private ZonedDateTime qualityCheckDate;


  		




  120
  121
  
    

  		




  121
  122
  
    

  		




  122
  123
  
    
// ******************* CONSTRUCTOR *************************/


  		




  ......




  170
  171
  
    
		this.concentrationUnit = concentrationUnit;


  		




  171
  172
  
    
	}


  		




  172
  173
  
    

  		




  173
  
  
    
	public DateTime getQualityCheckDate() {


  		




  
  174
  
    
	public ZonedDateTime getQualityCheckDate() {


  		




  174
  175
  
    
		return qualityCheckDate;


  		




  175
  176
  
    
	}


  		




  176
  177
  
    

  		




  177
  
  
    
	public void setQualityCheckDate(DateTime qualityCheckDate) {


  		




  
  178
  
    
	public void setQualityCheckDate(ZonedDateTime qualityCheckDate) {


  		




  178
  179
  
    
		this.qualityCheckDate = qualityCheckDate;


  		




  179
  180
  
    
	}


  		




  180
  181
  
    

  		












Also available in:  Unified diff