Produced by Araxis Merge on 4/2/2019 1:06:54 PM Central 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 | C:\AraxisMergeCompare\Pri_un\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\model\request | JsonArrayModel.java | Wed Mar 27 19:22:48 2019 UTC |
2 | C:\AraxisMergeCompare\Pri_re\ARS_Backend\ars_app\src\main\java\gov\va\med\ars\model\request | JsonArrayModel.java | Thu Mar 28 17:50:44 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 170 |
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.med.a rs.model.r equest; | |
5 | ||
6 | import jav a.util.Lis t; | |
7 | ||
8 | /** | |
9 | * @author
|
|
10 | * | |
11 | */ | |
12 | public cla ss JsonArr ayModel { | |
13 | ||
14 | Li st<String> AcceptedV alues; | |
15 | bo olean stat us; | |
16 | ||
17 | /* * | |
18 | * | |
19 | * / | |
20 | pu blic JsonA rrayModel( ) { | |
21 | supe r(); | |
22 | // T ODO Auto-g enerated c onstructor stub | |
23 | } | |
24 | ||
25 | /* * | |
26 | * @param ac ceptedValu es | |
27 | * / | |
28 | pu blic JsonA rrayModel( List<Strin g> accepte dValues) { | |
29 | supe r(); | |
30 | Acce ptedValues = accepte dValues; | |
31 | } | |
32 | ||
33 | pu blic JsonA rrayModel( List<Strin g> accepte dValues, b oolean sta tus) { | |
34 | supe r(); | |
35 | Acce ptedValues = accepte dValues; | |
36 | this .status = status; | |
37 | } | |
38 | ||
39 | /* * | |
40 | * @return t he accepte dValues | |
41 | * / | |
42 | pu blic List< String> ge tAcceptedV alues() { | |
43 | retu rn Accepte dValues; | |
44 | } | |
45 | ||
46 | /* * | |
47 | * @param ac ceptedValu es | |
48 | * the acce ptedValues to set | |
49 | * / | |
50 | pu blic void setAccepte dValues(Li st<String> acceptedV alues) { | |
51 | Acce ptedValues = accepte dValues; | |
52 | } | |
53 | ||
54 | pu blic boole an isStatu s() { | |
55 | retu rn status; | |
56 | } | |
57 | ||
58 | pu blic void setStatus( boolean st atus) { | |
59 | this .status = status; | |
60 | } | |
61 | ||
62 | @O verride | |
63 | pu blic int h ashCode() { | |
64 | fina l int prim e = 31; | |
65 | int result = 1 ; | |
66 | resu lt = prime * result + ((Accept edValues = = null) ? 0 : Accept edValues.h ashCode()) ; | |
67 | retu rn result; | |
68 | } | |
69 | ||
70 | @O verride | |
71 | pu blic boole an equals( Object obj ) { | |
72 | if ( this == ob j) | |
73 | return true; | |
74 | if ( obj == nul l) | |
75 | return false; | |
76 | if ( getClass() != obj.ge tClass()) | |
77 | return false; | |
78 | Json ArrayModel other = ( JsonArrayM odel) obj; | |
79 | if ( AcceptedVa lues == nu ll) { | |
80 | if (ot her.Accept edValues ! = null) | |
81 | return f alse; | |
82 | } el se if (!Ac ceptedValu es.equals( other.Acce ptedValues )) | |
83 | return false; | |
84 | retu rn true; | |
85 | } | |
86 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.