[PATCH] Fix 66484 Welcome page shows gp-display-text version, but not gp-display-gui version

[vladimir . mezentsev]

From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>

ChangeLog
2025-01-21  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>

        PR 66484
        * org/gprofng/mpmt/AboutPanel.java: Add gprofng-display-gui version.
        * org/gprofng/mpmt/util/gui/AnUtility.java (clearPath): New function
        to remove duplicate '/' characters.
---
 org/gprofng/mpmt/AboutPanel.java         | 32 ++++++++++++------------
 org/gprofng/mpmt/util/gui/AnUtility.java | 16 ++++++++++++
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/org/gprofng/mpmt/AboutPanel.java b/org/gprofng/mpmt/AboutPanel.java
index bd89bd1..69d0cac 100644
--- a/org/gprofng/mpmt/AboutPanel.java
+++ b/org/gprofng/mpmt/AboutPanel.java
@@ -36,7 +36,7 @@ public class AboutPanel extends JPanel {
   private static final String BOLD = "bold";
   private static final String ITALIC = "italic";
   private static final String strLegalNotice =
-      "Copyright (C) 2022-2024 Free Software Foundation\n\n"
+      "Copyright (C) 2022-2025 Free Software Foundation\n\n"
       + "This program is free software; you can redistribute it and/or 
modify\n"
       + "it under the terms of the GNU General Public License as published 
by\n"
       + "the Free Software Foundation, either version 3 of the License, or\n"
@@ -83,7 +83,7 @@ public class AboutPanel extends JPanel {
       gui_version = "";
     try {
       doc.insertString(doc.getLength(),
-          AnLocale.getString("Version: "), boldStyle);
+          AnLocale.getString("gprofng-display-gui version: "), boldStyle);
       doc.insertString(doc.getLength(), gui_version + "\n", regularStyle);
       doc.insertString(doc.getLength(),
           AnLocale.getString("GUI protocol version: "), boldStyle);
@@ -91,25 +91,27 @@ public class AboutPanel extends JPanel {
           IPCProtocol.version + "\n", regularStyle);
       doc.insertString(doc.getLength(),
           AnLocale.getString("Install: "), boldStyle);
-      doc.insertString(doc.getLength(), Analyzer.fdhome + "\n", regularStyle);
+      doc.insertString(doc.getLength(), AnUtility.clearPath(
+          Analyzer.fdhome) + "\n", regularStyle);
       doc.insertString(doc.getLength(),
           AnLocale.getString("Working directory: "), boldStyle);
-      doc.insertString(doc.getLength(),
-          Analyzer.getInstance().getWorkingDirectory() + "\n", regularStyle);
+      doc.insertString(doc.getLength(), AnUtility.clearPath(
+          Analyzer.getInstance().getWorkingDirectory()) + "\n", regularStyle);
       doc.insertString(doc.getLength(), AnLocale.getString("Java: "), 
boldStyle);
       doc.insertString(doc.getLength(), Analyzer.jvm_ver + "\n", regularStyle);
       doc.insertString(doc.getLength(),
           AnLocale.getString("Java home: "), boldStyle);
-      doc.insertString(doc.getLength(), Analyzer.jvm_home + "\n", 
regularStyle);
+      doc.insertString(doc.getLength(), AnUtility.clearPath(
+          Analyzer.jvm_home) + "\n", regularStyle);
       doc.insertString(doc.getLength(),
           AnLocale.getString("User directory: "), boldStyle);
+      doc.insertString(doc.getLength(), AnUtility.clearPath(
+          UserPref.getAnalyzerDirPath()) + "\n", regularStyle);
+      doc.insertString(doc.getLength(), "gprofng-display-text: ", boldStyle);
+      doc.insertString(doc.getLength(), AnUtility.clearPath(
+          Analyzer.getInstance().er_print) + "\n", regularStyle);
       doc.insertString(doc.getLength(),
-          UserPref.getInstance().getAnalyzerDirPath() + "\n", regularStyle);
-      doc.insertString(doc.getLength(), "gp-display-text: ", boldStyle);
-      doc.insertString(
-          doc.getLength(), Analyzer.getInstance().er_print + "\n", 
regularStyle);
-      doc.insertString(doc.getLength(),
-          AnLocale.getString("gp-display-text version: "), boldStyle);
+          AnLocale.getString("gprofng-display-text version: "), boldStyle);
       doc.insertString(doc.getLength(), Analyzer.fdversion + "\n", 
regularStyle);
     } catch (BadLocationException ble) {
     }
@@ -153,9 +155,7 @@ public class AboutPanel extends JPanel {
 
     innerPanel.setLayout(new java.awt.GridBagLayout());
 
-    iconLabel.setIcon(
-        new javax.swing.ImageIcon(
-            
getClass().getResource("/org/gprofng/mpmt/icons/performanceAnalyzerSplash.gif")));
+    iconLabel.setIcon(new 
javax.swing.ImageIcon(getClass().getResource("/org/gprofng/mpmt/icons/performanceAnalyzerSplash.gif")));
 // NOI18N
     gridBagConstraints = new java.awt.GridBagConstraints();
     gridBagConstraints.gridx = 0;
     gridBagConstraints.gridy = 0;
@@ -194,7 +194,7 @@ public class AboutPanel extends JPanel {
     innerPanel.add(copyrightScrollPane, gridBagConstraints);
 
     add(innerPanel, new java.awt.GridBagConstraints());
-  } // </editor-fold>//GEN-END:initComponents
+  }// </editor-fold>//GEN-END:initComponents
   // Variables declaration - do not modify//GEN-BEGIN:variables
   private javax.swing.JScrollPane copyrightScrollPane;
   private javax.swing.JTextArea copyrightTextArea;
diff --git a/org/gprofng/mpmt/util/gui/AnUtility.java 
b/org/gprofng/mpmt/util/gui/AnUtility.java
index f1670b8..e0f0242 100644
--- a/org/gprofng/mpmt/util/gui/AnUtility.java
+++ b/org/gprofng/mpmt/util/gui/AnUtility.java
@@ -1135,6 +1135,22 @@ public final class AnUtility {
     return ret;
   }
 
+  /**
+   * Remove duplicate '/' characters in path:
+   * @param path
+   * @return
+   */
+  public static String clearPath(String path) {
+    StringBuilder sb = new StringBuilder();
+    for (int i = 0; i < path.length(); i++) {
+      if (path.charAt(i) == '/' && i > 0 && path.charAt(i - 1) == '/') {
+          continue;
+      }
+      sb.append(path.charAt(i));
+    }
+    return sb.toString();
+  }
+
   public static String getShortString(String string, int maxLength) {
     int len = string.length();
     if ((len - 1) <= maxLength) {
-- 
2.43.5