Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better encapsulated version of Zone.clearDrawables() #4589

Merged
merged 1 commit into from
Dec 30, 2023
Merged

Better encapsulated version of Zone.clearDrawables() #4589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/net/rptools/maptool/client/ClientMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,9 +966,8 @@ private void handle(ClearAllDrawingsMsg clearAllDrawingsMsg) {
() -> {
var zoneGUID = GUID.valueOf(clearAllDrawingsMsg.getZoneGuid());
var layer = Zone.Layer.valueOf(clearAllDrawingsMsg.getLayer());

var zone = MapTool.getCampaign().getZone(zoneGUID);
zone.clearDrawables(zone.getDrawnElements(layer));
zone.clearDrawables(layer);
MapTool.getFrame().refresh();
});
}
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/net/rptools/maptool/model/Zone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,12 +1492,15 @@ private void removeDrawable(List<DrawnElement> drawableList, GUID drawableId) {
}
}

public void clearDrawables(List<DrawnElement> drawableList) {
for (DrawnElement drawable : drawableList) {
public void clearDrawables(Layer layer) {
final var original = drawablesByLayer.get(layer);
final var copy = new ArrayList<>(original);
original.clear();
undo.clear(); // clears the *entire* undo queue, but finer grained control isn't available

for (final var drawable : copy) {
new MapToolEventBus().getMainEventBus().post(new DrawableRemoved(this, drawable));
}
drawableList.clear();
undo.clear(); // clears the *entire* undo queue, but finer grained control isn't available
}

public void addDrawable(Pen pen, Drawable drawable) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/net/rptools/maptool/server/ServerMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,7 @@ private void handle(ClearAllDrawingsMsg clearAllDrawingsMsg) {
var zoneGUID = GUID.valueOf(clearAllDrawingsMsg.getZoneGuid());
var layer = Zone.Layer.valueOf(clearAllDrawingsMsg.getLayer());
Zone zone = server.getCampaign().getZone(zoneGUID);
List<DrawnElement> list = zone.getDrawnElements(layer);
zone.clearDrawables(list); // FJE Empties the DrawableUndoManager and empties the list
zone.clearDrawables(layer);
});
}

Expand Down
Loading