Skip to content
This repository was archived by the owner on Jan 8, 2023. It is now read-only.

Commit 523502d

Browse files
committed
finalizing vars
1 parent d5ece0d commit 523502d

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

src/main/java/io/github/spair/byond/dmi/Dmi.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import lombok.Data;
44
import lombok.NoArgsConstructor;
5-
import lombok.Setter;
6-
import lombok.AccessLevel;
75
import lombok.val;
86

97
import java.io.File;
@@ -35,10 +33,8 @@ public class Dmi implements Iterable<Map.Entry<String, DmiState>> {
3533
private int spriteWidth = DEFAULT_SPRITE_SIZE;
3634
private int spriteHeight = DEFAULT_SPRITE_SIZE;
3735

38-
@Setter(AccessLevel.NONE)
39-
private Map<String, DmiState> states = new LinkedHashMap<>();
40-
@Setter(AccessLevel.NONE)
41-
private Set<String> duplicateStatesNames = new HashSet<>();
36+
private final Map<String, DmiState> states = new LinkedHashMap<>();
37+
private final Set<String> duplicateStatesNames = new HashSet<>();
4238

4339
public Dmi(final String name, final int totalWidth, final int totalHeight,
4440
final int spriteWidth, final int spriteHeight, final Map<String, DmiState> states) {
@@ -47,7 +43,7 @@ public Dmi(final String name, final int totalWidth, final int totalHeight,
4743
this.totalHeight = totalHeight;
4844
this.spriteWidth = spriteWidth;
4945
this.spriteHeight = spriteHeight;
50-
this.states = states;
46+
this.states.putAll(states);
5147

5248
for (val state : states.entrySet()) {
5349
if (state.getValue().hasDuplicates()) {

src/main/java/io/github/spair/byond/dmi/DmiState.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import lombok.Data;
44
import lombok.NoArgsConstructor;
55
import lombok.AllArgsConstructor;
6-
import lombok.Setter;
7-
import lombok.AccessLevel;
86

97
import java.util.Map;
108
import java.util.TreeMap;
@@ -30,10 +28,8 @@ public class DmiState implements Iterable<Map.Entry<SpriteDir, List<DmiSprite>>>
3028
private boolean rewind;
3129
private double[] hotspot;
3230

33-
@Setter(AccessLevel.NONE)
34-
private Map<SpriteDir, List<DmiSprite>> sprites = new TreeMap<>(new SpriteDirComparator());
35-
@Setter(AccessLevel.NONE)
36-
private List<DmiState> duplicates = new ArrayList<>();
31+
private final Map<SpriteDir, List<DmiSprite>> sprites = new TreeMap<>(new SpriteDirComparator());
32+
private final List<DmiState> duplicates = new ArrayList<>();
3733

3834
public boolean hasDuplicates() {
3935
return !duplicates.isEmpty();

0 commit comments

Comments
 (0)