Skip to content

Commit 6f2994f

Browse files
committed
DataHandle: relocate DataInput methods
Now they match their declared order in DataInput.
1 parent b2e9316 commit 6f2994f

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/main/java/org/scijava/io/handle/DataHandle.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -441,13 +441,22 @@ default long skip(final long n) throws IOException {
441441
// -- DataInput methods --
442442

443443
@Override
444-
default boolean readBoolean() throws IOException {
445-
return readByte() != 0;
444+
default void readFully(final byte[] b) throws IOException {
445+
readFully(b, 0, b.length);
446446
}
447447

448448
@Override
449-
default void readFully(final byte[] b) throws IOException {
450-
readFully(b, 0, b.length);
449+
default int skipBytes(final int n) throws IOException {
450+
// NB: Cast here is safe since the value of n bounds the result to an int.
451+
final int skip = (int) available(n);
452+
if (skip < 0) return 0;
453+
seek(offset() + skip);
454+
return skip;
455+
}
456+
457+
@Override
458+
default boolean readBoolean() throws IOException {
459+
return readByte() != 0;
451460
}
452461

453462
@Override
@@ -556,15 +565,6 @@ default String readUTF() throws IOException {
556565
return new String(b, "UTF-8");
557566
}
558567

559-
@Override
560-
default int skipBytes(final int n) throws IOException {
561-
// NB: Cast here is safe since the value of n bounds the result to an int.
562-
final int skip = (int) available(n);
563-
if (skip < 0) return 0;
564-
seek(offset() + skip);
565-
return skip;
566-
}
567-
568568
// -- DataOutput methods --
569569

570570
@Override

0 commit comments

Comments
 (0)