@@ -19,24 +19,12 @@ class AmiiboComparator(var settings: BrowserSettings) : Comparator<Amiibo> {
19
19
null == amiibo1 && null == amiibo2 -> 0
20
20
null == amiibo1 -> 1
21
21
null == amiibo2 -> - 1
22
- sort == SORT .NAME .value -> {
23
- compareAmiiboName(amiibo1, amiibo2)
24
- }
25
- sort == SORT .AMIIBO_SERIES .value -> {
26
- compareAmiiboSeries(amiibo1, amiibo2)
27
- }
28
- sort == SORT .AMIIBO_TYPE .value -> {
29
- compareAmiiboType(amiibo1, amiibo2)
30
- }
31
- sort == SORT .GAME_SERIES .value -> {
32
- compareGameSeries(amiibo1, amiibo2)
33
- }
34
- sort == SORT .CHARACTER .value -> {
35
- compareCharacter(amiibo1, amiibo2)
36
- }
37
- else -> {
38
- amiibo1.compareTo(amiibo2)
39
- }
22
+ sort == SORT .NAME .value -> compareAmiiboName(amiibo1, amiibo2)
23
+ sort == SORT .AMIIBO_SERIES .value -> compareAmiiboSeries(amiibo1, amiibo2)
24
+ sort == SORT .AMIIBO_TYPE .value -> compareAmiiboType(amiibo1, amiibo2)
25
+ sort == SORT .GAME_SERIES .value -> compareGameSeries(amiibo1, amiibo2)
26
+ sort == SORT .CHARACTER .value -> compareCharacter(amiibo1, amiibo2)
27
+ else -> 0
40
28
}
41
29
}
42
30
if (value == 0 ) value = compareAmiiboId(amiiboId1, amiiboId2)
@@ -52,18 +40,9 @@ class AmiiboComparator(var settings: BrowserSettings) : Comparator<Amiibo> {
52
40
val name1 = amiibo1.name
53
41
val name2 = amiibo2.name
54
42
return when {
55
- null == name1 && null == name2 -> {
56
- 0
57
- }
58
-
59
- null == name1 -> {
60
- 1
61
- }
62
-
63
- null == name2 -> {
64
- - 1
65
- }
66
-
43
+ null == name1 && null == name2 -> 0
44
+ null == name1 -> 1
45
+ null == name2 -> - 1
67
46
else -> name1.compareTo(name2)
68
47
}
69
48
}
@@ -72,18 +51,9 @@ class AmiiboComparator(var settings: BrowserSettings) : Comparator<Amiibo> {
72
51
val amiiboSeries1 = amiibo1.amiiboSeries
73
52
val amiiboSeries2 = amiibo2.amiiboSeries
74
53
return when {
75
- null == amiiboSeries1 && null == amiiboSeries2 -> {
76
- 0
77
- }
78
-
79
- null == amiiboSeries1 -> {
80
- 1
81
- }
82
-
83
- null == amiiboSeries2 -> {
84
- - 1
85
- }
86
-
54
+ null == amiiboSeries1 && null == amiiboSeries2 -> 0
55
+ null == amiiboSeries1 -> 1
56
+ null == amiiboSeries2 -> - 1
87
57
else -> amiiboSeries1.compareTo(amiiboSeries2)
88
58
}
89
59
}
@@ -92,18 +62,9 @@ class AmiiboComparator(var settings: BrowserSettings) : Comparator<Amiibo> {
92
62
val amiiboType1 = amiibo1.amiiboType
93
63
val amiiboType2 = amiibo2.amiiboType
94
64
return when {
95
- null == amiiboType1 && null == amiiboType2 -> {
96
- 0
97
- }
98
-
99
- null == amiiboType1 -> {
100
- 1
101
- }
102
-
103
- null == amiiboType2 -> {
104
- - 1
105
- }
106
-
65
+ null == amiiboType1 && null == amiiboType2 -> 0
66
+ null == amiiboType1 -> 1
67
+ null == amiiboType2 -> - 1
107
68
else -> amiiboType1.compareTo(amiiboType2)
108
69
}
109
70
}
@@ -112,18 +73,9 @@ class AmiiboComparator(var settings: BrowserSettings) : Comparator<Amiibo> {
112
73
val gameSeries1 = amiibo1.gameSeries
113
74
val gameSeries2 = amiibo2.gameSeries
114
75
return when {
115
- null == gameSeries1 && null == gameSeries2 -> {
116
- 0
117
- }
118
-
119
- null == gameSeries1 -> {
120
- 1
121
- }
122
-
123
- null == gameSeries2 -> {
124
- - 1
125
- }
126
-
76
+ null == gameSeries1 && null == gameSeries2 -> 0
77
+ null == gameSeries1 -> 1
78
+ null == gameSeries2 -> - 1
127
79
else -> gameSeries1.compareTo(gameSeries2)
128
80
}
129
81
}
@@ -132,18 +84,9 @@ class AmiiboComparator(var settings: BrowserSettings) : Comparator<Amiibo> {
132
84
val character1 = amiibo1.character
133
85
val character2 = amiibo2.character
134
86
return when {
135
- null == character1 && null == character2 -> {
136
- 0
137
- }
138
-
139
- null == character1 -> {
140
- 1
141
- }
142
-
143
- null == character2 -> {
144
- - 1
145
- }
146
-
87
+ null == character1 && null == character2 -> 0
88
+ null == character1 -> 1
89
+ null == character2 -> - 1
147
90
else -> character1.compareTo(character2)
148
91
}
149
92
}
0 commit comments