Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/model/sinfo/Tkh.java @ 9010:dcbdff96d1a8
Tkh import with day instead of year
| author | mschaefer |
|---|---|
| date | Wed, 18 Apr 2018 07:42:06 +0200 |
| parents | 50416a0df385 |
| children | 6e5ff436febe |
comparison
equal
deleted
inserted
replaced
| 9009:6fd0f20b58aa | 9010:dcbdff96d1a8 |
|---|---|
| 10 | 10 |
| 11 package org.dive4elements.river.model.sinfo; | 11 package org.dive4elements.river.model.sinfo; |
| 12 | 12 |
| 13 import java.io.Serializable; | 13 import java.io.Serializable; |
| 14 import java.util.ArrayList; | 14 import java.util.ArrayList; |
| 15 import java.util.Date; | |
| 15 import java.util.List; | 16 import java.util.List; |
| 16 | 17 |
| 17 import javax.persistence.Column; | 18 import javax.persistence.Column; |
| 18 import javax.persistence.Entity; | 19 import javax.persistence.Entity; |
| 19 import javax.persistence.GeneratedValue; | 20 import javax.persistence.GeneratedValue; |
| 50 | 51 |
| 51 private String kmrange_info; | 52 private String kmrange_info; |
| 52 | 53 |
| 53 private String comment; | 54 private String comment; |
| 54 | 55 |
| 55 private Integer year; | 56 private Date day; |
| 56 | 57 |
| 57 private String sounding_info; | 58 private String sounding_info; |
| 58 | 59 |
| 59 private String evaluation_by; | 60 private String evaluation_by; |
| 60 | 61 |
| 65 | 66 |
| 66 public Tkh() { | 67 public Tkh() { |
| 67 } | 68 } |
| 68 | 69 |
| 69 | 70 |
| 70 public Tkh(final River river, final String filename, final String kmrange_info, final String comment, final Integer year, final String sounding_info, | 71 public Tkh(final River river, final String filename, final String kmrange_info, final String comment, final Date day, final String sounding_info, |
| 71 final String evaluation_by) { | 72 final String evaluation_by) { |
| 72 this.river = river; | 73 this.river = river; |
| 73 this.filename = filename; | 74 this.filename = filename; |
| 74 this.kmrange_info = kmrange_info; | 75 this.kmrange_info = kmrange_info; |
| 75 this.comment = comment; | 76 this.comment = comment; |
| 76 this.year = year; | 77 this.day = day; |
| 77 this.setSounding_info(sounding_info); | 78 this.setSounding_info(sounding_info); |
| 78 this.setEvaluation_by(evaluation_by); | 79 this.setEvaluation_by(evaluation_by); |
| 79 this.columns = new ArrayList<>(); | 80 this.columns = new ArrayList<>(); |
| 80 } | 81 } |
| 81 | 82 |
| 128 | 129 |
| 129 public void setComment(final String comment) { | 130 public void setComment(final String comment) { |
| 130 this.comment = comment; | 131 this.comment = comment; |
| 131 } | 132 } |
| 132 | 133 |
| 133 @Column(name = "year") | 134 @Column(name = "day") |
| 134 public Integer getYear() { | 135 public Date getDay() { |
| 135 return this.year; | 136 return this.day; |
| 136 } | 137 } |
| 137 | 138 |
| 138 public void setYear(final Integer year) { | 139 public void setDay(final Date day) { |
| 139 this.year = year; | 140 this.day = day; |
| 140 } | 141 } |
| 141 | 142 |
| 142 @Column(name = "sounding_info") | 143 @Column(name = "sounding_info") |
| 143 public String getSounding_info() { | 144 public String getSounding_info() { |
| 144 return this.sounding_info; | 145 return this.sounding_info; |