Produced by Araxis Merge on 1/17/2019 10:54:34 AM Central 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 | v1_iter_1_VIP_Build_4_Dec_2018_CG.zip\v1_iter_1_VIP_Build_4\portlets\caret-portlet\docroot\WEB-INF\src\gov\va\med\via\service | MicrobiologyRpt.java | Wed Jan 16 16:06:44 2019 UTC |
| 2 | v1_iter_1_VIP_Build_4_Dec_2018_CG.zip\v1_iter_1_VIP_Build_4\portlets\caret-portlet\docroot\WEB-INF\src\gov\va\med\via\service | MicrobiologyRpt.java | Wed Jan 16 20:17:45 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 548 |
| Changed | 2 | 8 |
| 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 | package go v.va.med.v ia.service ; | |
| 3 | ||
| 4 | import jav ax.xml.bin d.annotati on.XmlAcce ssType; | |
| 5 | import jav ax.xml.bin d.annotati on.XmlAcce ssorType; | |
| 6 | import jav ax.xml.bin d.annotati on.XmlType ; | |
| 7 | ||
| 8 | ||
| 9 | /** | |
| 10 | * <p>Java class for microbiol ogyRpt com plex type. | |
| 11 | * | |
| 12 | * <p>The following schema fra gment spec ifies the expected c ontent con tained wit hin this c lass. | |
| 13 | * | |
| 14 | * <pre> | |
| 15 | * <com plexType n ame="micro biologyRpt "> | |
| 16 | * <c omplexCont ent> | |
| 17 | * <extens ion base=" {http:// DNS . URL /}abstract TO"> | |
| 18 | * & lt;sequenc e> | |
| 19 | * <eleme nt name="i d" type="{ http://www .w3.org/20 01/XMLSche ma}string" minOccurs ="0" form= "unqualifi ed"/> | |
| 20 | * <eleme nt name="t itle" type ="{http:// www.w3.org /2001/XMLS chema}stri ng" minOcc urs="0" fo rm="unqual ified"/> ; | |
| 21 | * <eleme nt name="t imestamp" type="{htt p://www.w3 .org/2001/ XMLSchema} string" mi nOccurs="0 " form="un qualified" /> | |
| 22 | * <elemen t name="au thor" type ="{http:// DNS . URL /}authorTO " minOccur s="0" form ="unqualif ied"/> | |
| 23 | * <elemen t name="fa cility" ty pe="{http: // DNS . URL /}taggedTe xt" minOcc urs="0" fo rm="unqual ified"/> ; | |
| 24 | * <elemen t name="sp ecimen" ty pe="{http: // DNS . URL /}labSpeci menTO" min Occurs="0" form="unq ualified"/ > | |
| 25 | * <eleme nt name="c omment" ty pe="{http: //www.w3.o rg/2001/XM LSchema}st ring" minO ccurs="0" form="unqu alified"/& gt; | |
| 26 | * <eleme nt name="s ample" typ e="{http:/ /www.w3.or g/2001/XML Schema}str ing" minOc curs="0" f orm="unqua lified"/&g t; | |
| 27 | * <eleme nt name="t ext" type= "{http://w ww.w3.org/ 2001/XMLSc hema}strin g" minOccu rs="0" for m="unquali fied"/> | |
| 28 | * & lt;/sequen ce> | |
| 29 | * < ;/extensio n> | |
| 30 | * </ complexCon tent> | |
| 31 | * </co mplexType& gt; | |
| 32 | * </pre> | |
| 33 | * | |
| 34 | * | |
| 35 | */ | |
| 36 | @XmlAccess orType(Xml AccessType .FIELD) | |
| 37 | @XmlType(n ame = "mic robiologyR pt", propO rder = { | |
| 38 | "id", | |
| 39 | "title ", | |
| 40 | "times tamp", | |
| 41 | "autho r", | |
| 42 | "facil ity", | |
| 43 | "speci men", | |
| 44 | "comme nt", | |
| 45 | "sampl e", | |
| 46 | "text" | |
| 47 | }) | |
| 48 | public cla ss Microbi ologyRpt | |
| 49 | extend s Abstract TO | |
| 50 | { | |
| 51 | ||
| 52 | protec ted String id; | |
| 53 | protec ted String title; | |
| 54 | protec ted String timestamp ; | |
| 55 | protec ted Author TO author; | |
| 56 | protec ted Tagged Text facil ity; | |
| 57 | protec ted LabSpe cimenTO sp ecimen; | |
| 58 | protec ted String comment; | |
| 59 | protec ted String sample; | |
| 60 | protec ted String text; | |
| 61 | ||
| 62 | /** | |
| 63 | * Get s the valu e of the i d property . | |
| 64 | * | |
| 65 | * @re turn | |
| 66 | * possible object is | |
| 67 | * {@link St ring } | |
| 68 | * | |
| 69 | */ | |
| 70 | public String ge tId() { | |
| 71 | re turn id; | |
| 72 | } | |
| 73 | ||
| 74 | /** | |
| 75 | * Set s the valu e of the i d property . | |
| 76 | * | |
| 77 | * @pa ram value | |
| 78 | * allowed o bject is | |
| 79 | * {@link St ring } | |
| 80 | * | |
| 81 | */ | |
| 82 | public void setI d(String v alue) { | |
| 83 | th is.id = va lue; | |
| 84 | } | |
| 85 | ||
| 86 | /** | |
| 87 | * Get s the valu e of the t itle prope rty. | |
| 88 | * | |
| 89 | * @re turn | |
| 90 | * possible object is | |
| 91 | * {@link St ring } | |
| 92 | * | |
| 93 | */ | |
| 94 | public String ge tTitle() { | |
| 95 | re turn title ; | |
| 96 | } | |
| 97 | ||
| 98 | /** | |
| 99 | * Set s the valu e of the t itle prope rty. | |
| 100 | * | |
| 101 | * @pa ram value | |
| 102 | * allowed o bject is | |
| 103 | * {@link St ring } | |
| 104 | * | |
| 105 | */ | |
| 106 | public void setT itle(Strin g value) { | |
| 107 | th is.title = value; | |
| 108 | } | |
| 109 | ||
| 110 | /** | |
| 111 | * Get s the valu e of the t imestamp p roperty. | |
| 112 | * | |
| 113 | * @re turn | |
| 114 | * possible object is | |
| 115 | * {@link St ring } | |
| 116 | * | |
| 117 | */ | |
| 118 | public String ge tTimestamp () { | |
| 119 | re turn times tamp; | |
| 120 | } | |
| 121 | ||
| 122 | /** | |
| 123 | * Set s the valu e of the t imestamp p roperty. | |
| 124 | * | |
| 125 | * @pa ram value | |
| 126 | * allowed o bject is | |
| 127 | * {@link St ring } | |
| 128 | * | |
| 129 | */ | |
| 130 | public void setT imestamp(S tring valu e) { | |
| 131 | th is.timesta mp = value ; | |
| 132 | } | |
| 133 | ||
| 134 | /** | |
| 135 | * Get s the valu e of the a uthor prop erty. | |
| 136 | * | |
| 137 | * @re turn | |
| 138 | * possible object is | |
| 139 | * {@link Au thorTO } | |
| 140 | * | |
| 141 | */ | |
| 142 | public AuthorTO getAuthor( ) { | |
| 143 | re turn autho r; | |
| 144 | } | |
| 145 | ||
| 146 | /** | |
| 147 | * Set s the valu e of the a uthor prop erty. | |
| 148 | * | |
| 149 | * @pa ram value | |
| 150 | * allowed o bject is | |
| 151 | * {@link Au thorTO } | |
| 152 | * | |
| 153 | */ | |
| 154 | public void setA uthor(Auth orTO value ) { | |
| 155 | th is.author = value; | |
| 156 | } | |
| 157 | ||
| 158 | /** | |
| 159 | * Get s the valu e of the f acility pr operty. | |
| 160 | * | |
| 161 | * @re turn | |
| 162 | * possible object is | |
| 163 | * {@link Ta ggedText } | |
| 164 | * | |
| 165 | */ | |
| 166 | public TaggedTex t getFacil ity() { | |
| 167 | re turn facil ity; | |
| 168 | } | |
| 169 | ||
| 170 | /** | |
| 171 | * Set s the valu e of the f acility pr operty. | |
| 172 | * | |
| 173 | * @pa ram value | |
| 174 | * allowed o bject is | |
| 175 | * {@link Ta ggedText } | |
| 176 | * | |
| 177 | */ | |
| 178 | public void setF acility(Ta ggedText v alue) { | |
| 179 | th is.facilit y = value; | |
| 180 | } | |
| 181 | ||
| 182 | /** | |
| 183 | * Get s the valu e of the s pecimen pr operty. | |
| 184 | * | |
| 185 | * @re turn | |
| 186 | * possible object is | |
| 187 | * {@link La bSpecimenT O } | |
| 188 | * | |
| 189 | */ | |
| 190 | public LabSpecim enTO getSp ecimen() { | |
| 191 | re turn speci men; | |
| 192 | } | |
| 193 | ||
| 194 | /** | |
| 195 | * Set s the valu e of the s pecimen pr operty. | |
| 196 | * | |
| 197 | * @pa ram value | |
| 198 | * allowed o bject is | |
| 199 | * {@link La bSpecimenT O } | |
| 200 | * | |
| 201 | */ | |
| 202 | public void setS pecimen(La bSpecimenT O value) { | |
| 203 | th is.specime n = value; | |
| 204 | } | |
| 205 | ||
| 206 | /** | |
| 207 | * Get s the valu e of the c omment pro perty. | |
| 208 | * | |
| 209 | * @re turn | |
| 210 | * possible object is | |
| 211 | * {@link St ring } | |
| 212 | * | |
| 213 | */ | |
| 214 | public String ge tComment() { | |
| 215 | re turn comme nt; | |
| 216 | } | |
| 217 | ||
| 218 | /** | |
| 219 | * Set s the valu e of the c omment pro perty. | |
| 220 | * | |
| 221 | * @pa ram value | |
| 222 | * allowed o bject is | |
| 223 | * {@link St ring } | |
| 224 | * | |
| 225 | */ | |
| 226 | public void setC omment(Str ing value) { | |
| 227 | th is.comment = value; | |
| 228 | } | |
| 229 | ||
| 230 | /** | |
| 231 | * Get s the valu e of the s ample prop erty. | |
| 232 | * | |
| 233 | * @re turn | |
| 234 | * possible object is | |
| 235 | * {@link St ring } | |
| 236 | * | |
| 237 | */ | |
| 238 | public String ge tSample() { | |
| 239 | re turn sampl e; | |
| 240 | } | |
| 241 | ||
| 242 | /** | |
| 243 | * Set s the valu e of the s ample prop erty. | |
| 244 | * | |
| 245 | * @pa ram value | |
| 246 | * allowed o bject is | |
| 247 | * {@link St ring } | |
| 248 | * | |
| 249 | */ | |
| 250 | public void setS ample(Stri ng value) { | |
| 251 | th is.sample = value; | |
| 252 | } | |
| 253 | ||
| 254 | /** | |
| 255 | * Get s the valu e of the t ext proper ty. | |
| 256 | * | |
| 257 | * @re turn | |
| 258 | * possible object is | |
| 259 | * {@link St ring } | |
| 260 | * | |
| 261 | */ | |
| 262 | public String ge tText() { | |
| 263 | re turn text; | |
| 264 | } | |
| 265 | ||
| 266 | /** | |
| 267 | * Set s the valu e of the t ext proper ty. | |
| 268 | * | |
| 269 | * @pa ram value | |
| 270 | * allowed o bject is | |
| 271 | * {@link St ring } | |
| 272 | * | |
| 273 | */ | |
| 274 | public void setT ext(String value) { | |
| 275 | th is.text = value; | |
| 276 | } | |
| 277 | ||
| 278 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.