Merge pull request #4802 from kwvanderlinde/bugfix/4801-debug-informa…

…tion Do not run the InfoTextSwingWorker on the EDT thread
RPTools · May 27, 2024 · 164a0c3 · 164a0c3
2 parents a46218c + 09eb8cf
commit 164a0c3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/ui/SysInfoDialog.java b/src/main/java/net/rptools/maptool/client/ui/SysInfoDialog.java
@@ -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);

diff --git a/src/main/java/net/rptools/maptool/client/walker/AbstractZoneWalker.java b/src/main/java/net/rptools/maptool/client/walker/AbstractZoneWalker.java
@@ -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;
@@ -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;
@@ -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<>();
 

diff --git a/src/main/java/net/rptools/maptool/client/walker/ZoneWalker.java b/src/main/java/net/rptools/maptool/client/walker/ZoneWalker.java
@@ -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;
@@ -47,8 +46,6 @@ public CellPoint replaceLastWaypoint(
 
   public Path<CellPoint> getPath();
 
-  public Path<CellPoint> getPath(RenderPathWorker renderPathWorker);
-
   public CellPoint getLastPoint();
 
   /**