Skip to content

Do not run the InfoTextSwingWorker on the EDT thread #4802

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

Merged
cwisniew merged 2 commits into from
May 27, 2024
Merged

Do not run the InfoTextSwingWorker on the EDT thread #4802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70556be
Do not run the InfoTextSwingWorker on the EDT thread
kwvanderlinde May 26, 2024
09eb8cf
Remove unused RenderPathWorker in ZoneWalker
kwvanderlinde May 26, 2024
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
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/ui/SysInfoDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ private Container createContentPane() {
infoTextArea.setWrapStyleWord(true);
infoTextArea.setFont(new Font("Monospaced", Font.PLAIN, 13));
infoTextArea.setText(I18N.getText("action.gatherDebugInfoWait"));
EventQueue.invokeLater(new InfoTextSwingWorker());
new InfoTextSwingWorker().execute();

JScrollPane scrollPane = new JScrollPane(infoTextArea);
scrollPane.setHorizontalScrollBarPolicy(31);
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/net/rptools/maptool/client/walker/AbstractZoneWalker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.List;
import java.util.ListIterator;
import java.util.Set;
import net.rptools.maptool.client.ui.zone.RenderPathWorker;
import net.rptools.maptool.model.CellPoint;
import net.rptools.maptool.model.Path;
import net.rptools.maptool.model.Token.TerrainModifierOperation;
Expand All @@ -37,7 +36,6 @@ public abstract class AbstractZoneWalker implements ZoneWalker {
protected Area tokenPitVbl;
protected Area tokenCoverVbl;
protected Area tokenMbl;
protected RenderPathWorker renderPathWorker;

public AbstractZoneWalker(Zone zone) {
this.zone = zone;
Expand Down Expand Up @@ -118,11 +116,6 @@ public CellPoint replaceLastWaypoint(
return oldPartial.end;
}

public Path<CellPoint> getPath(RenderPathWorker renderPathWorker) {
this.renderPathWorker = renderPathWorker;
return getPath();
}

public Path<CellPoint> getPath() {
Path<CellPoint> path = new Path<>();

Expand Down
3 changes: 0 additions & 3 deletions src/main/java/net/rptools/maptool/client/walker/ZoneWalker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.awt.geom.Area;
import java.util.Map;
import java.util.Set;
import net.rptools.maptool.client.ui.zone.RenderPathWorker;
import net.rptools.maptool.model.CellPoint;
import net.rptools.maptool.model.Path;
import net.rptools.maptool.model.Token.TerrainModifierOperation;
Expand Down Expand Up @@ -47,8 +46,6 @@ public CellPoint replaceLastWaypoint(

public Path<CellPoint> getPath();

public Path<CellPoint> getPath(RenderPathWorker renderPathWorker);

public CellPoint getLastPoint();

/**
Expand Down