Skip to content

Commit 32dbf61

Browse files
gselzergselzer
committed
Type declarations -> vars
1 parent 80bc307 commit 32dbf61

File tree

500 files changed

+5320
-5340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

500 files changed

+5320
-5340
lines changed

‎docs/ops/doc/WritingYourOwnOpPackage.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ In this example, the two `OpDependency` Ops already exist within the SciJava Ops
267267
class DoubleSumOp implements Function<double[], Double> {
268268
public Double apply(final double[] inArray) {
269269
double sum = 0;
270-
for (double v : inArray) {
270+
for (var v : inArray) {
271271
sum += v;
272272
}
273273
return i;
@@ -318,7 +318,7 @@ class DoubleSumOp implements Function<double[], Double> {
318318
// define total progress size
319319
Progress.defineTotal(inArray.length);
320320
double sum = 0;
321-
for (double v : inArray) {
321+
for (var v : inArray) {
322322
sum += v;
323323
// increment progress
324324
Progress.update();
@@ -356,11 +356,10 @@ class DoubleMeanOp implements Function<double[], Double> {
356356
public Double apply(final double[] inArray) {
357357
// There's no significant work here, but we do have 2 subtasks.
358358
Progress.defineTotal(0, 2);
359-
final Double sum = sumOp.apply(inArray);
359+
final var sum = sumOp.apply(inArray);
360360
final Double size = sizeOp.apply(inArray);
361361
return sum / size;
362-
}
363-
}
362+
364363
```
365364

366365
For best results, ensure your Op records Progress updates at a reasonable frequency. If too frequent, progress updates can detract from algorithm performance, and if too infrequent, they will be of little help to the user!

‎scijava-collections/src/main/java/org/scijava/collections/AbstractPrimitiveArray.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -126,25 +126,25 @@ public ArrayType copyArray() {
126126
/** Gets the current capacity of the backing array. */
127127
@Override
128128
public int capacity() {
129-
final ArrayType array = getArray();
129+
final var array = getArray();
130130
return array == null ? 0 : Array.getLength(array);
131131
}
132132

133133
@Override
134134
public void ensureCapacity(final int minCapacity) {
135-
final int oldCapacity = capacity();
135+
final var oldCapacity = capacity();
136136
if (minCapacity <= oldCapacity) return; // no need to grow
137137

138138
// grow the array by up to 50% (plus a small constant)
139-
final int growth = Math.min(oldCapacity / 2 + 16, maximumGrowth);
139+
final var growth = Math.min(oldCapacity / 2 + 16, maximumGrowth);
140140
final int newCapacity;
141141
if (growth > Integer.MAX_VALUE - oldCapacity) {
142142
// growth would push array over the maximum array size
143143
newCapacity = Integer.MAX_VALUE;
144144
}
145145
else newCapacity = oldCapacity + growth;
146146
// ensure the array grows by at least the requested minimum capacity
147-
final int newLength = Math.max(minCapacity, newCapacity);
147+
final var newLength = Math.max(minCapacity, newCapacity);
148148

149149
// copy the data into a new array
150150
setArray(copyArray(newLength));
@@ -158,7 +158,7 @@ public void ensureCapacity(final int minCapacity) {
158158
*/
159159
@Override
160160
public void insert(final int index, final int count) {
161-
int oldSize = size();
161+
var oldSize = size();
162162
if (index < 0 || index > oldSize) {
163163
throw new ArrayIndexOutOfBoundsException("Invalid index value");
164164
}
@@ -171,7 +171,7 @@ public void insert(final int index, final int count) {
171171
}
172172
setSize(oldSize + count);
173173
if (index < oldSize) {
174-
final ArrayType array = getArray();
174+
final var array = getArray();
175175
System.arraycopy(array, index, array, index + count, oldSize - index);
176176
}
177177
}
@@ -184,7 +184,7 @@ public void insert(final int index, final int count) {
184184
*/
185185
@Override
186186
public void delete(final int index, final int count) {
187-
int oldSize = size();
187+
var oldSize = size();
188188
if (index < 0 || index > oldSize) {
189189
throw new ArrayIndexOutOfBoundsException("Invalid index value");
190190
}
@@ -194,7 +194,7 @@ public void delete(final int index, final int count) {
194194
}
195195
setSize(oldSize - count);
196196
if (index + count < oldSize) {
197-
final ArrayType array = getArray();
197+
final var array = getArray();
198198
System.arraycopy(array, index + count, array, index, oldSize - index -
199199
count);
200200
}
@@ -212,7 +212,7 @@ public void delete(final int index, final int count) {
212212

213213
@Override
214214
public BaseType remove(final int index) {
215-
final BaseType removed = get(index);
215+
final var removed = get(index);
216216
delete(index, 1);
217217
return removed;
218218
}
@@ -251,8 +251,8 @@ protected void checkBounds(final int index) {
251251

252252
private ArrayType copyArray(final int newLength) {
253253
@SuppressWarnings("unchecked")
254-
final ArrayType copy = (ArrayType) Array.newInstance(type, newLength);
255-
final ArrayType oldArray = getArray();
254+
final var copy = (ArrayType) Array.newInstance(type, newLength);
255+
final var oldArray = getArray();
256256
if (oldArray != null) System.arraycopy(oldArray, 0, copy, 0, size());
257257
return copy;
258258
}

‎scijava-collections/src/main/java/org/scijava/collections/BoolArray.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void addValue(final boolean value) {
7676
}
7777

7878
public boolean removeValue(final boolean value) {
79-
final int index = indexOf(value);
79+
final var index = indexOf(value);
8080
if (index < 0) return false;
8181
delete(index, 1);
8282
return true;
@@ -89,7 +89,7 @@ public boolean getValue(final int index) {
8989

9090
public boolean setValue(final int index, final boolean value) {
9191
checkBounds(index);
92-
final boolean oldValue = getValue(index);
92+
final var oldValue = getValue(index);
9393
array[index] = value;
9494
return oldValue;
9595
}
@@ -100,14 +100,14 @@ public void addValue(final int index, final boolean value) {
100100
}
101101

102102
public int indexOf(final boolean value) {
103-
for (int i = 0; i < size(); i++) {
103+
for (var i = 0; i < size(); i++) {
104104
if (array[i] == value) return i;
105105
}
106106
return -1;
107107
}
108108

109109
public int lastIndexOf(final boolean value) {
110-
for (int i = size() - 1; i >= 0; i--) {
110+
for (var i = size() - 1; i >= 0; i--) {
111111
if (array[i] == value) return i;
112112
}
113113
return -1;
@@ -186,7 +186,7 @@ public boolean remove(final Object o) {
186186
// NB: Overridden for performance.
187187
@Override
188188
public boolean containsAll(final Collection<?> c) {
189-
for (final Object o : c) {
189+
for (final var o : c) {
190190
if (!(o instanceof Boolean)) return false;
191191
final boolean value = (Boolean) o;
192192
if (indexOf(value) < 0) return false;
@@ -201,7 +201,7 @@ public boolean addAll(final int index,
201201
{
202202
if (c.isEmpty()) return false;
203203
insert(index, c.size());
204-
int i = index;
204+
var i = index;
205205
for (final boolean e : c) {
206206
setValue(i++, e);
207207
}
@@ -211,11 +211,11 @@ public boolean addAll(final int index,
211211
// NB: Overridden for performance.
212212
@Override
213213
public boolean removeAll(final Collection<?> c) {
214-
boolean changed = false;
215-
for (final Object o : c) {
214+
var changed = false;
215+
for (final var o : c) {
216216
if (!(o instanceof Boolean)) continue;
217217
final boolean value = (Boolean) o;
218-
final boolean result = removeValue(value);
218+
final var result = removeValue(value);
219219
if (result) changed = true;
220220
}
221221
return changed;

‎scijava-collections/src/main/java/org/scijava/collections/ByteArray.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void addValue(final byte value) {
7575
}
7676

7777
public boolean removeValue(final byte value) {
78-
final int index = indexOf(value);
78+
final var index = indexOf(value);
7979
if (index < 0) return false;
8080
delete(index, 1);
8181
return true;
@@ -88,7 +88,7 @@ public byte getValue(final int index) {
8888

8989
public byte setValue(final int index, final byte value) {
9090
checkBounds(index);
91-
final byte oldValue = getValue(index);
91+
final var oldValue = getValue(index);
9292
array[index] = value;
9393
return oldValue;
9494
}
@@ -99,14 +99,14 @@ public void addValue(final int index, final byte value) {
9999
}
100100

101101
public int indexOf(final byte value) {
102-
for (int i = 0; i < size(); i++) {
102+
for (var i = 0; i < size(); i++) {
103103
if (array[i] == value) return i;
104104
}
105105
return -1;
106106
}
107107

108108
public int lastIndexOf(final byte value) {
109-
for (int i = size() - 1; i >= 0; i--) {
109+
for (var i = size() - 1; i >= 0; i--) {
110110
if (array[i] == value) return i;
111111
}
112112
return -1;
@@ -185,7 +185,7 @@ public boolean remove(final Object o) {
185185
// NB: Overridden for performance.
186186
@Override
187187
public boolean containsAll(final Collection<?> c) {
188-
for (final Object o : c) {
188+
for (final var o : c) {
189189
if (!(o instanceof Byte)) return false;
190190
final byte value = (Byte) o;
191191
if (indexOf(value) < 0) return false;
@@ -198,7 +198,7 @@ public boolean containsAll(final Collection<?> c) {
198198
public boolean addAll(final int index, final Collection<? extends Byte> c) {
199199
if (c.isEmpty()) return false;
200200
insert(index, c.size());
201-
int i = index;
201+
var i = index;
202202
for (final byte e : c) {
203203
setValue(i++, e);
204204
}
@@ -208,11 +208,11 @@ public boolean addAll(final int index, final Collection<? extends Byte> c) {
208208
// NB: Overridden for performance.
209209
@Override
210210
public boolean removeAll(final Collection<?> c) {
211-
boolean changed = false;
212-
for (final Object o : c) {
211+
var changed = false;
212+
for (final var o : c) {
213213
if (!(o instanceof Byte)) continue;
214214
final byte value = (Byte) o;
215-
final boolean result = removeValue(value);
215+
final var result = removeValue(value);
216216
if (result) changed = true;
217217
}
218218
return changed;

‎scijava-collections/src/main/java/org/scijava/collections/CharArray.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void addValue(final char value) {
7676
}
7777

7878
public boolean removeValue(final char value) {
79-
final int index = indexOf(value);
79+
final var index = indexOf(value);
8080
if (index < 0) return false;
8181
delete(index, 1);
8282
return true;
@@ -89,7 +89,7 @@ public char getValue(final int index) {
8989

9090
public char setValue(final int index, final char value) {
9191
checkBounds(index);
92-
final char oldValue = getValue(index);
92+
final var oldValue = getValue(index);
9393
array[index] = value;
9494
return oldValue;
9595
}
@@ -100,14 +100,14 @@ public void addValue(final int index, final char value) {
100100
}
101101

102102
public int indexOf(final char value) {
103-
for (int i = 0; i < size(); i++) {
103+
for (var i = 0; i < size(); i++) {
104104
if (array[i] == value) return i;
105105
}
106106
return -1;
107107
}
108108

109109
public int lastIndexOf(final char value) {
110-
for (int i = size() - 1; i >= 0; i--) {
110+
for (var i = size() - 1; i >= 0; i--) {
111111
if (array[i] == value) return i;
112112
}
113113
return -1;
@@ -186,7 +186,7 @@ public boolean remove(final Object o) {
186186
// NB: Overridden for performance.
187187
@Override
188188
public boolean containsAll(final Collection<?> c) {
189-
for (final Object o : c) {
189+
for (final var o : c) {
190190
if (!(o instanceof Character)) return false;
191191
final char value = (Character) o;
192192
if (indexOf(value) < 0) return false;
@@ -201,7 +201,7 @@ public boolean addAll(final int index,
201201
{
202202
if (c.isEmpty()) return false;
203203
insert(index, c.size());
204-
int i = index;
204+
var i = index;
205205
for (final char e : c) {
206206
setValue(i++, e);
207207
}
@@ -211,11 +211,11 @@ public boolean addAll(final int index,
211211
// NB: Overridden for performance.
212212
@Override
213213
public boolean removeAll(final Collection<?> c) {
214-
boolean changed = false;
215-
for (final Object o : c) {
214+
var changed = false;
215+
for (final var o : c) {
216216
if (!(o instanceof Character)) continue;
217217
final char value = (Character) o;
218-
final boolean result = removeValue(value);
218+
final var result = removeValue(value);
219219
if (result) changed = true;
220220
}
221221
return changed;

‎scijava-collections/src/main/java/org/scijava/collections/DoubleArray.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void addValue(final double value) {
7575
}
7676

7777
public boolean removeValue(final double value) {
78-
final int index = indexOf(value);
78+
final var index = indexOf(value);
7979
if (index < 0) return false;
8080
delete(index, 1);
8181
return true;
@@ -88,7 +88,7 @@ public double getValue(final int index) {
8888

8989
public double setValue(final int index, final double value) {
9090
checkBounds(index);
91-
final double oldValue = getValue(index);
91+
final var oldValue = getValue(index);
9292
array[index] = value;
9393
return oldValue;
9494
}
@@ -99,14 +99,14 @@ public void addValue(final int index, final double value) {
9999
}
100100

101101
public int indexOf(final double value) {
102-
for (int i = 0; i < size(); i++) {
102+
for (var i = 0; i < size(); i++) {
103103
if (array[i] == value) return i;
104104
}
105105
return -1;
106106
}
107107

108108
public int lastIndexOf(final double value) {
109-
for (int i = size() - 1; i >= 0; i--) {
109+
for (var i = size() - 1; i >= 0; i--) {
110110
if (array[i] == value) return i;
111111
}
112112
return -1;
@@ -185,7 +185,7 @@ public boolean remove(final Object o) {
185185
// NB: Overridden for performance.
186186
@Override
187187
public boolean containsAll(final Collection<?> c) {
188-
for (final Object o : c) {
188+
for (final var o : c) {
189189
if (!(o instanceof Double)) return false;
190190
final double value = (Double) o;
191191
if (indexOf(value) < 0) return false;
@@ -198,7 +198,7 @@ public boolean containsAll(final Collection<?> c) {
198198
public boolean addAll(final int index, final Collection<? extends Double> c) {
199199
if (c.isEmpty()) return false;
200200
insert(index, c.size());
201-
int i = index;
201+
var i = index;
202202
for (final double e : c) {
203203
setValue(i++, e);
204204
}
@@ -208,11 +208,11 @@ public boolean addAll(final int index, final Collection<? extends Double> c) {
208208
// NB: Overridden for performance.
209209
@Override
210210
public boolean removeAll(final Collection<?> c) {
211-
boolean changed = false;
212-
for (final Object o : c) {
211+
var changed = false;
212+
for (final var o : c) {
213213
if (!(o instanceof Double)) continue;
214214
final double value = (Double) o;
215-
final boolean result = removeValue(value);
215+
final var result = removeValue(value);
216216
if (result) changed = true;
217217
}
218218
return changed;

0 commit comments

Comments
 (0)