Produced by Araxis Merge on 12/20/2017 5:56:12 PM Eastern Standard 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 | Genisis_2.0_v6_bld6.zip\Source Code\UI\Services\src\main\java\gov\va\genisis2\common\enums | EmailEnum.java | Thu Dec 14 19:57:16 2017 UTC |
| 2 | Genisis_2.0_v6_bld6.zip\Source Code\UI\Services\src\main\java\gov\va\genisis2\common\enums | EmailEnum.java | Wed Dec 20 22:06:28 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 404 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| 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 | /** | |
| 2 | * | |
| 3 | */ | |
| 4 | package go v.va.genis is2.common .enums; | |
| 5 | ||
| 6 | /** | |
| 7 | * @author PII | |
| 8 | * | |
| 9 | */ | |
| 10 | public enu m EmailEnu m { | |
| 11 | ||
| 12 | /* * The Desc ription */ | |
| 13 | EM AILID_DELI METER(",") , | |
| 14 | ||
| 15 | /* * The Desc ription */ | |
| 16 | EM PTY_STRING (""), | |
| 17 | ||
| 18 | /* * The cc_u sers */ | |
| 19 | CC _USERS("cc _users"), | |
| 20 | ||
| 21 | /* * The vinc i.datasour ce@gmail.c om */ | |
| 22 | VI NCI_DATASO URCE("vinc i.datasour ce@gmail.c om"), | |
| 23 | ||
| 24 | /* * The Canc el */ | |
| 25 | CA NCEL_REQUE ST("Cancel "), | |
| 26 | ||
| 27 | /* * The Retu rn */ | |
| 28 | RE TURN_REQUE ST("Return "), | |
| 29 | ||
| 30 | /* * The Reje ct */ | |
| 31 | RE JECT_REQUE ST("Reject "), | |
| 32 | ||
| 33 | /* * The Sent */ | |
| 34 | SE NT_REQUEST ("Sent"), | |
| 35 | ||
| 36 | /* * The Unfu lfilled */ | |
| 37 | UN FULFILLED_ REQUEST("U nfulfilled "), | |
| 38 | ||
| 39 | /* * The Fulf illed */ | |
| 40 | FU LFILLED_RE QUEST("Ful filled"), | |
| 41 | ||
| 42 | /* * The Acce pt */ | |
| 43 | FU LFILLED_AC CEPT("Acce pt"), | |
| 44 | ||
| 45 | /* * The emai l.subject. submit1 */ | |
| 46 | EM AIL_SUBJEC T_SUBMIT_1 ("email.su bject.subm it1"), | |
| 47 | ||
| 48 | /* * The emai l.body.sub mit1 */ | |
| 49 | EM AIL_BODY_S UBMIT_1("e mail.body. submit1"), | |
| 50 | ||
| 51 | /* * The emai l.subject. submit2 */ | |
| 52 | EM AIL_SUBJEC T_SUBMIT_2 ("email.su bject.subm it2"), | |
| 53 | ||
| 54 | /* * The emai l.body.sub mit2 */ | |
| 55 | EM AIL_BODY_S UBMIT_2("e mail.body. submit2"), | |
| 56 | ||
| 57 | /* * The emai l.subject. returned" */ | |
| 58 | EM AIL_SUBJEC T_RETURN(" email.subj ect.return ed"), | |
| 59 | ||
| 60 | /* * The emai l.body.ret urned */ | |
| 61 | EM AIL_BODY_R ETURN("ema il.body.re turned"), | |
| 62 | ||
| 63 | /* * The emai l.subject. denied */ | |
| 64 | EM AIL_SUBJEC T_DENIED(" email.subj ect.denied "), | |
| 65 | ||
| 66 | /* * The emai l.body.den ied */ | |
| 67 | EM AIL_BODY_D ENIED("ema il.body.de nied"), | |
| 68 | ||
| 69 | /* * The emai l.subject. sent */ | |
| 70 | EM AIL_SUBJEC T_SENT("em ail.subjec t.sent"), | |
| 71 | ||
| 72 | /* * The emai l.body.sen t */ | |
| 73 | EM AIL_BODY_S ENT("email .body.sent "), | |
| 74 | ||
| 75 | /* * The emai l.subject. sent2 */ | |
| 76 | EM AIL_SUBJEC T_SENT_2(" email.subj ect.sent2" ), | |
| 77 | ||
| 78 | /* * The emai l.body.sen t2 */ | |
| 79 | EM AIL_BODY_S ENT_2("ema il.body.se nt2"), | |
| 80 | ||
| 81 | /* * The emai l.subject. notAccepte d */ | |
| 82 | EM AIL_SUBJEC T_NOTACCEP TED("email .subject.n otAccepted "), | |
| 83 | ||
| 84 | /* * The emai l.body.not Accepted * / | |
| 85 | EM AIL_BODY_N OTACCEPTED ("email.bo dy.notAcce pted"), | |
| 86 | ||
| 87 | /* * The emai l.body.not Accepted2 */ | |
| 88 | EM AIL_BODY_N OTACCEPTED _2("email. body.notAc cepted2"), | |
| 89 | ||
| 90 | /* * The emai l.subject. accepted * / | |
| 91 | EM AIL_SUBJEC T_ACCEPTED ("email.su bject.acce pted"), | |
| 92 | ||
| 93 | /* * The emai l.body.acc epted */ | |
| 94 | EM AIL_BODY_A CCEPTED("e mail.body. accepted") , | |
| 95 | ||
| 96 | /* * The emai l.subject. resultsDel ivered */ | |
| 97 | EM AIL_SUBJEC T_RESULTSD ELIVERED(" email.subj ect.result sDelivered "), | |
| 98 | ||
| 99 | /* * The emai l.body.res ultsDelive red */ | |
| 100 | EM AIL_BODY_R ESULTSDELI VERED("ema il.body.re sultsDeliv ered"), | |
| 101 | ||
| 102 | /* * The emai l.subject. resultsDel ivered */ | |
| 103 | EM AIL_SUBJEC T_RESULTSD ELIVERED_2 ("email.su bject.resu ltsDeliver ed2"), | |
| 104 | ||
| 105 | /* * The emai l.body.res ultsDelive red2 */ | |
| 106 | EM AIL_BODY_R ESULTSDELI VERED_2("e mail.body. resultsDel ivered2"), | |
| 107 | ||
| 108 | /* * The emai l.subject. resultsNot Accepted * / | |
| 109 | EM AIL_SUBJEC T_RESULTSN OTACCEPTED ("email.su bject.resu ltsNotAcce pted"), | |
| 110 | ||
| 111 | /* * The emai l.body.res ultsNotAcc epted */ | |
| 112 | EM AIL_BODY_R ESULTSNOTA CCEPTED("e mail.body. resultsNot Accepted") , | |
| 113 | ||
| 114 | /* * The emai l.subject. resultsAcc epted */ | |
| 115 | EM AIL_SUBJEC T_RESULTSA CCEPTED("e mail.subje ct.results Accepted") , | |
| 116 | ||
| 117 | /* * The emai l.body.res ultsAccept ed */ | |
| 118 | EM AIL_BODY_R ESULTSACCE PTED("emai l.body.res ultsAccept ed"), | |
| 119 | ||
| 120 | /* * The emai l.subject. cancelledR equest */ | |
| 121 | EM AIL_SUBJEC T_CANCELLE D_REQUEST( "email.sub ject.cance lledReques t"), | |
| 122 | ||
| 123 | /* * The emai l.body.can celledRequ est */ | |
| 124 | EM AIL_BODY_C ANCELLED_R EQUEST("em ail.body.c ancelledRe quest"), | |
| 125 | ||
| 126 | /* * The emai l.subject. returnToDD MRequest * / | |
| 127 | EM AIL_SUBJEC T_RETURN_T O_DDM("ema il.subject .returnToD DMRequest" ), | |
| 128 | ||
| 129 | /* * The emai l.body.ret urnToDDMRe quest */ | |
| 130 | EM AIL_BODY_R ETURN_TO_D DM("email. body.retur nToDDMRequ est"), | |
| 131 | ||
| 132 | /* * The vm.e mail.subje ct.submit */ | |
| 133 | VM _EMAIL_SUB JECT_SUBMI T("vm.emai l.subject. submit"), | |
| 134 | ||
| 135 | /* * The vm.e mail.body. submit */ | |
| 136 | VM _EMAIL_BOD Y_SUBMIT(" vm.email.b ody.submit "), | |
| 137 | ||
| 138 | /* * The vm.e mail.subje ct.returne d */ | |
| 139 | VM _EMAIL_SUB JECT_RETUR NED("vm.em ail.subjec t.returned "), | |
| 140 | ||
| 141 | /* * The vm.e mail.body. returned * / | |
| 142 | VM _EMAIL_BOD Y_RETURNED ("vm.email .body.retu rned"), | |
| 143 | ||
| 144 | /* * The vm.e mail.subje ct.denied */ | |
| 145 | VM _EMAIL_SUB JECT_DENIE D("vm.emai l.subject. denied"), | |
| 146 | ||
| 147 | /* * The vm.e mail.body. denied */ | |
| 148 | VM _EMAIL_BOD Y_DENIED(" vm.email.b ody.denied "), | |
| 149 | ||
| 150 | /* * The vm.e mail.subje ct.accepte d */ | |
| 151 | VM _EMAIL_SUB JECT_ACCEP TED("vm.em ail.subjec t.accepted "), | |
| 152 | ||
| 153 | /* * The vm.e mail.body. accepted * / | |
| 154 | VM _EMAIL_BOD Y_ACCEPTED ("vm.email .body.acce pted"), | |
| 155 | ||
| 156 | /* * The vm.e mail.subje ct.results Delivered */ | |
| 157 | VM _EMAIL_SUB JECT_RESUL TS_DELIVER ED("vm.ema il.subject .resultsDe livered"), | |
| 158 | ||
| 159 | /* * The vm.e mail.body. resultsDel ivered*/ | |
| 160 | VM _EMAIL_BOD Y_RESULTS_ DELIVERED( "vm.email. body.resul tsDelivere d"), | |
| 161 | ||
| 162 | /* * The vm.e mail.subje ct.results NotAccepte d*/ | |
| 163 | VM _EMAIL_SUB JECT_RESUL TS_NOT_ACC EPTED("vm. email.subj ect.result sNotAccept ed"), | |
| 164 | ||
| 165 | /* * The vm.e mail.body. resultsNot Accepted*/ | |
| 166 | VM _EMAIL_BOD Y_RESULTS_ NOT_ACCEPT ED("vm.ema il.body.re sultsNotAc cepted"), | |
| 167 | ||
| 168 | /* * The vm.e mail.subje ct.results Accepted*/ | |
| 169 | VM _EMAIL_SUB JECT_RESUL TS_ACCEPTE D("vm.emai l.subject. resultsAcc epted"), | |
| 170 | ||
| 171 | /* * The vm.e mail.body. resultsAcc epted*/ | |
| 172 | VM _EMAIL_BOD Y_RESULTS_ ACCEPTED(" vm.email.b ody.result sAccepted" ), | |
| 173 | ||
| 174 | /* * The vm.e mail.subje ct.cancel* / | |
| 175 | VM _EMAIL_SUB JECT_CANCE LLED("vm.e mail.subje ct.cancel" ), | |
| 176 | ||
| 177 | /* * The vm.e mail.body. cancel*/ | |
| 178 | VM _EMAIL_BOD Y_CANCELLE D("vm.emai l.body.can cel"); | |
| 179 | ||
| 180 | ||
| 181 | ||
| 182 | /* * The text . */ | |
| 183 | pr ivate fina l String t ext; | |
| 184 | ||
| 185 | /* * | |
| 186 | * Instantia tes a new common enu m. | |
| 187 | * | |
| 188 | * @param te xt | |
| 189 | * The s. | |
| 190 | * / | |
| 191 | pr ivate Emai lEnum(Stri ng text) { | |
| 192 | this .text = te xt; | |
| 193 | } | |
| 194 | ||
| 195 | /* * | |
| 196 | * Gets the text. | |
| 197 | * | |
| 198 | * @return S tring This returns t ext. | |
| 199 | * / | |
| 200 | pu blic Strin g getText( ) { | |
| 201 | retu rn text; | |
| 202 | } | |
| 203 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.