Skip to content

Commit 9c12c92

Browse files
Refac
1 parent f3592e9 commit 9c12c92

File tree

1 file changed

+8
-10
lines changed
  • pacman-ui-lib/src/main/java/de/amr/pacmanfx/uilib/assets

1 file changed

+8
-10
lines changed

pacman-ui-lib/src/main/java/de/amr/pacmanfx/uilib/assets/SpriteMap.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,28 @@ public SpriteMap(Class<SID> spriteIdClass) {
3030
data = new EnumMap<>(spriteIdClass);
3131
}
3232

33-
public RectShort sprite(SID id) {
33+
private SpriteData get(SID id) {
3434
requireNonNull(id);
3535
if (!data.containsKey(id)) {
3636
throw new IllegalArgumentException("Unknown sprite ID '%s'".formatted(id));
3737
}
38-
Object value = data.get(id);
38+
SpriteData value = data.get(id);
3939
if (value == null) {
4040
throw new IllegalArgumentException("Sprite value is null for id '%s'".formatted(id));
4141
}
42+
return value;
43+
}
44+
45+
public RectShort sprite(SID id) {
46+
SpriteData value = get(id);
4247
if (value instanceof SingleSprite(RectShort rect)) {
4348
return rect;
4449
}
4550
throw new IllegalArgumentException("Sprite ID '%s' does not reference a sprite".formatted(id));
4651
}
4752

4853
public RectShort[] spriteSequence(SID id) {
49-
requireNonNull(id);
50-
if (!data.containsKey(id)) {
51-
throw new IllegalArgumentException("Unknown sprite ID '%s'".formatted(id));
52-
}
53-
Object value = data.get(id);
54-
if (value == null) {
55-
throw new IllegalArgumentException("Sprite value is null for id '%s'".formatted(id));
56-
}
54+
SpriteData value = get(id);
5755
if (value instanceof SpriteSequence(RectShort[] sequence)) {
5856
return sequence;
5957
}

0 commit comments

Comments
 (0)