From: James Procter <j.procter@dundee.ac.uk>
Date: Thu, 20 Jul 2023 07:33:17 +0000 (+0100)
Subject: JAL-3855 tree title for PAE matrix tree is PAE Matrix (method) for (structure) (sequence)
X-Git-Tag: Release_2_11_4_0~224
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fpatch%2FJAL-3855_fixup_pae;p=jalview.git

JAL-3855 tree title for PAE matrix tree is PAE Matrix (method) for (structure) (sequence)
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index ab705c2..49bd4e9 100644
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -4249,10 +4249,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     {
       NewickFile fin = new NewickFile(
               new FileParse(cm.getNewick(), DataSourceType.PASTE));
-      String title = cm.getAnnotLabel() + " " + cm.getTreeMethod() + " tree"
-              + aa.sequenceRef != null
+      String title = aa.label + " "
+              + cm.getTreeMethod() + " tree" + (aa.sequenceRef != null
                       ? (" for " + aa.sequenceRef.getDisplayId(false))
-                      : "";
+                      : "");
 
       showColumnWiseTree(fin, aa, title, w, h, x, y);
     } catch (Throwable xx)
@@ -4272,7 +4272,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
       {
         return null;
       }
-      TreePanel tp = new TreePanel(alignPanel, nf, aa, title);
+      TreePanel tp = new TreePanel(alignPanel, nf, aa, treeTitle);
 
       tp.setSize(w, h);
 
@@ -4281,7 +4281,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
         tp.setLocation(x, y);
       }
 
-      Desktop.addInternalFrame(tp, title, w, h);
+      Desktop.addInternalFrame(tp, treeTitle, w, h);
       return tp;
     } catch (Throwable xx)
     {