Merge pull request #3787 from thelsing/fix-3247

make playerAlias getter return null if not DisplayName was set. Accou…
RPTools · Dec 23, 2022 · d1db0cc · d1db0cc
2 parents 6f75a3a + e028925
commit d1db0cc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 33 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
@@ -1578,25 +1578,13 @@ public void setTitleViaRenderer(ZoneRenderer renderer) {
     String campaignName = " - [" + MapTool.getCampaign().getName() + "]";
     String versionString =
         MapTool.getVersion().equals("unspecified") ? "Development" : "v" + MapTool.getVersion();
-    setTitle(
-        AppConstants.APP_NAME
-            + " "
-            + versionString
-            + " - "
-            + MapTool.getPlayer()
-            + campaignName
-            + (renderer != null
-                ? " - "
-                    + (((renderer.getZone().getPlayerAlias() != null)
-                            && !MapTool.getPlayer().isGM())
-                        ? renderer.getZone().getPlayerAlias()
-                        : (renderer.getZone().getPlayerAlias().equals(renderer.getZone().getName())
-                            ? renderer.getZone().getName()
-                            : renderer.getZone().getPlayerAlias()
-                                + " ("
-                                + renderer.getZone().getName()
-                                + ")"))
-                : ""));
+    var title =
+        AppConstants.APP_NAME + " " + versionString + " - " + MapTool.getPlayer() + campaignName;
+
+    if (renderer != null) {
+      title += "-" + renderer.getZone().toString();
+    }
+    setTitle(title);
   }
 
   /**

diff --git a/src/main/java/net/rptools/maptool/client/ui/ZoneSelectionPopup.java b/src/main/java/net/rptools/maptool/client/ui/ZoneSelectionPopup.java
@@ -65,8 +65,8 @@ private JMenuItem createEntries() {
       else
         rendererList.sort(
             (o1, o2) -> {
-              String name1 = o1.getZone().getPlayerAlias();
-              String name2 = o2.getZone().getPlayerAlias();
+              String name1 = o1.getZone().toString();
+              String name2 = o2.getZone().toString();
 
               return String.CASE_INSENSITIVE_ORDER.compare(name1, name2);
             });
@@ -93,12 +93,7 @@ private static class ZoneItem extends JCheckBoxMenuItem implements ActionListene
 
     ZoneItem(ZoneRenderer renderer) {
       this.renderer = renderer;
-      String name =
-          MapTool.getPlayer().isGM()
-              ? renderer.getZone().getName().equals(renderer.getZone().getPlayerAlias())
-                  ? renderer.getZone().getName()
-                  : renderer.getZone().getPlayerAlias() + " (" + renderer.getZone().getName() + ")"
-              : renderer.getZone().getPlayerAlias();
+      String name = renderer.getZone().toString();
       if ("".equals(name)) {
         name = I18N.getText("Button.map");
       }

diff --git a/src/main/java/net/rptools/maptool/model/Zone.java b/src/main/java/net/rptools/maptool/model/Zone.java
@@ -367,18 +367,13 @@ public void setFogPaint(DrawablePaint paint) {
     fogPaint = paint;
   }
 
-  @Override
-  public String toString() {
-    return name;
-  }
-
   /** @return name of the zone */
   public String getName() {
     return name;
   }
 
   public String getPlayerAlias() {
-    return playerAlias == null ? name : playerAlias;
+    return playerAlias;
   }
 
   public void setName(String name) {
@@ -397,6 +392,17 @@ public boolean setPlayerAlias(String playerAlias) {
     return true;
   }
 
+  @Override
+  public String toString() {
+    if (!MapTool.getPlayer().isGM()) {
+      return playerAlias != null ? playerAlias : name;
+    } else if (playerAlias == null || name.equals(playerAlias)) {
+      return name;
+    } else {
+      return playerAlias + " (" + name + ")";
+    }
+  }
+
   public MD5Key getMapAssetId() {
     return mapAsset;
   }