From 16dbcf8746e96d2e401084fc2409317bf21510ff Mon Sep 17 00:00:00 2001 From: Edi Morales Date: Mon, 4 Mar 2024 01:00:59 -0600 Subject: [PATCH] Fixes code checkstyle violations --- src/main/java/jpass/ui/EntryDetailsTable.java | 12 ++--- src/main/java/jpass/ui/EntryDialog.java | 30 ++++++------ .../java/jpass/ui/GeneratePasswordDialog.java | 30 ++++++------ src/main/java/jpass/ui/JPassFrame.java | 10 +++- src/main/java/jpass/ui/MessageDialog.java | 36 +++++++------- src/main/java/jpass/ui/SearchPanel.java | 4 +- src/main/java/jpass/ui/StatusPanel.java | 4 +- .../java/jpass/ui/action/MenuActionType.java | 48 +++++++++---------- .../java/jpass/ui/helper/EntryHelper.java | 18 +++---- src/main/java/jpass/ui/helper/FileHelper.java | 18 +++---- .../languages/languages_en_US.properties | 2 +- .../languages/languages_es_MX.properties | 2 +- 12 files changed, 111 insertions(+), 103 deletions(-) diff --git a/src/main/java/jpass/ui/EntryDetailsTable.java b/src/main/java/jpass/ui/EntryDetailsTable.java index ef9bf9b..c52f1ac 100644 --- a/src/main/java/jpass/ui/EntryDetailsTable.java +++ b/src/main/java/jpass/ui/EntryDetailsTable.java @@ -45,7 +45,7 @@ import jpass.util.DateUtils; import jpass.xml.bind.Entry; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.util.Constants.VIEW_WINDOW_CREATED; import static jpass.util.Constants.VIEW_WINDOW_MODIFIED; import static jpass.util.Constants.VIEW_WINDOW_TITLE; @@ -61,11 +61,11 @@ public class EntryDetailsTable extends JTable { = DateUtils.createFormatter(Configuration.getInstance().get("date.format", "yyyy-MM-dd")); private enum DetailType { - TITLE(localizedMessages.getString(VIEW_WINDOW_TITLE), Entry::getTitle), - URL(localizedMessages.getString(VIEW_WINDOW_URL), Entry::getUrl), - USER(localizedMessages.getString(VIEW_WINDOW_USER), Entry::getUser), - MODIFIED(localizedMessages.getString(VIEW_WINDOW_MODIFIED), entry -> DateUtils.formatIsoDateTime(entry.getLastModification(), FORMATTER)), - CREATED(localizedMessages.getString(VIEW_WINDOW_CREATED), entry -> DateUtils.formatIsoDateTime(entry.getCreationDate(), FORMATTER)); + TITLE(getLocalizedMessages().getString(VIEW_WINDOW_TITLE), Entry::getTitle), + URL(getLocalizedMessages().getString(VIEW_WINDOW_URL), Entry::getUrl), + USER(getLocalizedMessages().getString(VIEW_WINDOW_USER), Entry::getUser), + MODIFIED(getLocalizedMessages().getString(VIEW_WINDOW_MODIFIED), entry -> DateUtils.formatIsoDateTime(entry.getLastModification(), FORMATTER)), + CREATED(getLocalizedMessages().getString(VIEW_WINDOW_CREATED), entry -> DateUtils.formatIsoDateTime(entry.getCreationDate(), FORMATTER)); private final String description; private final Function valueMapper; diff --git a/src/main/java/jpass/ui/EntryDialog.java b/src/main/java/jpass/ui/EntryDialog.java index f3372ef..c20ef20 100644 --- a/src/main/java/jpass/ui/EntryDialog.java +++ b/src/main/java/jpass/ui/EntryDialog.java @@ -54,7 +54,7 @@ import jpass.util.StringUtils; import jpass.xml.bind.Entry; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.ui.helper.EntryHelper.copyEntryField; import static jpass.util.Constants.BUTTON_MESSAGE_CANCEL; import static jpass.util.Constants.BUTTON_MESSAGE_OK; @@ -129,15 +129,15 @@ public EntryDialog(JPassFrame parent, String title, Entry entry, boolean newEntr this.originalEcho = this.passwordField.getEchoChar(); this.repeatField = TextComponentFactory.newPasswordField(true); - this.showButton = new JToggleButton(localizedMessages.getString(ENTRY_DIALOG_SHOW_ENTRY), MessageDialog.getIcon("show")); + this.showButton = new JToggleButton(getLocalizedMessages().getString(ENTRY_DIALOG_SHOW_ENTRY), MessageDialog.getIcon("show")); this.showButton.setActionCommand("show_button"); this.showButton.setMnemonic(KeyEvent.VK_S); this.showButton.addActionListener(this); - this.generateButton = new JButton(localizedMessages.getString(ENTRY_DIALOG_GENERATE_ENTRY), MessageDialog.getIcon("generate")); + this.generateButton = new JButton(getLocalizedMessages().getString(ENTRY_DIALOG_GENERATE_ENTRY), MessageDialog.getIcon("generate")); this.generateButton.setActionCommand("generate_button"); this.generateButton.setMnemonic(KeyEvent.VK_G); this.generateButton.addActionListener(this); - this.copyButton = new JButton(localizedMessages.getString(ENTRY_DIALOG_COPY_ENTRY), MessageDialog.getIcon("keyring")); + this.copyButton = new JButton(getLocalizedMessages().getString(ENTRY_DIALOG_COPY_ENTRY), MessageDialog.getIcon("keyring")); this.copyButton.setActionCommand("copy_button"); this.copyButton.setMnemonic(KeyEvent.VK_P); this.copyButton.addActionListener(this); @@ -152,15 +152,15 @@ public EntryDialog(JPassFrame parent, String title, Entry entry, boolean newEntr 5, 0); // xPad, yPad this.fieldPanel = new JPanel(new SpringLayout()); - this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_TITLE)))); + this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_TITLE)))); this.fieldPanel.add(this.titleField); - this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_URL)))); + this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_URL)))); this.fieldPanel.add(this.urlField); - this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_USER_NAME)))); + this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_USER_NAME)))); this.fieldPanel.add(this.userField); - this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_PASSWORD)))); + this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_PASSWORD)))); this.fieldPanel.add(this.passwordField); - this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_REPEAT)))); + this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_REPEAT)))); this.fieldPanel.add(this.repeatField); this.fieldPanel.add(new JLabel("")); this.fieldPanel.add(this.passwordButtonPanel); @@ -176,15 +176,15 @@ public EntryDialog(JPassFrame parent, String title, Entry entry, boolean newEntr this.notesPanel = new JPanel(new BorderLayout(5, 5)); this.notesPanel.setBorder(new EmptyBorder(0, 5, 0, 5)); - this.notesPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_NOTES))), BorderLayout.NORTH); + this.notesPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_NOTES))), BorderLayout.NORTH); this.notesPanel.add(new JScrollPane(this.notesField), BorderLayout.CENTER); - this.okButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_OK), MessageDialog.getIcon("accept")); + this.okButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_OK), MessageDialog.getIcon("accept")); this.okButton.setActionCommand("ok_button"); this.okButton.setMnemonic(KeyEvent.VK_O); this.okButton.addActionListener(this); - this.cancelButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_CANCEL), MessageDialog.getIcon("cancel")); + this.cancelButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_CANCEL), MessageDialog.getIcon("cancel")); this.cancelButton.setActionCommand("cancel_button"); this.cancelButton.setMnemonic(KeyEvent.VK_C); this.cancelButton.addActionListener(this); @@ -212,13 +212,13 @@ public void actionPerformed(ActionEvent e) { this.repeatField.setEchoChar(this.showButton.isSelected() ? NULL_ECHO : this.originalEcho); } else if ("ok_button".equals(command)) { if (this.titleField.getText().trim().isEmpty()) { - MessageDialog.showWarningMessage(this, localizedMessages.getString(ENTRY_DIALOG_FILL_TITLE_FIELD)); + MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(ENTRY_DIALOG_FILL_TITLE_FIELD)); return; } else if (!checkEntryTitle()) { - MessageDialog.showWarningMessage(this, localizedMessages.getString(ENTRY_DIALOG_TITLE_ALREADY_EXISTS)); + MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(ENTRY_DIALOG_TITLE_ALREADY_EXISTS)); return; } else if (!Arrays.equals(this.passwordField.getPassword(), this.repeatField.getPassword())) { - MessageDialog.showWarningMessage(this, localizedMessages.getString(PASSWORD_PASSWORDS_NOT_IDENTICAL)); + MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(PASSWORD_PASSWORDS_NOT_IDENTICAL)); return; } this.modifiedEntry = getEntryFromDialog(); diff --git a/src/main/java/jpass/ui/GeneratePasswordDialog.java b/src/main/java/jpass/ui/GeneratePasswordDialog.java index 129eb97..1ee6d16 100644 --- a/src/main/java/jpass/ui/GeneratePasswordDialog.java +++ b/src/main/java/jpass/ui/GeneratePasswordDialog.java @@ -54,7 +54,7 @@ import jpass.util.CryptUtils; import jpass.util.SpringUtilities; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.util.Constants.BUTTON_MESSAGE_ACCEPT; import static jpass.util.Constants.BUTTON_MESSAGE_CANCEL; import static jpass.util.Constants.BUTTON_MESSAGE_CLOSE; @@ -87,9 +87,9 @@ public final class GeneratePasswordDialog extends JDialog implements ActionListe * Options for password generation. */ private static final String[][] PASSWORD_OPTIONS = { - {localizedMessages.getString(VIEW_WINDOW_UPPER_CASE_LETTERS), "ABCDEFGHIJKLMNOPQRSTUVWXYZ"}, - {localizedMessages.getString(VIEW_WINDOW_LOWER_CASE_LETTERS), "abcdefghijklmnopqrstuvwxyz"}, - {localizedMessages.getString(VIEW_WINDOW_NUMBERS), "0123456789"} + {getLocalizedMessages().getString(VIEW_WINDOW_UPPER_CASE_LETTERS), "ABCDEFGHIJKLMNOPQRSTUVWXYZ"}, + {getLocalizedMessages().getString(VIEW_WINDOW_LOWER_CASE_LETTERS), "abcdefghijklmnopqrstuvwxyz"}, + {getLocalizedMessages().getString(VIEW_WINDOW_NUMBERS), "0123456789"} }; private JCheckBox[] checkBoxes; @@ -144,12 +144,12 @@ public GeneratePasswordDialog(JDialog parent) { */ private void initDialog(final Component parent, final boolean showAcceptButton) { setModal(true); - setTitle(localizedMessages.getString(PASSWORD_GENERATE_PASSWORD)); + setTitle(getLocalizedMessages().getString(PASSWORD_GENERATE_PASSWORD)); setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); this.generatedPassword = null; this.lengthPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0)); - this.lengthLabel = new JLabel(String.format("%s:", localizedMessages.getString(PASSWORD_PASSWORD_LENGTH))); + this.lengthLabel = new JLabel(String.format("%s:", getLocalizedMessages().getString(PASSWORD_PASSWORD_LENGTH))); this.lengthPanel.add(this.lengthLabel); int passwordGenerationLength = Configuration.getInstance().getInteger("default.password.generation.length", 14); @@ -164,14 +164,14 @@ private void initDialog(final Component parent, final boolean showAcceptButton) this.lengthPanel.add(this.lengthSpinner); this.charactersPanel = new JPanel(); - this.charactersPanel.setBorder(new TitledBorder(localizedMessages.getString(VIEW_WINDOW_SETTINGS))); + this.charactersPanel.setBorder(new TitledBorder(getLocalizedMessages().getString(VIEW_WINDOW_SETTINGS))); this.charactersPanel.add(this.lengthPanel); this.checkBoxes = new JCheckBox[PASSWORD_OPTIONS.length]; for (int i = 0; i < PASSWORD_OPTIONS.length; i++) { this.checkBoxes[i] = new JCheckBox(PASSWORD_OPTIONS[i][0], true); this.charactersPanel.add(this.checkBoxes[i]); } - this.customSymbolsCheck = new JCheckBox(localizedMessages.getString(VIEW_WINDOW_CUSTOM_SYMBOLS)); + this.customSymbolsCheck = new JCheckBox(getLocalizedMessages().getString(VIEW_WINDOW_CUSTOM_SYMBOLS)); this.customSymbolsCheck.setActionCommand("custom_symbols_check"); this.customSymbolsCheck.addActionListener(this); this.charactersPanel.add(this.customSymbolsCheck); @@ -183,11 +183,11 @@ private void initDialog(final Component parent, final boolean showAcceptButton) SpringUtilities.makeCompactGrid(this.charactersPanel, 6, 1, 5, 5, 5, 5); this.passwordPanel = new JPanel(new BorderLayout()); - this.passwordPanel.setBorder(new TitledBorder(localizedMessages.getString(PASSWORD_GENERATED_PASSWORD))); + this.passwordPanel.setBorder(new TitledBorder(getLocalizedMessages().getString(PASSWORD_GENERATED_PASSWORD))); this.passwordField = TextComponentFactory.newTextField(); this.passwordPanel.add(this.passwordField, BorderLayout.NORTH); - this.generateButton = new JButton(localizedMessages.getString(ENTRY_DIALOG_GENERATE_ENTRY), MessageDialog.getIcon("generate")); + this.generateButton = new JButton(getLocalizedMessages().getString(ENTRY_DIALOG_GENERATE_ENTRY), MessageDialog.getIcon("generate")); this.generateButton.setActionCommand("generate_button"); this.generateButton.addActionListener(this); this.generateButton.setMnemonic(KeyEvent.VK_G); @@ -198,15 +198,15 @@ private void initDialog(final Component parent, final boolean showAcceptButton) this.buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); if (showAcceptButton) { - this.acceptButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_ACCEPT), MessageDialog.getIcon("accept")); + this.acceptButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_ACCEPT), MessageDialog.getIcon("accept")); this.acceptButton.setActionCommand("accept_button"); this.acceptButton.setMnemonic(KeyEvent.VK_A); this.acceptButton.addActionListener(this); this.buttonPanel.add(this.acceptButton); - this.cancelButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_CANCEL), MessageDialog.getIcon("cancel")); + this.cancelButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_CANCEL), MessageDialog.getIcon("cancel")); } else { - this.cancelButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_CLOSE), MessageDialog.getIcon("close")); + this.cancelButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_CLOSE), MessageDialog.getIcon("close")); } this.cancelButton.setActionCommand("cancel_button"); @@ -247,7 +247,7 @@ public void actionPerformed(ActionEvent e) { } if (characterSet.isEmpty()) { - MessageDialog.showWarningMessage(this, localizedMessages.getString(PASSWORD_CAN_NOT_GENERATE_PASSWORD)); + MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(PASSWORD_CAN_NOT_GENERATE_PASSWORD)); return; } @@ -260,7 +260,7 @@ public void actionPerformed(ActionEvent e) { } else if ("accept_button".equals(command)) { this.generatedPassword = this.passwordField.getText(); if (this.generatedPassword.isEmpty()) { - MessageDialog.showWarningMessage(this, localizedMessages.getString(PASSWORD_GENERATE_PASSWORD_REQUEST)); + MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(PASSWORD_GENERATE_PASSWORD_REQUEST)); return; } dispose(); diff --git a/src/main/java/jpass/ui/JPassFrame.java b/src/main/java/jpass/ui/JPassFrame.java index e9732f1..fcd61da 100644 --- a/src/main/java/jpass/ui/JPassFrame.java +++ b/src/main/java/jpass/ui/JPassFrame.java @@ -81,7 +81,7 @@ */ public final class JPassFrame extends JFrame { - public static ResourceBundle localizedMessages = null; + private static ResourceBundle localizedMessages = null; private static final Logger LOG = Logger.getLogger(JPassFrame.class.getName()); private static JPassFrame instance; @@ -371,4 +371,12 @@ public boolean isProcessing() { public SearchPanel getSearchPanel() { return searchPanel; } + + /** + * Gets the resource bundle for localization + * @return resource bundle + */ + public static ResourceBundle getLocalizedMessages() { + return localizedMessages; + } } diff --git a/src/main/java/jpass/ui/MessageDialog.java b/src/main/java/jpass/ui/MessageDialog.java index 0c9394d..eb24902 100644 --- a/src/main/java/jpass/ui/MessageDialog.java +++ b/src/main/java/jpass/ui/MessageDialog.java @@ -61,7 +61,7 @@ import jpass.util.SpringUtilities; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.util.Constants.BUTTON_MESSAGE_CANCEL; import static jpass.util.Constants.BUTTON_MESSAGE_NO; import static jpass.util.Constants.BUTTON_MESSAGE_OK; @@ -118,23 +118,23 @@ private void initializeDialog(final Component parent, final Object message, fina JButton defaultButton; switch (optionType) { case YES_NO_OPTION: - defaultButton = createButton(localizedMessages.getString(BUTTON_MESSAGE_YES), YES_OPTION, getIcon("accept")); + defaultButton = createButton(getLocalizedMessages().getString(BUTTON_MESSAGE_YES), YES_OPTION, getIcon("accept")); buttonPanel.add(defaultButton); - buttonPanel.add(createButton(localizedMessages.getString(BUTTON_MESSAGE_NO), NO_OPTION, getIcon("close"))); + buttonPanel.add(createButton(getLocalizedMessages().getString(BUTTON_MESSAGE_NO), NO_OPTION, getIcon("close"))); break; case YES_NO_CANCEL_OPTION: - defaultButton = createButton(localizedMessages.getString(BUTTON_MESSAGE_YES), YES_OPTION, getIcon("accept")); + defaultButton = createButton(getLocalizedMessages().getString(BUTTON_MESSAGE_YES), YES_OPTION, getIcon("accept")); buttonPanel.add(defaultButton); - buttonPanel.add(createButton(localizedMessages.getString(BUTTON_MESSAGE_NO), NO_OPTION, getIcon("close"))); - buttonPanel.add(createButton(localizedMessages.getString(BUTTON_MESSAGE_CANCEL), CANCEL_OPTION, getIcon("cancel"))); + buttonPanel.add(createButton(getLocalizedMessages().getString(BUTTON_MESSAGE_NO), NO_OPTION, getIcon("close"))); + buttonPanel.add(createButton(getLocalizedMessages().getString(BUTTON_MESSAGE_CANCEL), CANCEL_OPTION, getIcon("cancel"))); break; case OK_CANCEL_OPTION: - defaultButton = createButton(localizedMessages.getString(BUTTON_MESSAGE_OK), OK_OPTION, getIcon("accept")); + defaultButton = createButton(getLocalizedMessages().getString(BUTTON_MESSAGE_OK), OK_OPTION, getIcon("accept")); buttonPanel.add(defaultButton); - buttonPanel.add(createButton(localizedMessages.getString(BUTTON_MESSAGE_CANCEL), CANCEL_OPTION, getIcon("cancel"))); + buttonPanel.add(createButton(getLocalizedMessages().getString(BUTTON_MESSAGE_CANCEL), CANCEL_OPTION, getIcon("cancel"))); break; default: - defaultButton = createButton(localizedMessages.getString(BUTTON_MESSAGE_OK), OK_OPTION, getIcon("accept")); + defaultButton = createButton(getLocalizedMessages().getString(BUTTON_MESSAGE_OK), OK_OPTION, getIcon("accept")); buttonPanel.add(defaultButton); break; } @@ -217,7 +217,7 @@ private static int showMessageDialog(final Component parent, final Object messag * @param message dialog message */ public static void showWarningMessage(final Component parent, final String message) { - showMessageDialog(parent, message, localizedMessages.getString(SHOW_MESSAGE_WARNING), getIcon("dialog_warning")); + showMessageDialog(parent, message, getLocalizedMessages().getString(SHOW_MESSAGE_WARNING), getIcon("dialog_warning")); } /** @@ -227,7 +227,7 @@ public static void showWarningMessage(final Component parent, final String messa * @param message dialog message */ public static void showErrorMessage(final Component parent, final String message) { - showMessageDialog(parent, message, localizedMessages.getString(SHOW_MESSAGE_ERROR), getIcon("dialog_error")); + showMessageDialog(parent, message, getLocalizedMessages().getString(SHOW_MESSAGE_ERROR), getIcon("dialog_error")); } /** @@ -237,7 +237,7 @@ public static void showErrorMessage(final Component parent, final String message * @param message dialog message */ public static void showInformationMessage(final Component parent, final String message) { - showMessageDialog(parent, message, localizedMessages.getString(SHOW_MESSAGE_INFORMATION), getIcon("dialog_info")); + showMessageDialog(parent, message, getLocalizedMessages().getString(SHOW_MESSAGE_INFORMATION), getIcon("dialog_info")); } /** @@ -249,7 +249,7 @@ public static void showInformationMessage(final Component parent, final String m * @return selected option */ public static int showQuestionMessage(final Component parent, final String message, final int optionType) { - return showMessageDialog(parent, message, localizedMessages.getString(SHOW_MESSAGE_CONFIRMATION), getIcon("dialog_question"), optionType); + return showMessageDialog(parent, message, getLocalizedMessages().getString(SHOW_MESSAGE_CONFIRMATION), getIcon("dialog_question"), optionType); } /** @@ -261,13 +261,13 @@ public static int showQuestionMessage(final Component parent, final String messa */ public static char[] showPasswordDialog(final Component parent, final boolean confirm) { JPanel panel = new JPanel(); - panel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_PASSWORD)))); + panel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_PASSWORD)))); final JPasswordField password = TextComponentFactory.newPasswordField(); panel.add(password); JPasswordField repeat = null; if (confirm) { repeat = TextComponentFactory.newPasswordField(); - panel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_REPEAT)))); + panel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_REPEAT)))); panel.add(repeat); } panel.setLayout(new SpringLayout()); @@ -275,12 +275,12 @@ public static char[] showPasswordDialog(final Component parent, final boolean co boolean incorrect = true; while (incorrect) { - int option = showMessageDialog(parent, panel, localizedMessages.getString(PASSWORD_ENTER_PASSWORD_REQUEST), getIcon("dialog_lock"), OK_CANCEL_OPTION); + int option = showMessageDialog(parent, panel, getLocalizedMessages().getString(PASSWORD_ENTER_PASSWORD_REQUEST), getIcon("dialog_lock"), OK_CANCEL_OPTION); if (option == OK_OPTION) { if (password.getPassword().length == 0) { - showWarningMessage(parent, localizedMessages.getString(PASSWORD_ENTER_PASSWORD_REQUEST)); + showWarningMessage(parent, getLocalizedMessages().getString(PASSWORD_ENTER_PASSWORD_REQUEST)); } else if (confirm && !Arrays.equals(password.getPassword(), repeat.getPassword())) { - showWarningMessage(parent, localizedMessages.getString(PASSWORD_PASSWORDS_NOT_IDENTICAL)); + showWarningMessage(parent, getLocalizedMessages().getString(PASSWORD_PASSWORDS_NOT_IDENTICAL)); } else { incorrect = false; } diff --git a/src/main/java/jpass/ui/SearchPanel.java b/src/main/java/jpass/ui/SearchPanel.java index 1f6a82d..ddd2e97 100644 --- a/src/main/java/jpass/ui/SearchPanel.java +++ b/src/main/java/jpass/ui/SearchPanel.java @@ -46,7 +46,7 @@ import static javax.swing.KeyStroke.getKeyStroke; import static java.awt.event.KeyEvent.VK_ESCAPE; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.util.Constants.PANEL_FIND; /** @@ -73,7 +73,7 @@ public SearchPanel(Consumer searchCallback) { super(new BorderLayout()); setBorder(new EmptyBorder(2, 2, 2, 2)); - this.label = new JLabel(String.format("%s: ", localizedMessages.getString(PANEL_FIND)), MessageDialog.getIcon("find"), SwingConstants.LEADING); + this.label = new JLabel(String.format("%s: ", getLocalizedMessages().getString(PANEL_FIND)), MessageDialog.getIcon("find"), SwingConstants.LEADING); this.criteriaField = TextComponentFactory.newTextField(); diff --git a/src/main/java/jpass/ui/StatusPanel.java b/src/main/java/jpass/ui/StatusPanel.java index fa37290..ebc88a5 100644 --- a/src/main/java/jpass/ui/StatusPanel.java +++ b/src/main/java/jpass/ui/StatusPanel.java @@ -35,7 +35,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.util.Constants.PANEL_PROCESSING; /** @@ -70,6 +70,6 @@ public String getText() { public void setProcessing(boolean processing) { this.progressBar.setVisible(processing); this.progressBar.setIndeterminate(processing); - setText(processing ? localizedMessages.getString(PANEL_PROCESSING) : " "); + setText(processing ? getLocalizedMessages().getString(PANEL_PROCESSING) : " "); } } diff --git a/src/main/java/jpass/ui/action/MenuActionType.java b/src/main/java/jpass/ui/action/MenuActionType.java index bf2fb7e..3792dda 100644 --- a/src/main/java/jpass/ui/action/MenuActionType.java +++ b/src/main/java/jpass/ui/action/MenuActionType.java @@ -46,7 +46,7 @@ import static javax.swing.KeyStroke.getKeyStroke; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.ui.helper.FileHelper.exportFile; import static jpass.ui.helper.FileHelper.importFile; import static jpass.ui.helper.FileHelper.openFile; @@ -85,71 +85,71 @@ * */ public enum MenuActionType { - NEW_FILE(new AbstractMenuAction(localizedMessages.getString(FILE_MENU_NEW), getIcon("new"), getKeyStroke(KeyEvent.VK_N, CTRL_DOWN_MASK)) { + NEW_FILE(new AbstractMenuAction(getLocalizedMessages().getString(FILE_MENU_NEW), getIcon("new"), getKeyStroke(KeyEvent.VK_N, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { createNew(JPassFrame.getInstance()); } }), - OPEN_FILE(new AbstractMenuAction(localizedMessages.getString(Constants.FILE_MENU_OPEN_FILE), getIcon("open"), getKeyStroke(KeyEvent.VK_O, CTRL_DOWN_MASK)) { + OPEN_FILE(new AbstractMenuAction(getLocalizedMessages().getString(Constants.FILE_MENU_OPEN_FILE), getIcon("open"), getKeyStroke(KeyEvent.VK_O, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { openFile(JPassFrame.getInstance()); } }), - SAVE_FILE(new AbstractMenuAction(localizedMessages.getString(FILE_MENU_SAVE), getIcon("save"), getKeyStroke(KeyEvent.VK_S, CTRL_DOWN_MASK)) { + SAVE_FILE(new AbstractMenuAction(getLocalizedMessages().getString(FILE_MENU_SAVE), getIcon("save"), getKeyStroke(KeyEvent.VK_S, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { saveFile(JPassFrame.getInstance(), false); } }), - SAVE_AS_FILE(new AbstractMenuAction(localizedMessages.getString(FILE_MENU_SAVE_AS), getIcon("save_as"), null) { + SAVE_AS_FILE(new AbstractMenuAction(getLocalizedMessages().getString(FILE_MENU_SAVE_AS), getIcon("save_as"), null) { @Override public void actionPerformed(ActionEvent ev) { saveFile(JPassFrame.getInstance(), true); } }), - EXPORT_XML(new AbstractMenuAction(localizedMessages.getString(FILE_MENU_EXPORT_TO_XML), getIcon("export"), null) { + EXPORT_XML(new AbstractMenuAction(getLocalizedMessages().getString(FILE_MENU_EXPORT_TO_XML), getIcon("export"), null) { @Override public void actionPerformed(ActionEvent ev) { exportFile(JPassFrame.getInstance()); } }), - IMPORT_XML(new AbstractMenuAction(localizedMessages.getString(FILE_MENU_IMPORT_FROM_XML), getIcon("import"), null) { + IMPORT_XML(new AbstractMenuAction(getLocalizedMessages().getString(FILE_MENU_IMPORT_FROM_XML), getIcon("import"), null) { @Override public void actionPerformed(ActionEvent ev) { importFile(JPassFrame.getInstance()); } }), - CHANGE_PASSWORD(new AbstractMenuAction(localizedMessages.getString(FILE_MENU_CHANGE_PASSWORD), getIcon("lock"), null) { + CHANGE_PASSWORD(new AbstractMenuAction(getLocalizedMessages().getString(FILE_MENU_CHANGE_PASSWORD), getIcon("lock"), null) { @Override public void actionPerformed(ActionEvent ev) { JPassFrame parent = JPassFrame.getInstance(); char[] password = MessageDialog.showPasswordDialog(parent, true); if (password == null) { - MessageDialog.showInformationMessage(parent, localizedMessages.getString(PASSWORD_PASSWORD_NOT_MODIFIED)); + MessageDialog.showInformationMessage(parent, getLocalizedMessages().getString(PASSWORD_PASSWORD_NOT_MODIFIED)); } else { parent.getModel().setPassword(password); parent.getModel().setModified(true); parent.refreshFrameTitle(); MessageDialog.showInformationMessage(parent, - localizedMessages.getString(PASSWORD_SUCCESSFULLY_MODIFIED)); + getLocalizedMessages().getString(PASSWORD_SUCCESSFULLY_MODIFIED)); } } }), - GENERATE_PASSWORD(new AbstractMenuAction(localizedMessages.getString(TOOLS_MENU_GENERATE_PASSWORD), getIcon("generate"), getKeyStroke(KeyEvent.VK_Z, CTRL_DOWN_MASK)) { + GENERATE_PASSWORD(new AbstractMenuAction(getLocalizedMessages().getString(TOOLS_MENU_GENERATE_PASSWORD), getIcon("generate"), getKeyStroke(KeyEvent.VK_Z, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { new GeneratePasswordDialog(JPassFrame.getInstance()); } }), - EXIT(new AbstractMenuAction(localizedMessages.getString(FILE_MENU_EXIT), getIcon("exit"), getKeyStroke(KeyEvent.VK_F4, ALT_DOWN_MASK)) { + EXIT(new AbstractMenuAction(getLocalizedMessages().getString(FILE_MENU_EXIT), getIcon("exit"), getKeyStroke(KeyEvent.VK_F4, ALT_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { JPassFrame.getInstance().exitFrame(); } }), - ABOUT(new AbstractMenuAction(localizedMessages.getString(HELP_MENU_ABOUT_JPASS), getIcon("info"), getKeyStroke(KeyEvent.VK_F1, 0)) { + ABOUT(new AbstractMenuAction(getLocalizedMessages().getString(HELP_MENU_ABOUT_JPASS), getIcon("info"), getKeyStroke(KeyEvent.VK_F1, 0)) { @Override public void actionPerformed(ActionEvent ev) { StringBuilder sb = new StringBuilder(); @@ -162,37 +162,37 @@ public void actionPerformed(ActionEvent ev) { MessageDialog.showInformationMessage(JPassFrame.getInstance(), sb.toString()); } }), - LICENSE(new AbstractMenuAction(localizedMessages.getString(HELP_MENU_LICENSE), getIcon("license"), null) { + LICENSE(new AbstractMenuAction(getLocalizedMessages().getString(HELP_MENU_LICENSE), getIcon("license"), null) { @Override public void actionPerformed(ActionEvent ev) { - MessageDialog.showTextFile(JPassFrame.getInstance(), localizedMessages.getString(HELP_MENU_LICENSE), "license.txt"); + MessageDialog.showTextFile(JPassFrame.getInstance(), getLocalizedMessages().getString(HELP_MENU_LICENSE), "license.txt"); } }), - ADD_ENTRY(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_ADD_ENTRY), getIcon("entry_new"), getKeyStroke(KeyEvent.VK_Y, CTRL_DOWN_MASK)) { + ADD_ENTRY(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_ADD_ENTRY), getIcon("entry_new"), getKeyStroke(KeyEvent.VK_Y, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { EntryHelper.addEntry(JPassFrame.getInstance()); } }), - EDIT_ENTRY(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_EDIT_ENTRY), getIcon("entry_edit"), getKeyStroke(KeyEvent.VK_E, CTRL_DOWN_MASK)) { + EDIT_ENTRY(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_EDIT_ENTRY), getIcon("entry_edit"), getKeyStroke(KeyEvent.VK_E, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { EntryHelper.editEntry(JPassFrame.getInstance()); } }), - DUPLICATE_ENTRY(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_DUPLICATE_ENTRY), getIcon("entry_duplicate"), getKeyStroke(KeyEvent.VK_K, CTRL_DOWN_MASK)) { + DUPLICATE_ENTRY(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_DUPLICATE_ENTRY), getIcon("entry_duplicate"), getKeyStroke(KeyEvent.VK_K, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { EntryHelper.duplicateEntry(JPassFrame.getInstance()); } }), - DELETE_ENTRY(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_DELETE_ENTRY), getIcon("entry_delete"), getKeyStroke(KeyEvent.VK_D, CTRL_DOWN_MASK)) { + DELETE_ENTRY(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_DELETE_ENTRY), getIcon("entry_delete"), getKeyStroke(KeyEvent.VK_D, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { EntryHelper.deleteEntry(JPassFrame.getInstance()); } }), - COPY_URL(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_COPY_URL), getIcon("url"), getKeyStroke(KeyEvent.VK_U, CTRL_DOWN_MASK)) { + COPY_URL(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_COPY_URL), getIcon("url"), getKeyStroke(KeyEvent.VK_U, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { JPassFrame parent = JPassFrame.getInstance(); @@ -202,7 +202,7 @@ public void actionPerformed(ActionEvent ev) { } } }), - COPY_USER(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_COPY_USERNAME), getIcon("user"), getKeyStroke(KeyEvent.VK_B, CTRL_DOWN_MASK)) { + COPY_USER(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_COPY_USERNAME), getIcon("user"), getKeyStroke(KeyEvent.VK_B, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { JPassFrame parent = JPassFrame.getInstance(); @@ -212,7 +212,7 @@ public void actionPerformed(ActionEvent ev) { } } }), - COPY_PASSWORD(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_COPY_PASSWORD), getIcon("keyring"), getKeyStroke(KeyEvent.VK_C, CTRL_DOWN_MASK)) { + COPY_PASSWORD(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_COPY_PASSWORD), getIcon("keyring"), getKeyStroke(KeyEvent.VK_C, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { JPassFrame parent = JPassFrame.getInstance(); @@ -222,13 +222,13 @@ public void actionPerformed(ActionEvent ev) { } } }), - CLEAR_CLIPBOARD(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_CLEAR_CLIPBOARD), getIcon("clear"), getKeyStroke(KeyEvent.VK_X, CTRL_DOWN_MASK)) { + CLEAR_CLIPBOARD(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_CLEAR_CLIPBOARD), getIcon("clear"), getKeyStroke(KeyEvent.VK_X, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { EntryHelper.copyEntryField(JPassFrame.getInstance(), null); } }), - FIND_ENTRY(new AbstractMenuAction(localizedMessages.getString(EDIT_MENU_FIND_ENTRY), getIcon("find"), getKeyStroke(KeyEvent.VK_F, CTRL_DOWN_MASK)) { + FIND_ENTRY(new AbstractMenuAction(getLocalizedMessages().getString(EDIT_MENU_FIND_ENTRY), getIcon("find"), getKeyStroke(KeyEvent.VK_F, CTRL_DOWN_MASK)) { @Override public void actionPerformed(ActionEvent ev) { JPassFrame.getInstance().getSearchPanel().setVisible(true); diff --git a/src/main/java/jpass/ui/helper/EntryHelper.java b/src/main/java/jpass/ui/helper/EntryHelper.java index 124a12a..dd2b9cc 100644 --- a/src/main/java/jpass/ui/helper/EntryHelper.java +++ b/src/main/java/jpass/ui/helper/EntryHelper.java @@ -33,7 +33,7 @@ import jpass.util.ClipboardUtils; import jpass.xml.bind.Entry; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.ui.MessageDialog.showErrorMessage; import static jpass.ui.MessageDialog.showWarningMessage; import static jpass.ui.MessageDialog.showQuestionMessage; @@ -64,10 +64,10 @@ private EntryHelper() { */ public static void deleteEntry(JPassFrame parent) { if (parent.getEntryTitleTable().getSelectedRow() == -1) { - showWarningMessage(parent, localizedMessages.getString(ENTRY_DIALOG_PLEASE_SELECT_ENTRY)); + showWarningMessage(parent, getLocalizedMessages().getString(ENTRY_DIALOG_PLEASE_SELECT_ENTRY)); return; } - int option = showQuestionMessage(parent, localizedMessages.getString(ENTRY_DIALOG_WANT_DELETE_ENTRY), YES_NO_OPTION); + int option = showQuestionMessage(parent, getLocalizedMessages().getString(ENTRY_DIALOG_WANT_DELETE_ENTRY), YES_NO_OPTION); if (option == YES_OPTION) { String title = (String) parent.getEntryTitleTable().getValueAt(parent.getEntryTitleTable().getSelectedRow(), 0); parent.getModel().getEntries().getEntry().remove(parent.getModel().getEntryByTitle(title)); @@ -84,12 +84,12 @@ public static void deleteEntry(JPassFrame parent) { */ public static void duplicateEntry(JPassFrame parent) { if (parent.getEntryTitleTable().getSelectedRow() == -1) { - showWarningMessage(parent, localizedMessages.getString(ENTRY_DIALOG_PLEASE_SELECT_ENTRY)); + showWarningMessage(parent, getLocalizedMessages().getString(ENTRY_DIALOG_PLEASE_SELECT_ENTRY)); return; } String title = (String) parent.getEntryTitleTable().getValueAt(parent.getEntryTitleTable().getSelectedRow(), 0); Entry originalEntry = parent.getModel().getEntryByTitle(title); - EntryDialog dialog = new EntryDialog(parent, localizedMessages.getString(ENTRY_DIALOG_DUPLICATE_ENTRY), originalEntry, true); + EntryDialog dialog = new EntryDialog(parent, getLocalizedMessages().getString(ENTRY_DIALOG_DUPLICATE_ENTRY), originalEntry, true); dialog.getModifiedEntry().ifPresent(entry -> { parent.getModel().getEntries().getEntry().add(entry); parent.getModel().setModified(true); @@ -105,12 +105,12 @@ public static void duplicateEntry(JPassFrame parent) { */ public static void editEntry(JPassFrame parent) { if (parent.getEntryTitleTable().getSelectedRow() == -1) { - showWarningMessage(parent, localizedMessages.getString(ENTRY_DIALOG_PLEASE_SELECT_ENTRY)); + showWarningMessage(parent, getLocalizedMessages().getString(ENTRY_DIALOG_PLEASE_SELECT_ENTRY)); return; } String title = (String) parent.getEntryTitleTable().getValueAt(parent.getEntryTitleTable().getSelectedRow(), 0); Entry originalEntry = parent.getModel().getEntryByTitle(title); - EntryDialog dialog = new EntryDialog(parent, localizedMessages.getString(ENTRY_DIALOG_EDIT_ENTRY), originalEntry, false); + EntryDialog dialog = new EntryDialog(parent, getLocalizedMessages().getString(ENTRY_DIALOG_EDIT_ENTRY), originalEntry, false); dialog.getModifiedEntry().ifPresent(entry -> { entry.setCreationDate(originalEntry.getCreationDate()); parent.getModel().getEntries().getEntry().remove(originalEntry); @@ -127,7 +127,7 @@ public static void editEntry(JPassFrame parent) { * @param parent parent component */ public static void addEntry(JPassFrame parent) { - EntryDialog dialog = new EntryDialog(parent, localizedMessages.getString(ENTRY_DIALOG_ADD_NEW_ENTRY), null, true); + EntryDialog dialog = new EntryDialog(parent, getLocalizedMessages().getString(ENTRY_DIALOG_ADD_NEW_ENTRY), null, true); dialog.getModifiedEntry().ifPresent(entry -> { parent.getModel().getEntries().getEntry().add(entry); parent.getModel().setModified(true); @@ -144,7 +144,7 @@ public static void addEntry(JPassFrame parent) { */ public static Entry getSelectedEntry(JPassFrame parent) { if (parent.getEntryTitleTable().getSelectedRow() == -1) { - showWarningMessage(parent, localizedMessages.getString(ENTRY_DIALOG_PLEASE_SELECT_ENTRY)); + showWarningMessage(parent, getLocalizedMessages().getString(ENTRY_DIALOG_PLEASE_SELECT_ENTRY)); return null; } String title = (String) parent.getEntryTitleTable().getValueAt(parent.getEntryTitleTable().getSelectedRow(), 0); diff --git a/src/main/java/jpass/ui/helper/FileHelper.java b/src/main/java/jpass/ui/helper/FileHelper.java index 36c943c..9ef06da 100644 --- a/src/main/java/jpass/ui/helper/FileHelper.java +++ b/src/main/java/jpass/ui/helper/FileHelper.java @@ -40,7 +40,7 @@ import jpass.ui.action.Worker; import jpass.util.Configuration; -import static jpass.ui.JPassFrame.localizedMessages; +import static jpass.ui.JPassFrame.getLocalizedMessages; import static jpass.ui.MessageDialog.showPasswordDialog; import static jpass.ui.MessageDialog.showWarningMessage; import static jpass.ui.MessageDialog.showQuestionMessage; @@ -89,7 +89,7 @@ private FileHelper() { */ public static void createNew(final JPassFrame parent) { if (parent.getModel().isModified()) { - int option = showQuestionMessage(parent, localizedMessages.getString(PANEL_SAVE_MODIFIED_QUESTION_MESSAGE), YES_NO_CANCEL_OPTION); + int option = showQuestionMessage(parent, getLocalizedMessages().getString(PANEL_SAVE_MODIFIED_QUESTION_MESSAGE), YES_NO_CANCEL_OPTION); if (option == YES_OPTION) { saveFile(parent, false, () -> { parent.clearModel(); @@ -112,8 +112,8 @@ public static void createNew(final JPassFrame parent) { * @param parent parent component */ public static void exportFile(final JPassFrame parent) { - showWarningMessage(parent, localizedMessages.getString(PANEL_UNENCRYPTED_DATA_WARNING_MESSAGE)); - File file = showFileChooser(parent, localizedMessages.getString(PANEL_EXPORT), "xml", XML_FILES); + showWarningMessage(parent, getLocalizedMessages().getString(PANEL_UNENCRYPTED_DATA_WARNING_MESSAGE)); + File file = showFileChooser(parent, getLocalizedMessages().getString(PANEL_EXPORT), "xml", XML_FILES); if (file == null) { return; } @@ -141,13 +141,13 @@ protected Void doInBackground() throws Exception { * @param parent parent component */ public static void importFile(final JPassFrame parent) { - File file = showFileChooser(parent, localizedMessages.getString(PANEL_IMPORT), "xml", XML_FILES); + File file = showFileChooser(parent, getLocalizedMessages().getString(PANEL_IMPORT), "xml", XML_FILES); if (file == null) { return; } final String fileName = file.getPath(); if (parent.getModel().isModified()) { - int option = showQuestionMessage(parent, localizedMessages.getString(PANEL_SAVE_MODIFIED_QUESTION_MESSAGE), YES_NO_CANCEL_OPTION); + int option = showQuestionMessage(parent, getLocalizedMessages().getString(PANEL_SAVE_MODIFIED_QUESTION_MESSAGE), YES_NO_CANCEL_OPTION); if (option == YES_OPTION) { saveFile(parent, false, () -> importFileInBackground(fileName, parent)); return; @@ -206,7 +206,7 @@ public static void saveFile(final JPassFrame parent, final boolean saveAs) { public static void saveFile(final JPassFrame parent, final boolean saveAs, final Runnable successCallback) { final String fileName; if (saveAs || parent.getModel().getFileName() == null) { - File file = showFileChooser(parent, localizedMessages.getString(PANEL_SAVE), "jpass", JPASS_DATA_FILES); + File file = showFileChooser(parent, getLocalizedMessages().getString(PANEL_SAVE), "jpass", JPASS_DATA_FILES); if (file == null) { return; } @@ -265,12 +265,12 @@ protected void done() { * @param parent parent component */ public static void openFile(final JPassFrame parent) { - final File file = showFileChooser(parent, localizedMessages.getString(PANEL_OPEN), "jpass", JPASS_DATA_FILES); + final File file = showFileChooser(parent, getLocalizedMessages().getString(PANEL_OPEN), "jpass", JPASS_DATA_FILES); if (file == null) { return; } if (parent.getModel().isModified()) { - int option = showQuestionMessage(parent, localizedMessages.getString(PANEL_SAVE_MODIFIED_QUESTION_MESSAGE), YES_NO_CANCEL_OPTION); + int option = showQuestionMessage(parent, getLocalizedMessages().getString(PANEL_SAVE_MODIFIED_QUESTION_MESSAGE), YES_NO_CANCEL_OPTION); if (option == YES_OPTION) { saveFile(parent, false, () -> openFileInBackground(file.getPath(), parent)); return; diff --git a/src/main/resources/resources/languages/languages_en_US.properties b/src/main/resources/resources/languages/languages_en_US.properties index 2d76116..9dd7bca 100644 --- a/src/main/resources/resources/languages/languages_en_US.properties +++ b/src/main/resources/resources/languages/languages_en_US.properties @@ -86,4 +86,4 @@ panel.import=Import panel.save=Save panel.open=Open panel.saveModifiedQuestionMessage=The current file has been modified.\nDo you want to save the changes before closing? -panel.unencryptedDataWarningMessage=Please note that all data will be stored unencrypted.\nMake sure you keep the exported file in a secure location. \ No newline at end of file +panel.unencryptedDataWarningMessage=Please note that all data will be stored unencrypted.\nMake sure you keep the exported file in a secure location. diff --git a/src/main/resources/resources/languages/languages_es_MX.properties b/src/main/resources/resources/languages/languages_es_MX.properties index 125bef3..c2efa1a 100644 --- a/src/main/resources/resources/languages/languages_es_MX.properties +++ b/src/main/resources/resources/languages/languages_es_MX.properties @@ -85,4 +85,4 @@ panel.import=Importar panel.save=Guardar panel.open=Abrir panel.saveModifiedQuestionMessage=El archivo actual ha sido modificado.\n¿Deseas guardar los cambios antes de cerrar el programa? -panel.unencryptedDataWarningMessage=Note que toda la data se almancenará sin cifrar.\nAsegúrese de guardar el archivo exportado en un lugar seguro. \ No newline at end of file +panel.unencryptedDataWarningMessage=Note que toda la data se almancenará sin cifrar.\nAsegúrese de guardar el archivo exportado en un lugar seguro.