Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Commit 16dbcf8

Browse files
edimoraledimoral
committed
Fixes code checkstyle violations
1 parent 9c557a2 commit 16dbcf8

File tree

12 files changed

+111
-103
lines changed

12 files changed

+111
-103
lines changed

‎src/main/java/jpass/ui/EntryDetailsTable.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import jpass.util.DateUtils;
4646
import jpass.xml.bind.Entry;
4747

48-
import static jpass.ui.JPassFrame.localizedMessages;
48+
import static jpass.ui.JPassFrame.getLocalizedMessages;
4949
import static jpass.util.Constants.VIEW_WINDOW_CREATED;
5050
import static jpass.util.Constants.VIEW_WINDOW_MODIFIED;
5151
import static jpass.util.Constants.VIEW_WINDOW_TITLE;
@@ -61,11 +61,11 @@ public class EntryDetailsTable extends JTable {
6161
= DateUtils.createFormatter(Configuration.getInstance().get("date.format", "yyyy-MM-dd"));
6262

6363
private enum DetailType {
64-
TITLE(localizedMessages.getString(VIEW_WINDOW_TITLE), Entry::getTitle),
65-
URL(localizedMessages.getString(VIEW_WINDOW_URL), Entry::getUrl),
66-
USER(localizedMessages.getString(VIEW_WINDOW_USER), Entry::getUser),
67-
MODIFIED(localizedMessages.getString(VIEW_WINDOW_MODIFIED), entry -> DateUtils.formatIsoDateTime(entry.getLastModification(), FORMATTER)),
68-
CREATED(localizedMessages.getString(VIEW_WINDOW_CREATED), entry -> DateUtils.formatIsoDateTime(entry.getCreationDate(), FORMATTER));
64+
TITLE(getLocalizedMessages().getString(VIEW_WINDOW_TITLE), Entry::getTitle),
65+
URL(getLocalizedMessages().getString(VIEW_WINDOW_URL), Entry::getUrl),
66+
USER(getLocalizedMessages().getString(VIEW_WINDOW_USER), Entry::getUser),
67+
MODIFIED(getLocalizedMessages().getString(VIEW_WINDOW_MODIFIED), entry -> DateUtils.formatIsoDateTime(entry.getLastModification(), FORMATTER)),
68+
CREATED(getLocalizedMessages().getString(VIEW_WINDOW_CREATED), entry -> DateUtils.formatIsoDateTime(entry.getCreationDate(), FORMATTER));
6969

7070
private final String description;
7171
private final Function<Entry, String> valueMapper;

‎src/main/java/jpass/ui/EntryDialog.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import jpass.util.StringUtils;
5555
import jpass.xml.bind.Entry;
5656

57-
import static jpass.ui.JPassFrame.localizedMessages;
57+
import static jpass.ui.JPassFrame.getLocalizedMessages;
5858
import static jpass.ui.helper.EntryHelper.copyEntryField;
5959
import static jpass.util.Constants.BUTTON_MESSAGE_CANCEL;
6060
import static jpass.util.Constants.BUTTON_MESSAGE_OK;
@@ -129,15 +129,15 @@ public EntryDialog(JPassFrame parent, String title, Entry entry, boolean newEntr
129129
this.originalEcho = this.passwordField.getEchoChar();
130130
this.repeatField = TextComponentFactory.newPasswordField(true);
131131

132-
this.showButton = new JToggleButton(localizedMessages.getString(ENTRY_DIALOG_SHOW_ENTRY), MessageDialog.getIcon("show"));
132+
this.showButton = new JToggleButton(getLocalizedMessages().getString(ENTRY_DIALOG_SHOW_ENTRY), MessageDialog.getIcon("show"));
133133
this.showButton.setActionCommand("show_button");
134134
this.showButton.setMnemonic(KeyEvent.VK_S);
135135
this.showButton.addActionListener(this);
136-
this.generateButton = new JButton(localizedMessages.getString(ENTRY_DIALOG_GENERATE_ENTRY), MessageDialog.getIcon("generate"));
136+
this.generateButton = new JButton(getLocalizedMessages().getString(ENTRY_DIALOG_GENERATE_ENTRY), MessageDialog.getIcon("generate"));
137137
this.generateButton.setActionCommand("generate_button");
138138
this.generateButton.setMnemonic(KeyEvent.VK_G);
139139
this.generateButton.addActionListener(this);
140-
this.copyButton = new JButton(localizedMessages.getString(ENTRY_DIALOG_COPY_ENTRY), MessageDialog.getIcon("keyring"));
140+
this.copyButton = new JButton(getLocalizedMessages().getString(ENTRY_DIALOG_COPY_ENTRY), MessageDialog.getIcon("keyring"));
141141
this.copyButton.setActionCommand("copy_button");
142142
this.copyButton.setMnemonic(KeyEvent.VK_P);
143143
this.copyButton.addActionListener(this);
@@ -152,15 +152,15 @@ public EntryDialog(JPassFrame parent, String title, Entry entry, boolean newEntr
152152
5, 0); // xPad, yPad
153153

154154
this.fieldPanel = new JPanel(new SpringLayout());
155-
this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_TITLE))));
155+
this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_TITLE))));
156156
this.fieldPanel.add(this.titleField);
157-
this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_URL))));
157+
this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_URL))));
158158
this.fieldPanel.add(this.urlField);
159-
this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_USER_NAME))));
159+
this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_USER_NAME))));
160160
this.fieldPanel.add(this.userField);
161-
this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_PASSWORD))));
161+
this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_PASSWORD))));
162162
this.fieldPanel.add(this.passwordField);
163-
this.fieldPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_REPEAT))));
163+
this.fieldPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_REPEAT))));
164164
this.fieldPanel.add(this.repeatField);
165165
this.fieldPanel.add(new JLabel(""));
166166
this.fieldPanel.add(this.passwordButtonPanel);
@@ -176,15 +176,15 @@ public EntryDialog(JPassFrame parent, String title, Entry entry, boolean newEntr
176176

177177
this.notesPanel = new JPanel(new BorderLayout(5, 5));
178178
this.notesPanel.setBorder(new EmptyBorder(0, 5, 0, 5));
179-
this.notesPanel.add(new JLabel(String.format("%s:", localizedMessages.getString(VIEW_WINDOW_NOTES))), BorderLayout.NORTH);
179+
this.notesPanel.add(new JLabel(String.format("%s:", getLocalizedMessages().getString(VIEW_WINDOW_NOTES))), BorderLayout.NORTH);
180180
this.notesPanel.add(new JScrollPane(this.notesField), BorderLayout.CENTER);
181181

182-
this.okButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_OK), MessageDialog.getIcon("accept"));
182+
this.okButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_OK), MessageDialog.getIcon("accept"));
183183
this.okButton.setActionCommand("ok_button");
184184
this.okButton.setMnemonic(KeyEvent.VK_O);
185185
this.okButton.addActionListener(this);
186186

187-
this.cancelButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_CANCEL), MessageDialog.getIcon("cancel"));
187+
this.cancelButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_CANCEL), MessageDialog.getIcon("cancel"));
188188
this.cancelButton.setActionCommand("cancel_button");
189189
this.cancelButton.setMnemonic(KeyEvent.VK_C);
190190
this.cancelButton.addActionListener(this);
@@ -212,13 +212,13 @@ public void actionPerformed(ActionEvent e) {
212212
this.repeatField.setEchoChar(this.showButton.isSelected() ? NULL_ECHO : this.originalEcho);
213213
} else if ("ok_button".equals(command)) {
214214
if (this.titleField.getText().trim().isEmpty()) {
215-
MessageDialog.showWarningMessage(this, localizedMessages.getString(ENTRY_DIALOG_FILL_TITLE_FIELD));
215+
MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(ENTRY_DIALOG_FILL_TITLE_FIELD));
216216
return;
217217
} else if (!checkEntryTitle()) {
218-
MessageDialog.showWarningMessage(this, localizedMessages.getString(ENTRY_DIALOG_TITLE_ALREADY_EXISTS));
218+
MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(ENTRY_DIALOG_TITLE_ALREADY_EXISTS));
219219
return;
220220
} else if (!Arrays.equals(this.passwordField.getPassword(), this.repeatField.getPassword())) {
221-
MessageDialog.showWarningMessage(this, localizedMessages.getString(PASSWORD_PASSWORDS_NOT_IDENTICAL));
221+
MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(PASSWORD_PASSWORDS_NOT_IDENTICAL));
222222
return;
223223
}
224224
this.modifiedEntry = getEntryFromDialog();

‎src/main/java/jpass/ui/GeneratePasswordDialog.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import jpass.util.CryptUtils;
5555
import jpass.util.SpringUtilities;
5656

57-
import static jpass.ui.JPassFrame.localizedMessages;
57+
import static jpass.ui.JPassFrame.getLocalizedMessages;
5858
import static jpass.util.Constants.BUTTON_MESSAGE_ACCEPT;
5959
import static jpass.util.Constants.BUTTON_MESSAGE_CANCEL;
6060
import static jpass.util.Constants.BUTTON_MESSAGE_CLOSE;
@@ -87,9 +87,9 @@ public final class GeneratePasswordDialog extends JDialog implements ActionListe
8787
* Options for password generation.
8888
*/
8989
private static final String[][] PASSWORD_OPTIONS = {
90-
{localizedMessages.getString(VIEW_WINDOW_UPPER_CASE_LETTERS), "ABCDEFGHIJKLMNOPQRSTUVWXYZ"},
91-
{localizedMessages.getString(VIEW_WINDOW_LOWER_CASE_LETTERS), "abcdefghijklmnopqrstuvwxyz"},
92-
{localizedMessages.getString(VIEW_WINDOW_NUMBERS), "0123456789"}
90+
{getLocalizedMessages().getString(VIEW_WINDOW_UPPER_CASE_LETTERS), "ABCDEFGHIJKLMNOPQRSTUVWXYZ"},
91+
{getLocalizedMessages().getString(VIEW_WINDOW_LOWER_CASE_LETTERS), "abcdefghijklmnopqrstuvwxyz"},
92+
{getLocalizedMessages().getString(VIEW_WINDOW_NUMBERS), "0123456789"}
9393
};
9494

9595
private JCheckBox[] checkBoxes;
@@ -144,12 +144,12 @@ public GeneratePasswordDialog(JDialog parent) {
144144
*/
145145
private void initDialog(final Component parent, final boolean showAcceptButton) {
146146
setModal(true);
147-
setTitle(localizedMessages.getString(PASSWORD_GENERATE_PASSWORD));
147+
setTitle(getLocalizedMessages().getString(PASSWORD_GENERATE_PASSWORD));
148148
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
149149
this.generatedPassword = null;
150150

151151
this.lengthPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
152-
this.lengthLabel = new JLabel(String.format("%s:", localizedMessages.getString(PASSWORD_PASSWORD_LENGTH)));
152+
this.lengthLabel = new JLabel(String.format("%s:", getLocalizedMessages().getString(PASSWORD_PASSWORD_LENGTH)));
153153
this.lengthPanel.add(this.lengthLabel);
154154

155155
int passwordGenerationLength = Configuration.getInstance().getInteger("default.password.generation.length", 14);
@@ -164,14 +164,14 @@ private void initDialog(final Component parent, final boolean showAcceptButton)
164164
this.lengthPanel.add(this.lengthSpinner);
165165

166166
this.charactersPanel = new JPanel();
167-
this.charactersPanel.setBorder(new TitledBorder(localizedMessages.getString(VIEW_WINDOW_SETTINGS)));
167+
this.charactersPanel.setBorder(new TitledBorder(getLocalizedMessages().getString(VIEW_WINDOW_SETTINGS)));
168168
this.charactersPanel.add(this.lengthPanel);
169169
this.checkBoxes = new JCheckBox[PASSWORD_OPTIONS.length];
170170
for (int i = 0; i < PASSWORD_OPTIONS.length; i++) {
171171
this.checkBoxes[i] = new JCheckBox(PASSWORD_OPTIONS[i][0], true);
172172
this.charactersPanel.add(this.checkBoxes[i]);
173173
}
174-
this.customSymbolsCheck = new JCheckBox(localizedMessages.getString(VIEW_WINDOW_CUSTOM_SYMBOLS));
174+
this.customSymbolsCheck = new JCheckBox(getLocalizedMessages().getString(VIEW_WINDOW_CUSTOM_SYMBOLS));
175175
this.customSymbolsCheck.setActionCommand("custom_symbols_check");
176176
this.customSymbolsCheck.addActionListener(this);
177177
this.charactersPanel.add(this.customSymbolsCheck);
@@ -183,11 +183,11 @@ private void initDialog(final Component parent, final boolean showAcceptButton)
183183
SpringUtilities.makeCompactGrid(this.charactersPanel, 6, 1, 5, 5, 5, 5);
184184

185185
this.passwordPanel = new JPanel(new BorderLayout());
186-
this.passwordPanel.setBorder(new TitledBorder(localizedMessages.getString(PASSWORD_GENERATED_PASSWORD)));
186+
this.passwordPanel.setBorder(new TitledBorder(getLocalizedMessages().getString(PASSWORD_GENERATED_PASSWORD)));
187187

188188
this.passwordField = TextComponentFactory.newTextField();
189189
this.passwordPanel.add(this.passwordField, BorderLayout.NORTH);
190-
this.generateButton = new JButton(localizedMessages.getString(ENTRY_DIALOG_GENERATE_ENTRY), MessageDialog.getIcon("generate"));
190+
this.generateButton = new JButton(getLocalizedMessages().getString(ENTRY_DIALOG_GENERATE_ENTRY), MessageDialog.getIcon("generate"));
191191
this.generateButton.setActionCommand("generate_button");
192192
this.generateButton.addActionListener(this);
193193
this.generateButton.setMnemonic(KeyEvent.VK_G);
@@ -198,15 +198,15 @@ private void initDialog(final Component parent, final boolean showAcceptButton)
198198
this.buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
199199

200200
if (showAcceptButton) {
201-
this.acceptButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_ACCEPT), MessageDialog.getIcon("accept"));
201+
this.acceptButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_ACCEPT), MessageDialog.getIcon("accept"));
202202
this.acceptButton.setActionCommand("accept_button");
203203
this.acceptButton.setMnemonic(KeyEvent.VK_A);
204204
this.acceptButton.addActionListener(this);
205205
this.buttonPanel.add(this.acceptButton);
206206

207-
this.cancelButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_CANCEL), MessageDialog.getIcon("cancel"));
207+
this.cancelButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_CANCEL), MessageDialog.getIcon("cancel"));
208208
} else {
209-
this.cancelButton = new JButton(localizedMessages.getString(BUTTON_MESSAGE_CLOSE), MessageDialog.getIcon("close"));
209+
this.cancelButton = new JButton(getLocalizedMessages().getString(BUTTON_MESSAGE_CLOSE), MessageDialog.getIcon("close"));
210210
}
211211

212212
this.cancelButton.setActionCommand("cancel_button");
@@ -247,7 +247,7 @@ public void actionPerformed(ActionEvent e) {
247247
}
248248

249249
if (characterSet.isEmpty()) {
250-
MessageDialog.showWarningMessage(this, localizedMessages.getString(PASSWORD_CAN_NOT_GENERATE_PASSWORD));
250+
MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(PASSWORD_CAN_NOT_GENERATE_PASSWORD));
251251
return;
252252
}
253253

@@ -260,7 +260,7 @@ public void actionPerformed(ActionEvent e) {
260260
} else if ("accept_button".equals(command)) {
261261
this.generatedPassword = this.passwordField.getText();
262262
if (this.generatedPassword.isEmpty()) {
263-
MessageDialog.showWarningMessage(this, localizedMessages.getString(PASSWORD_GENERATE_PASSWORD_REQUEST));
263+
MessageDialog.showWarningMessage(this, getLocalizedMessages().getString(PASSWORD_GENERATE_PASSWORD_REQUEST));
264264
return;
265265
}
266266
dispose();

‎src/main/java/jpass/ui/JPassFrame.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
*/
8282
public final class JPassFrame extends JFrame {
8383

84-
public static ResourceBundle localizedMessages = null;
84+
private static ResourceBundle localizedMessages = null;
8585
private static final Logger LOG = Logger.getLogger(JPassFrame.class.getName());
8686

8787
private static JPassFrame instance;
@@ -371,4 +371,12 @@ public boolean isProcessing() {
371371
public SearchPanel getSearchPanel() {
372372
return searchPanel;
373373
}
374+
375+
/**
376+
* Gets the resource bundle for localization
377+
* @return resource bundle
378+
*/
379+
public static ResourceBundle getLocalizedMessages() {
380+
return localizedMessages;
381+
}
374382
}

0 commit comments

Comments
 (0)