Produced by Araxis Merge on 6/9/2017 3:51:18 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | Fri Jun 9 19:51:18 2017 UTC | ||
| 2 | eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502\nvap-svc-consent-mgmt\src\main\java\gov\va\nvap\svc\consentmgmt\stub\data | MailTemplate.java | Fri Apr 21 20:03:30 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 85 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | package go v.va.nvap. svc.consen tmgmt.stub .data; | |||||
| 2 | ||||||
| 3 | import jav a.io.Seria lizable; | |||||
| 4 | import jav ax.persist ence.Basic ; | |||||
| 5 | import jav ax.persist ence.Colum n; | |||||
| 6 | import jav ax.persist ence.Entit y; | |||||
| 7 | import jav ax.persist ence.Gener atedValue; | |||||
| 8 | import jav ax.persist ence.Gener ationType; | |||||
| 9 | import jav ax.persist ence.Id; | |||||
| 10 | import jav ax.persist ence.Table ; | |||||
| 11 | ||||||
| 12 | /** | |||||
| 13 | * | |||||
| 14 | * @since 06/02/2016 | |||||
| 15 | * @author Johann So nnenberg | |||||
| 16 | */ | |||||
| 17 | @Entity | |||||
| 18 | @Table(nam e = "MAIL_ TEMPLATE") | |||||
| 19 | public cla ss MailTem plate impl ements Ser ializable { | |||||
| 20 | ||||||
| 21 | privat e static f inal long serialVers ionUID = 1 L; | |||||
| 22 | ||||||
| 23 | @Id | |||||
| 24 | @Gener atedValue( strategy = Generatio nType.AUTO ) | |||||
| 25 | @Colum n(name = " MAIL_TEMPL ATE_ID") | |||||
| 26 | privat e Long mai lTemplateI d; | |||||
| 27 | ||||||
| 28 | @Basic (optional = false) | |||||
| 29 | @Colum n(name = " LETTER_TYP E_ID") | |||||
| 30 | privat e Long let terTypeId; | |||||
| 31 | ||||||
| 32 | @Basic (optional = false) | |||||
| 33 | @Colum n(name = " TEXT") | |||||
| 34 | privat e String t ext; | |||||
| 35 | ||||||
| 36 | public Long getM ailTemplat eId() { | |||||
| 37 | re turn mailT emplateId; | |||||
| 38 | } | |||||
| 39 | ||||||
| 40 | public void setM ailTemplat eId(Long m ailTemplat eId) { | |||||
| 41 | th is.mailTem plateId = mailTempla teId; | |||||
| 42 | } | |||||
| 43 | ||||||
| 44 | public String ge tText() { | |||||
| 45 | re turn text; | |||||
| 46 | } | |||||
| 47 | ||||||
| 48 | public void setT ext(String text) { | |||||
| 49 | th is.text = text; | |||||
| 50 | } | |||||
| 51 | ||||||
| 52 | public Long getL etterType( ) { | |||||
| 53 | re turn lette rTypeId; | |||||
| 54 | } | |||||
| 55 | ||||||
| 56 | public void setL etterType( Long lette rTypeId) { | |||||
| 57 | th is.letterT ypeId = le tterTypeId ; | |||||
| 58 | } | |||||
| 59 | ||||||
| 60 | @Overr ide | |||||
| 61 | public int hashC ode() { | |||||
| 62 | in t hash = 0 ; | |||||
| 63 | ha sh += (mai lTemplateI d != null ? mailTemp lateId.has hCode() : 0); | |||||
| 64 | re turn hash; | |||||
| 65 | } | |||||
| 66 | ||||||
| 67 | @Overr ide | |||||
| 68 | public boolean e quals(Obje ct object) { | |||||
| 69 | // TODO: War ning - thi s method w on't work in the cas e the mail TemplateId fields ar e not set | |||||
| 70 | if (!(object instanceo f MailTemp late)) { | |||||
| 71 | return f alse; | |||||
| 72 | } | |||||
| 73 | Ma ilTemplate other = ( MailTempla te) object ; | |||||
| 74 | if ((this.ma ilTemplate Id == null && other. mailTempla teId != nu ll) || (th is.mailTem plateId != null && ! this.mailT emplateId. equals(oth er.mailTem plateId))) { | |||||
| 75 | return f alse; | |||||
| 76 | } | |||||
| 77 | re turn true; | |||||
| 78 | } | |||||
| 79 | ||||||
| 80 | @Overr ide | |||||
| 81 | public String to String() { | |||||
| 82 | re turn "gov. va.nvap.sv c.consentm gmt.stub.d ata.MailTe mplate[ id =" + mailT emplateId + " ]"; | |||||
| 83 | } | |||||
| 84 | ||||||
| 85 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.