Produced by Araxis Merge on 1/17/2019 10:54:38 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 | TaggedText.java | Wed Jan 16 16:06:30 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 | TaggedText.java | Wed Jan 16 20:18:37 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 560 |
| Changed | 3 | 6 |
| 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 a.util.Arr ayList; | |
| 5 | import jav a.util.Lis t; | |
| 6 | import jav ax.xml.bin d.annotati on.XmlAcce ssType; | |
| 7 | import jav ax.xml.bin d.annotati on.XmlAcce ssorType; | |
| 8 | import jav ax.xml.bin d.annotati on.XmlType ; | |
| 9 | ||
| 10 | ||
| 11 | /** | |
| 12 | * <p>Java class for taggedTex t complex type. | |
| 13 | * | |
| 14 | * <p>The following schema fra gment spec ifies the expected c ontent con tained wit hin this c lass. | |
| 15 | * | |
| 16 | * <pre> | |
| 17 | * <com plexType n ame="tagge dText"> | |
| 18 | * <c omplexCont ent> | |
| 19 | * <extens ion base=" {http:// DNS . URL /}abstract TO"> | |
| 20 | * & lt;sequenc e> | |
| 21 | * <eleme nt name="t ag" type=" {http://ww w.w3.org/2 001/XMLSch ema}string " minOccur s="0" form ="unqualif ied"/> | |
| 22 | * <eleme nt name="t ext" type= "{http://w ww.w3.org/ 2001/XMLSc hema}strin g" minOccu rs="0" for m="unquali fied"/> | |
| 23 | * <eleme nt name="t extArray" minOccurs= "0" form=" unqualifie d"> | |
| 24 | * <com plexType&g t; | |
| 25 | * <c omplexCont ent> | |
| 26 | * < ;restricti on base="{ http://www .w3.org/20 01/XMLSche ma}anyType "> | |
| 27 | * & lt;sequenc e> | |
| 28 | * <eleme nt name="t extArray" type="{htt p://www.w3 .org/2001/ XMLSchema} string" ma xOccurs="u nbounded" minOccurs= "0" form=" unqualifie d"/> | |
| 29 | * & lt;/sequen ce> | |
| 30 | * < ;/restrict ion> | |
| 31 | * </ complexCon tent> | |
| 32 | * </co mplexType& gt; | |
| 33 | * </elem ent> | |
| 34 | * <eleme nt name="t aggedResul ts" minOcc urs="0" fo rm="unqual ified"> | |
| 35 | * <com plexType&g t; | |
| 36 | * <c omplexCont ent> | |
| 37 | * < ;restricti on base="{ http://www .w3.org/20 01/XMLSche ma}anyType "> | |
| 38 | * & lt;sequenc e> | |
| 39 | * <elemen t name="ta ggedText" type="{htt p:// DNS . URL /}taggedTe xt" maxOcc urs="unbou nded" minO ccurs="0" form="unqu alified"/& gt; | |
| 40 | * & lt;/sequen ce> | |
| 41 | * < ;/restrict ion> | |
| 42 | * </ complexCon tent> | |
| 43 | * </co mplexType& gt; | |
| 44 | * </elem ent> | |
| 45 | * & lt;/sequen ce> | |
| 46 | * < ;/extensio n> | |
| 47 | * </ complexCon tent> | |
| 48 | * </co mplexType& gt; | |
| 49 | * </pre> | |
| 50 | * | |
| 51 | * | |
| 52 | */ | |
| 53 | @XmlAccess orType(Xml AccessType .FIELD) | |
| 54 | @XmlType(n ame = "tag gedText", propOrder = { | |
| 55 | "tag", | |
| 56 | "text" , | |
| 57 | "textA rray", | |
| 58 | "tagge dResults" | |
| 59 | }) | |
| 60 | public cla ss TaggedT ext | |
| 61 | extend s Abstract TO | |
| 62 | { | |
| 63 | ||
| 64 | protec ted String tag; | |
| 65 | protec ted String text; | |
| 66 | protec ted Tagged Text.TextA rray textA rray; | |
| 67 | protec ted Tagged Text.Tagge dResults t aggedResul ts; | |
| 68 | ||
| 69 | /** | |
| 70 | * Get s the valu e of the t ag propert y. | |
| 71 | * | |
| 72 | * @re turn | |
| 73 | * possible object is | |
| 74 | * {@link St ring } | |
| 75 | * | |
| 76 | */ | |
| 77 | public String ge tTag() { | |
| 78 | re turn tag; | |
| 79 | } | |
| 80 | ||
| 81 | /** | |
| 82 | * Set s the valu e of the t ag propert y. | |
| 83 | * | |
| 84 | * @pa ram value | |
| 85 | * allowed o bject is | |
| 86 | * {@link St ring } | |
| 87 | * | |
| 88 | */ | |
| 89 | public void setT ag(String value) { | |
| 90 | th is.tag = v alue; | |
| 91 | } | |
| 92 | ||
| 93 | /** | |
| 94 | * Get s the valu e of the t ext proper ty. | |
| 95 | * | |
| 96 | * @re turn | |
| 97 | * possible object is | |
| 98 | * {@link St ring } | |
| 99 | * | |
| 100 | */ | |
| 101 | public String ge tText() { | |
| 102 | re turn text; | |
| 103 | } | |
| 104 | ||
| 105 | /** | |
| 106 | * Set s the valu e of the t ext proper ty. | |
| 107 | * | |
| 108 | * @pa ram value | |
| 109 | * allowed o bject is | |
| 110 | * {@link St ring } | |
| 111 | * | |
| 112 | */ | |
| 113 | public void setT ext(String value) { | |
| 114 | th is.text = value; | |
| 115 | } | |
| 116 | ||
| 117 | /** | |
| 118 | * Get s the valu e of the t extArray p roperty. | |
| 119 | * | |
| 120 | * @re turn | |
| 121 | * possible object is | |
| 122 | * {@link Ta ggedText.T extArray } | |
| 123 | * | |
| 124 | */ | |
| 125 | public TaggedTex t.TextArra y getTextA rray() { | |
| 126 | re turn textA rray; | |
| 127 | } | |
| 128 | ||
| 129 | /** | |
| 130 | * Set s the valu e of the t extArray p roperty. | |
| 131 | * | |
| 132 | * @pa ram value | |
| 133 | * allowed o bject is | |
| 134 | * {@link Ta ggedText.T extArray } | |
| 135 | * | |
| 136 | */ | |
| 137 | public void setT extArray(T aggedText. TextArray value) { | |
| 138 | th is.textArr ay = value ; | |
| 139 | } | |
| 140 | ||
| 141 | /** | |
| 142 | * Get s the valu e of the t aggedResul ts propert y. | |
| 143 | * | |
| 144 | * @re turn | |
| 145 | * possible object is | |
| 146 | * {@link Ta ggedText.T aggedResul ts } | |
| 147 | * | |
| 148 | */ | |
| 149 | public TaggedTex t.TaggedRe sults getT aggedResul ts() { | |
| 150 | re turn tagge dResults; | |
| 151 | } | |
| 152 | ||
| 153 | /** | |
| 154 | * Set s the valu e of the t aggedResul ts propert y. | |
| 155 | * | |
| 156 | * @pa ram value | |
| 157 | * allowed o bject is | |
| 158 | * {@link Ta ggedText.T aggedResul ts } | |
| 159 | * | |
| 160 | */ | |
| 161 | public void setT aggedResul ts(TaggedT ext.Tagged Results va lue) { | |
| 162 | th is.taggedR esults = v alue; | |
| 163 | } | |
| 164 | ||
| 165 | ||
| 166 | /** | |
| 167 | * <p> Java class for anony mous compl ex type. | |
| 168 | * | |
| 169 | * <p> The follow ing schema fragment specifies the expect ed content contained within th is class. | |
| 170 | * | |
| 171 | * <pr e> | |
| 172 | * < ;complexTy pe> | |
| 173 | * & lt;complex Content> ; | |
| 174 | * <restr iction bas e="{http:/ /www.w3.or g/2001/XML Schema}any Type"> | |
| 175 | * <seq uence> | |
| 176 | * <elemen t name="ta ggedText" type="{htt p:// DNS . URL /}taggedTe xt" maxOcc urs="unbou nded" minO ccurs="0" form="unqu alified"/& gt; | |
| 177 | * </se quence> | |
| 178 | * </rest riction> ; | |
| 179 | * & lt;/comple xContent&g t; | |
| 180 | * < ;/complexT ype> | |
| 181 | * </p re> | |
| 182 | * | |
| 183 | * | |
| 184 | */ | |
| 185 | @XmlAc cessorType (XmlAccess Type.FIELD ) | |
| 186 | @XmlTy pe(name = "", propOr der = { | |
| 187 | "t aggedText" | |
| 188 | }) | |
| 189 | public static cl ass Tagged Results { | |
| 190 | ||
| 191 | pr otected Li st<TaggedT ext> tagge dText; | |
| 192 | ||
| 193 | /* * | |
| 194 | * Gets the value of t he taggedT ext proper ty. | |
| 195 | * | |
| 196 | * <p> | |
| 197 | * This acce ssor metho d returns a referenc e to the l ive list, | |
| 198 | * not a sna pshot. The refore any modificat ion you ma ke to the | |
| 199 | * returned list will be present inside th e JAXB obj ect. | |
| 200 | * This is w hy there i s not a <C ODE>set</C ODE> metho d for the taggedText property. | |
| 201 | * | |
| 202 | * <p> | |
| 203 | * For examp le, to add a new ite m, do as f ollows: | |
| 204 | * <pre> | |
| 205 | * getTag gedText(). add(newIte m); | |
| 206 | * </pre> | |
| 207 | * | |
| 208 | * | |
| 209 | * <p> | |
| 210 | * Objects o f the foll owing type (s) are al lowed in t he list | |
| 211 | * {@link Ta ggedText } | |
| 212 | * | |
| 213 | * | |
| 214 | * / | |
| 215 | pu blic List< TaggedText > getTagge dText() { | |
| 216 | if (tagg edText == null) { | |
| 217 | tagg edText = n ew ArrayLi st<TaggedT ext>(); | |
| 218 | } | |
| 219 | return t his.tagged Text; | |
| 220 | } | |
| 221 | ||
| 222 | } | |
| 223 | ||
| 224 | ||
| 225 | /** | |
| 226 | * <p> Java class for anony mous compl ex type. | |
| 227 | * | |
| 228 | * <p> The follow ing schema fragment specifies the expect ed content contained within th is class. | |
| 229 | * | |
| 230 | * <pr e> | |
| 231 | * < ;complexTy pe> | |
| 232 | * & lt;complex Content> ; | |
| 233 | * <restr iction bas e="{http:/ /www.w3.or g/2001/XML Schema}any Type"> | |
| 234 | * <seq uence> | |
| 235 | * <e lement nam e="textArr ay" type=" {http://ww w.w3.org/2 001/XMLSch ema}string " maxOccur s="unbound ed" minOcc urs="0" fo rm="unqual ified"/> ; | |
| 236 | * </se quence> | |
| 237 | * </rest riction> ; | |
| 238 | * & lt;/comple xContent&g t; | |
| 239 | * < ;/complexT ype> | |
| 240 | * </p re> | |
| 241 | * | |
| 242 | * | |
| 243 | */ | |
| 244 | @XmlAc cessorType (XmlAccess Type.FIELD ) | |
| 245 | @XmlTy pe(name = "", propOr der = { | |
| 246 | "t extArray" | |
| 247 | }) | |
| 248 | public static cl ass TextAr ray { | |
| 249 | ||
| 250 | pr otected Li st<String> textArray ; | |
| 251 | ||
| 252 | /* * | |
| 253 | * Gets the value of t he textArr ay propert y. | |
| 254 | * | |
| 255 | * <p> | |
| 256 | * This acce ssor metho d returns a referenc e to the l ive list, | |
| 257 | * not a sna pshot. The refore any modificat ion you ma ke to the | |
| 258 | * returned list will be present inside th e JAXB obj ect. | |
| 259 | * This is w hy there i s not a <C ODE>set</C ODE> metho d for the textArray property. | |
| 260 | * | |
| 261 | * <p> | |
| 262 | * For examp le, to add a new ite m, do as f ollows: | |
| 263 | * <pre> | |
| 264 | * getTex tArray().a dd(newItem ); | |
| 265 | * </pre> | |
| 266 | * | |
| 267 | * | |
| 268 | * <p> | |
| 269 | * Objects o f the foll owing type (s) are al lowed in t he list | |
| 270 | * {@link St ring } | |
| 271 | * | |
| 272 | * | |
| 273 | * / | |
| 274 | pu blic List< String> ge tTextArray () { | |
| 275 | if (text Array == n ull) { | |
| 276 | text Array = ne w ArrayLis t<String>( ); | |
| 277 | } | |
| 278 | return t his.textAr ray; | |
| 279 | } | |
| 280 | ||
| 281 | } | |
| 282 | ||
| 283 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.