From b7615b8bdf066c37b814cae7cbee5faebf81b2da Mon Sep 17 00:00:00 2001 From: Anton Keks Date: Sun, 11 Dec 2016 21:15:19 +0200 Subject: [PATCH] move supported language list to Labels --- src/net/azib/ipscan/config/Labels.java | 2 +- src/net/azib/ipscan/gui/PreferencesDialog.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/net/azib/ipscan/config/Labels.java b/src/net/azib/ipscan/config/Labels.java index 58a7de48..d89cf91c 100644 --- a/src/net/azib/ipscan/config/Labels.java +++ b/src/net/azib/ipscan/config/Labels.java @@ -24,7 +24,7 @@ import java.util.logging.Logger; * @author Anton Keks */ public final class Labels { - + public static final String[] LANGUAGES = { "system", "en", "de", "hu", "lt", "es", "it", "ku", "tr", "gr" }; private static final Logger LOG = Logger.getLogger(Labels.class.getName()); private static Labels instance; diff --git a/src/net/azib/ipscan/gui/PreferencesDialog.java b/src/net/azib/ipscan/gui/PreferencesDialog.java index 2aa50ba1..e8532ace 100644 --- a/src/net/azib/ipscan/gui/PreferencesDialog.java +++ b/src/net/azib/ipscan/gui/PreferencesDialog.java @@ -67,7 +67,6 @@ public class PreferencesDialog extends AbstractModalDialog { private Button showInfoCheckbox; private Button askConfirmationCheckbox; private Combo languageCombo; - private String[] languages = { "system", "en", "de", "hu", "lt", "es", "it", "ku", "tr", "gr" }; @Inject public PreferencesDialog(PingerRegistry pingerRegistry, Config globalConfig, ScannerConfig scannerConfig, GUIConfig guiConfig) { this.pingerRegistry = pingerRegistry; @@ -290,7 +289,7 @@ public class PreferencesDialog extends AbstractModalDialog { languageGroup.setText(Labels.getLabel("preferences.language")); languageCombo = new Combo(languageGroup, SWT.DROP_DOWN | SWT.READ_ONLY); - for (String language : languages) { + for (String language : Labels.LANGUAGES) { languageCombo.add(Labels.getLabel("language." + language)); } languageCombo.select(0); @@ -395,8 +394,8 @@ public class PreferencesDialog extends AbstractModalDialog { displayMethod[guiConfig.displayMethod.ordinal()].setSelection(true); showInfoCheckbox.setSelection(guiConfig.showScanStats); askConfirmationCheckbox.setSelection(guiConfig.askScanConfirmation); - for (int i = 0; i < languages.length; i++) { - if (globalConfig.language.equals(languages[i])) { + for (int i = 0; i < Labels.LANGUAGES.length; i++) { + if (globalConfig.language.equals(Labels.LANGUAGES[i])) { languageCombo.select(i); } } @@ -439,7 +438,7 @@ public class PreferencesDialog extends AbstractModalDialog { } guiConfig.showScanStats = showInfoCheckbox.getSelection(); guiConfig.askScanConfirmation = askConfirmationCheckbox.getSelection(); - String newLanguage = languages[languageCombo.getSelectionIndex()]; + String newLanguage = Labels.LANGUAGES[languageCombo.getSelectionIndex()]; if (!newLanguage.equals(globalConfig.language)) { globalConfig.language = newLanguage; MessageBox msgBox = new MessageBox(shell);