Skip to content

Commit fb8dedc

Browse files
committed
Rename AbstractTokenOverlay#getAssets() to AbstractTokenOverlay#getAssetIds()
In `MultipleImageBarTokenOverlay`, replace the array-based accessor and mutator with `List`-based ones.
1 parent 4f5b0ab commit fb8dedc

8 files changed

Lines changed: 14 additions & 21 deletions

File tree

src/main/java/net/rptools/maptool/client/functions/BarImageFunction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ public Object childEvaluate(
7878
}
7979
} else if (over instanceof MultipleImageBarTokenOverlay many) {
8080
int increment = 0;
81-
int max_increments = many.getAssets().size();
81+
int max_increments = many.getAssetIds().size();
8282
if (value != null) {
8383
increment = Math.clamp(over.findIncrement(value.doubleValue()), 0, max_increments);
8484
}
85-
assetId.append(many.getAssets().get(increment).toString());
85+
assetId.append(many.getAssetIds().get(increment).toString());
8686
} else {
8787
throw new ParserException(
8888
I18N.getText("macro.function.barImage.notImage", functionName, barName));

src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenBarController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ public void valueChanged(ListSelectionEvent e) {
603603
} // endif
604604

605605
// Handle images
606-
var assetIds = bar.getAssets();
606+
var assetIds = bar.getAssetIds();
607607
if (bar instanceof TwoImageBarTokenOverlay two) {
608608
type = 0;
609609
} else if (bar instanceof SingleImageBarTokenOverlay one) {

src/main/java/net/rptools/maptool/client/ui/token/AbstractImageTokenOverlay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public MD5Key getAssetId() {
4343
}
4444

4545
@Override
46-
public List<MD5Key> getAssets() {
46+
public List<MD5Key> getAssetIds() {
4747
return List.of(assetId);
4848
}
4949
}

src/main/java/net/rptools/maptool/client/ui/token/AbstractTokenOverlay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public boolean showPlayer(Token token, Player player) {
262262
/**
263263
* @return The keys for all assets required by the overlay.
264264
*/
265-
public List<MD5Key> getAssets() {
265+
public List<MD5Key> getAssetIds() {
266266
return List.of();
267267
}
268268

src/main/java/net/rptools/maptool/client/ui/token/MultipleImageBarTokenOverlay.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,16 @@ public void paintOverlay(Graphics2D g, Token token, Rectangle bounds, double val
108108
g.setComposite(tempComposite);
109109
}
110110

111-
/**
112-
* @return Getter for bottomAssetId
113-
*/
114-
public MD5Key[] getAssetIds() {
115-
return assetIds;
111+
@Override
112+
public List<MD5Key> getAssetIds() {
113+
return List.of(assetIds);
116114
}
117115

118116
/**
119117
* @param theAssetIds Setter for bottomAssetId
120118
*/
121-
public void setAssetIds(MD5Key[] theAssetIds) {
122-
this.assetIds = theAssetIds;
123-
}
124-
125-
@Override
126-
public List<MD5Key> getAssets() {
127-
return List.of(assetIds);
119+
public void setAssetIds(List<MD5Key> theAssetIds) {
120+
this.assetIds = theAssetIds.toArray(MD5Key[]::new);
128121
}
129122

130123
public static BarTokenOverlay fromDto(BarTokenOverlayDto dto) {

src/main/java/net/rptools/maptool/client/ui/token/SingleImageBarTokenOverlay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public MD5Key getAssetId() {
141141
}
142142

143143
@Override
144-
public List<MD5Key> getAssets() {
144+
public List<MD5Key> getAssetIds() {
145145
return List.of(assetId);
146146
}
147147

src/main/java/net/rptools/maptool/client/ui/token/TwoImageBarTokenOverlay.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void setTopAssetId(MD5Key topAssetId) {
174174
}
175175

176176
@Override
177-
public List<MD5Key> getAssets() {
177+
public List<MD5Key> getAssetIds() {
178178
return List.of(this.topAssetId, this.bottomAssetId);
179179
}
180180

src/main/java/net/rptools/maptool/model/CampaignProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,12 +665,12 @@ public Set<MD5Key> getAllImageAssets() {
665665

666666
// States have images as well
667667
for (BooleanTokenOverlay overlay : getTokenStatesMap().values()) {
668-
set.addAll(overlay.getAssets());
668+
set.addAll(overlay.getAssetIds());
669669
}
670670

671671
// Bars
672672
for (BarTokenOverlay overlay : getTokenBarsMap().values()) {
673-
set.addAll(overlay.getAssets());
673+
set.addAll(overlay.getAssetIds());
674674
}
675675
return set;
676676
}

0 commit comments

Comments
 (0)