Refine welcome message for clarity and update note formatting

Author: pwgit-create

src/main/java/org/pwss/controller/LoginController.java

@@ -16,7 +16,6 @@
 import org.pwss.view.screen.LoginScreen;
 import org.slf4j.LoggerFactory;
 
-
 import static org.pwss.app_settings.AppConfig.LICENSE_KEY;
 
 /**
@@ -151,12 +150,12 @@ private void proceedAndValidate() {
             int choice = screen.showOptionDialog(JOptionPane.INFORMATION_MESSAGE,
                     """
                             Welcome to Integrity Hash!
-                            
-                            You are about to create a user for this application.
-                            Please make sure to remember your credentials as they will be required for future logins.
-                            
-                            Do you want to proceed?""",
-                    new String[]{StringConstants.GENERIC_YES, StringConstants.GENERIC_NO},
+
+                            You are about to set up access to this application. Please make sure to remember your credentials as they will be required for future logins.
+
+                            Do you want to proceed?
+                            """,
+                    new String[] { StringConstants.GENERIC_YES, StringConstants.GENERIC_NO },
                     StringConstants.GENERIC_YES);
 
             if (choice == 0) {
@@ -181,7 +180,8 @@ private boolean validateInput() {
         String confirmPassword = screen.getConfirmPassword();
         String licenseKey = licenseKeySet ? LICENSE_KEY : screen.getLicenseKey();
 
-        LoginUtils.LoginValidationResult result = LoginUtils.validateInput(username, password, confirmPassword, licenseKey, createUserMode);
+        LoginUtils.LoginValidationResult result = LoginUtils.validateInput(username, password, confirmPassword,
+                licenseKey, createUserMode);
         if (!result.isValid()) {
             screen.showError(LoginUtils.formatErrors(result.errors()));
         }
@@ -253,7 +253,7 @@ private void performLogin() {
                     if (createUserMode) {
                         screen.showInfo("User created and logged in successfully!");
                     } else {
-                      log.info("Logged in successfully!");
+                        log.info("Logged in successfully!");
                     }
                     AppConfig.setLicenseKey(licenseKey);
                     NavigationEvents.navigateTo(Screen.HOME);

src/main/java/org/pwss/utils/StringConstants.java

@@ -63,7 +63,7 @@ public final class StringConstants {
 
     // Update note related strings
     public static final String MON_DIR_POPUP_UPDATE_NOTE = "Update note";
-    public static final String MON_DIR_POPUP_UPDATE_NOTE_POPUP_PREFIX = "Update note for: ";
+    public static final String MON_DIR_POPUP_UPDATE_NOTE_POPUP_PREFIX = "Update Note -";
     public static final String MON_DIR_POPUP_UPDATE_NOTE_SUCCESS = "Note updated successfully.";
     public static final String MON_DIR_POPUP_UPDATE_NOTE_ERROR = "Failed to update note.";
 

src/main/java/org/pwss/utils/StringUtils.java

@@ -0,0 +1,115 @@
+package org.pwss.utils;
+
+/**
+ * A utility class for string manipulation operations.
+ * This class contains static methods to perform various string manipulations.
+ */
+public final class StringUtils {
+
+    /**
+     * 
+     * Private constructor to prevent instantiation
+     **/
+    private StringUtils() {
+    }
+
+    /**
+     * Adds a space character at the end of the given string.
+     *
+     * @param str The input string. If it is null, null is returned.
+     * @return A new string with a space appended to the end of the input string,
+     *         or null if the input was null.
+     */
+    public static String addSpace(String str) {
+        if (str == null)
+            return null;
+        return str + " ";
+    }
+
+    /**
+     * Adds a space character at the beginning of the given string.
+     *
+     * @param str The input string. If it is null, null is returned.
+     * @return A new string with a space prepended to the beginning of the input
+     *         string,
+     *         or null if the input was null.
+     */
+    public static String prependSpace(String str) {
+        if (str == null)
+            return null;
+        return " " + str;
+    }
+
+    /**
+     * Pads the given string on the right with spaces until it reaches the specified
+     * length.
+     *
+     * @param str    The input string. If it is null, null is returned.
+     * @param length The desired length of the resulting string. If the input
+     *               string's
+     *               length is already greater than or equal to this value, the
+     *               original
+     *               string will be returned unchanged.
+     * @return A new string with spaces appended on the right until it reaches the
+     *         specified
+     *         length, or null if the input was null.
+     */
+    public static String padRight(String str, int length) {
+        if (str == null)
+            return null;
+        if (str.length() >= length)
+            return str;
+        StringBuilder sb = new StringBuilder(str);
+        while (sb.length() < length) {
+            sb.append(' ');
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Pads the given string on the left with spaces until it reaches the specified
+     * length.
+     *
+     * @param str    The input string. If it is null, null is returned.
+     * @param length The desired length of the resulting string. If the input
+     *               string's
+     *               length is already greater than or equal to this value, the
+     *               original
+     *               string will be returned unchanged.
+     * @return A new string with spaces prepended on the left until it reaches the
+     *         specified
+     *         length, or null if the input was null.
+     */
+    public static String padLeft(String str, int length) {
+        if (str == null)
+            return null;
+        if (str.length() >= length)
+            return str;
+        StringBuilder sb = new StringBuilder();
+        while (sb.length() < length - str.length()) {
+            sb.append(' ');
+        }
+        sb.append(str);
+        return sb.toString();
+    }
+
+    /**
+     * Capitalizes the first letter of the given string.
+     *
+     * @param str The input string. If it is null or empty, the original string will
+     *            be returned.
+     * @return A new string with the first letter capitalized, or the original
+     *         string if
+     *         it was null or empty.
+     */
+    public static String capitalizeFirstLetter(String str) {
+        if (isEmpty(str))
+            return str;
+        return str.substring(0, 1).toUpperCase() + str.substring(1);
+    }
+
+    // Assuming isEmpty method exists as referred in the code
+    private static boolean isEmpty(String str) {
+        return str == null || str.isEmpty();
+    }
+}

src/main/java/org/pwss/view/popup_menu/MonitoredDirectoryPopupFactory.java

@@ -19,11 +19,14 @@
 import org.pwss.model.request.notes.RestoreNoteType;
 import org.pwss.model.table.MonitoredDirectoryTableModel;
 import org.pwss.utils.StringConstants;
+import org.pwss.utils.StringUtils;
 import org.pwss.view.popup_menu.listener.MonitoredDirectoryPopupListener;
 
 /**
- * Factory class to create a context menu (popup menu) for monitored directories in a JTable.
- * The menu provides options to scan the directory, reset its baseline, and edit its details.
+ * Factory class to create a context menu (popup menu) for monitored directories
+ * in a JTable.
+ * The menu provides options to scan the directory, reset its baseline, and edit
+ * its details.
  */
 public class MonitoredDirectoryPopupFactory {
     private final MonitoredDirectoryPopupListener listener;
@@ -39,11 +42,13 @@ public JPopupMenu create(JTable table, int viewRow) {
         MonitoredDirectoryTableModel model = (MonitoredDirectoryTableModel) table.getModel();
         Optional<MonitoredDirectory> dirOpt = model.getDirectoryAt(modelRow);
 
-        if (dirOpt.isEmpty()) return menu;
+        if (dirOpt.isEmpty())
+            return menu;
         MonitoredDirectory dir = dirOpt.get();
 
         // Scan this directory
-        JMenuItem scanItem = new JMenuItem(dir.baselineEstablished() ? StringConstants.MON_DIR_POPUP_START_SCAN : StringConstants.MON_DIR_POPUP_ESTABLISH_BASELINE);
+        JMenuItem scanItem = new JMenuItem(dir.baselineEstablished() ? StringConstants.MON_DIR_POPUP_START_SCAN
+                : StringConstants.MON_DIR_POPUP_ESTABLISH_BASELINE);
         scanItem.addActionListener(e -> listener.onStartScan());
 
         // Reset baseline
@@ -87,19 +92,23 @@ public JPopupMenu create(JTable table, int viewRow) {
      * @return the JMenuItem for toggling the active status
      */
     private JMenuItem getToggleActiveMenuItem(MonitoredDirectory dir) {
-        JMenuItem editItem = new JMenuItem(dir.isActive() ? StringConstants.MON_DIR_TOGGLE_ACTIVE_DISABLE : StringConstants.MON_DIR_TOGGLE_ACTIVE_ENABLE);
+        JMenuItem editItem = new JMenuItem(dir.isActive() ? StringConstants.MON_DIR_TOGGLE_ACTIVE_DISABLE
+                : StringConstants.MON_DIR_TOGGLE_ACTIVE_ENABLE);
         editItem.addActionListener(e -> listener.onToggleActiveStatus(dir));
         return editItem;
     }
 
     /**
-     * Creates a menu item for toggling the inclusion of subdirectories in a monitored directory.
+     * Creates a menu item for toggling the inclusion of subdirectories in a
+     * monitored directory.
      *
      * @param dir the monitored directory for which to create the menu item
      * @return the JMenuItem for toggling the inclusion of subdirectories
      */
     private JMenuItem getToggleIncludeSubDirsItem(MonitoredDirectory dir) {
-        JMenuItem editItem = new JMenuItem(dir.includeSubdirectories() ? StringConstants.MON_DIR_TOGGLE_INCLUDE_SUBDIR_DISABLE : StringConstants.MON_DIR_TOGGLE_INCLUDE_SUBDIR_ENABLE);
+        JMenuItem editItem = new JMenuItem(
+                dir.includeSubdirectories() ? StringConstants.MON_DIR_TOGGLE_INCLUDE_SUBDIR_DISABLE
+                        : StringConstants.MON_DIR_TOGGLE_INCLUDE_SUBDIR_ENABLE);
         editItem.addActionListener(e -> listener.onToggleIncludeSubdirectories(dir));
         return editItem;
     }
@@ -121,8 +130,7 @@ private JMenuItem getShowNoteItem(MonitoredDirectory dir) {
                     listener.getParentComponent(),
                     note,
                     StringConstants.MON_DIR_POPUP_SHOW_NOTE,
-                    JOptionPane.INFORMATION_MESSAGE
-            );
+                    JOptionPane.INFORMATION_MESSAGE);
         });
         return showNoteItem;
     }
@@ -137,7 +145,8 @@ private JMenuItem getUpdateNoteItem(MonitoredDirectory dir) {
         JMenuItem updateNoteItem = new JMenuItem(StringConstants.MON_DIR_POPUP_UPDATE_NOTE);
         updateNoteItem.addActionListener(e -> {
             // Label for directory path
-            JLabel label = new JLabel(StringConstants.MON_DIR_POPUP_UPDATE_NOTE_POPUP_PREFIX + dir.path());
+            JLabel label = new JLabel(
+                    StringConstants.MON_DIR_POPUP_UPDATE_NOTE_POPUP_PREFIX + StringUtils.prependSpace(dir.path()));
             label.setAlignmentX(Component.LEFT_ALIGNMENT);
 
             // Text area for note input
@@ -164,8 +173,7 @@ private JMenuItem getUpdateNoteItem(MonitoredDirectory dir) {
                     panel,
                     StringConstants.MON_DIR_POPUP_UPDATE_NOTE,
                     JOptionPane.OK_CANCEL_OPTION,
-                    JOptionPane.PLAIN_MESSAGE
-            );
+                    JOptionPane.PLAIN_MESSAGE);
 
             // User cancelled
             if (result != JOptionPane.OK_OPTION)
@@ -200,8 +208,7 @@ private JMenuItem getRestoreNoteItem(MonitoredDirectory dir) {
                         listener.getParentComponent(),
                         StringConstants.MON_DIR_POPUP_RESTORE_NO_NOTE_FALLBACK + dir.path(),
                         StringConstants.MON_DIR_POPUP_RESTORE_NOTE,
-                        JOptionPane.INFORMATION_MESSAGE
-                );
+                        JOptionPane.INFORMATION_MESSAGE);
                 return;
             }
 
@@ -241,8 +248,7 @@ private JMenuItem getRestoreNoteItem(MonitoredDirectory dir) {
                     JOptionPane.PLAIN_MESSAGE,
                     null,
                     options.toArray(),
-                    options.get(0)
-            );
+                    options.get(0));
 
             // Handle result
             if (choice == JOptionPane.CLOSED_OPTION || choice == options.size() - 1) {
@@ -273,8 +279,7 @@ private JMenuItem getResetBaselineItem(MonitoredDirectory dir) {
                     listener.getParentComponent(),
                     StringConstants.MON_DIR_POPUP_RESET_BASELINE_POPUP_MESSAGE + dir.path(),
                     StringConstants.MON_DIR_POPUP_RESET_BASELINE_POPUP_TITLE,
-                    JOptionPane.WARNING_MESSAGE
-            );
+                    JOptionPane.WARNING_MESSAGE);
 
             try {
                 // User cancelled
@@ -290,4 +295,3 @@ private JMenuItem getResetBaselineItem(MonitoredDirectory dir) {
         return resetBaselineItem;
     }
 }
-