Skip to content

Commit c5e70f6

Browse files
committed
Syntax
1 parent 7981fb2 commit c5e70f6

File tree

5 files changed

+17
-36
lines changed

5 files changed

+17
-36
lines changed

src/main/java/org/libj/util/CircularArrayList.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public boolean addAll(final Collection<? extends E> c) {
279279
}
280280
else {
281281
final Iterator<? extends E> it = c.iterator();
282-
do { // [RA]
282+
do { // [I]
283283
elementData[tail] = it.next();
284284
tail = ++tail % elementData.length;
285285
++size;

src/main/java/org/libj/util/CollectionUtil.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ public static boolean equals(final Collection<?> a, final Collection<?> b) {
133133

134134
final List<?> la, lb;
135135
if (a instanceof List && isRandomAccess(la = (List<?>)a)) {
136+
int i = 0;
136137
if (b instanceof List && isRandomAccess(lb = (List<?>)b)) {
137-
int i = 0;
138138
do { // [RA]
139139
if (!Objects.equals(la.get(i), lb.get(i)))
140140
return false;
@@ -143,8 +143,7 @@ public static boolean equals(final Collection<?> a, final Collection<?> b) {
143143
}
144144
else {
145145
final Iterator<?> ib = b.iterator();
146-
int i = 0;
147-
do { // [RA]
146+
do { // [I]
148147
if (!Objects.equals(la.get(i), ib.next()))
149148
return false;
150149
}
@@ -153,8 +152,8 @@ public static boolean equals(final Collection<?> a, final Collection<?> b) {
153152
}
154153
else {
155154
final Iterator<?> ia = a.iterator();
155+
int i = 0;
156156
if (b instanceof List && isRandomAccess(lb = (List<?>)b)) {
157-
int i = 0;
158157
do { // [RA]
159158
if (!Objects.equals(ia.next(), lb.get(i)))
160159
return false;
@@ -163,7 +162,6 @@ public static boolean equals(final Collection<?> a, final Collection<?> b) {
163162
}
164163
else {
165164
final Iterator<?> ib = b.iterator();
166-
int i = 0;
167165
do { // [I]
168166
if (!Objects.equals(ia.next(), ib.next()))
169167
return false;

src/main/java/org/libj/util/Locales.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -168,19 +168,18 @@ public static Locale[] parse(final Collection<String> strings) {
168168
if (i$ == 0)
169169
return EMPTY_LOCALES;
170170

171+
int i = 0;
171172
final Locale[] locales = new Locale[i$];
172173
final List<String> list;
173174
if (strings instanceof List && CollectionUtil.isRandomAccess(list = (List<String>)strings)) {
174-
int i = 0;
175175
do // [RA]
176176
locales[i] = parse(list.get(i));
177177
while (++i < i$);
178178
}
179179
else {
180-
int i = -1;
181180
final Iterator<String> it = strings.iterator();
182181
do // [I]
183-
locales[++i] = parse(it.next());
182+
locales[i++] = parse(it.next());
184183
while (it.hasNext());
185184
}
186185

src/main/java/org/libj/util/ObservableList.java

+9-24
Original file line numberDiff line numberDiff line change
@@ -1050,50 +1050,35 @@ public boolean equals(final Object obj) {
10501050
if (i$ == 0)
10511051
return true;
10521052

1053+
int i = 0;
10531054
if (isRandomAccess()) {
10541055
if (CollectionUtil.isRandomAccess(that)) {
1055-
int i = 0;
1056-
do { // [RA]
1057-
final Object e1 = get(i);
1058-
final Object e2 = that.get(i);
1059-
if (!equals(e1, e2))
1056+
do // [RA]
1057+
if (!equals(get(i), that.get(i)))
10601058
return false;
1061-
}
10621059
while (++i < i$);
10631060
}
10641061
else {
10651062
final Iterator<?> thatIt = that.iterator();
1066-
int i = 0;
1067-
do { // [I]
1068-
final Object e1 = get(i);
1069-
final Object e2 = thatIt.next();
1070-
if (!equals(e1, e2))
1063+
do // [I]
1064+
if (!equals(get(i), thatIt.next()))
10711065
return false;
1072-
}
10731066
while (++i < i$);
10741067
}
10751068
}
10761069
else if (CollectionUtil.isRandomAccess(that)) {
10771070
final Iterator<?> thisIt = that.iterator();
1078-
int i = 0;
1079-
do { // [RA]
1080-
final Object e1 = thisIt.next();
1081-
final Object e2 = that.get(i);
1082-
if (!equals(e1, e2))
1071+
do // [RA]
1072+
if (!equals(thisIt.next(), that.get(i)))
10831073
return false;
1084-
}
10851074
while (++i < i$);
10861075
}
10871076
else {
10881077
final Iterator<?> thisIt = that.iterator();
10891078
final Iterator<?> thatIt = that.iterator();
1090-
int i = 0;
1091-
do { // [I]
1092-
final Object e1 = thisIt.next();
1093-
final Object e2 = thatIt.next();
1094-
if (!equals(e1, e2))
1079+
do // [I]
1080+
if (!equals(thisIt.next(), thatIt.next()))
10951081
return false;
1096-
}
10971082
while (++i < i$);
10981083
}
10991084

src/main/java/org/libj/util/concurrent/ExecutorServices.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -414,22 +414,21 @@ public static <T,R> List<Future<R>> invokeAll(final ExecutorService executor, fi
414414
if (size == 0)
415415
return Collections.EMPTY_LIST;
416416

417+
int i = 0;
417418
final Callable<R>[] callables = new Callable[size];
418419
final List<T> list;
419420
if (tasks instanceof List && CollectionUtil.isRandomAccess(list = (List<T>)tasks)) {
420-
int i = 0;
421421
do { // [RA]
422422
final T task = Objects.requireNonNull(list.get(i));
423423
callables[i] = () -> proxy.apply(task);
424424
}
425425
while (++i < size);
426426
}
427427
else {
428-
int i = -1;
429428
final Iterator<T> it = tasks.iterator();
430429
do { // [I]
431430
final T task = Objects.requireNonNull(it.next());
432-
callables[++i] = () -> proxy.apply(task);
431+
callables[i++] = () -> proxy.apply(task);
433432
}
434433
while (it.hasNext());
435434
}

0 commit comments

Comments
 (0)