diff --git a/src/main/java/de/extio/game_engine/i18n/LocalizationEditor.java b/src/main/java/de/extio/game_engine/i18n/LocalizationEditor.java index f6f189f..fbf3a50 100644 --- a/src/main/java/de/extio/game_engine/i18n/LocalizationEditor.java +++ b/src/main/java/de/extio/game_engine/i18n/LocalizationEditor.java @@ -60,10 +60,6 @@ public class LocalizationEditor extends JFrame { private JTable table; - private JLabel lblDefaultDescre; - - private JTextField textField; - private JMenuBar menuBar; private JMenu mnFile; @@ -398,7 +394,7 @@ public class LocalizationEditor extends JFrame { gbc_panel.gridx = 0; gbc_panel.gridy = 0; this.contentPane.add(panel, gbc_panel); - panel.setLayout(new GridLayout(1, 6, 0, 0)); + panel.setLayout(new GridLayout(1, 5, 0, 0)); this.btnAdd = new JButton("Add"); this.btnAdd.setFont(baseFont); @@ -422,8 +418,6 @@ public class LocalizationEditor extends JFrame { } } - LocalizationEditor.this.localizationManagerImpl.getLocalizations().getDescriptions().put(idStr, LocalizationEditor.this.textField.getText() == null ? "" : LocalizationEditor.this.textField.getText()); - ((AbstractTableModel) LocalizationEditor.this.table.getModel()).fireTableDataChanged(); } }); @@ -464,24 +458,11 @@ public class LocalizationEditor extends JFrame { LocalizationEditor.this.localizationManagerImpl.put(lang.getShortName(), idStr, value); } - final String oldDescr = LocalizationEditor.this.localizationManagerImpl.getLocalizations().getDescriptions().get(oldId); - LocalizationEditor.this.localizationManagerImpl.getLocalizations().getDescriptions().put(idStr, oldDescr); - ((AbstractTableModel) LocalizationEditor.this.table.getModel()).fireTableDataChanged(); } }); panel.add(this.btnClone); - this.lblDefaultDescre = new JLabel("Description:"); - this.lblDefaultDescre.setFont(baseFont); - this.lblDefaultDescre.setHorizontalAlignment(SwingConstants.RIGHT); - panel.add(this.lblDefaultDescre); - - this.textField = new JTextField(); - this.textField.setFont(baseFont); - panel.add(this.textField); - this.textField.setColumns(10); - this.lblPrefix = new JLabel("Prefix:"); this.lblPrefix.setFont(baseFont); this.lblPrefix.setHorizontalAlignment(SwingConstants.RIGHT); @@ -517,12 +498,7 @@ public class LocalizationEditor extends JFrame { return id; } - if (columnIndex == 1) { - final var desc = LocalizationEditor.this.localizationManagerImpl.getLocalizations().getDescriptions().get(id); - return desc == null ? "" : desc; - } - - final String lang = LocalizationEditor.this.localizationManagerImpl.getLanguages().get(columnIndex - 2).getShortName(); + final String lang = LocalizationEditor.this.localizationManagerImpl.getLanguages().get(columnIndex - 1).getShortName(); final String value = LocalizationEditor.this.localizationManagerImpl.getLocalizations().getLanguages().entrySet().stream() .filter(entry -> entry.getKey().equals(lang)) .map(entry -> entry.getValue().getOrDefault(id, "")) @@ -538,7 +514,7 @@ public class LocalizationEditor extends JFrame { @Override public int getColumnCount() { - return LocalizationEditor.this.localizationManagerImpl.getLanguages().size() + 2; + return LocalizationEditor.this.localizationManagerImpl.getLanguages().size() + 1; } @Override @@ -546,11 +522,8 @@ public class LocalizationEditor extends JFrame { if (arg0 == 0) { return "id"; } - else if (arg0 == 1) { - return "description"; - } - return LocalizationEditor.this.localizationManagerImpl.getLanguages().get(arg0 - 2).getName() + " " + LocalizationEditor.this.localizationManagerImpl.getLanguages().get(arg0 - 2).getShortName(); + return LocalizationEditor.this.localizationManagerImpl.getLanguages().get(arg0 - 1).getName() + " " + LocalizationEditor.this.localizationManagerImpl.getLanguages().get(arg0 - 1).getShortName(); } @Override @@ -568,12 +541,7 @@ public class LocalizationEditor extends JFrame { return; } - if (columnIndex == 1) { - LocalizationEditor.this.localizationManagerImpl.getLocalizations().getDescriptions().put(id, String.valueOf(aValue)); - return; - } - - final String langShortName = LocalizationEditor.this.localizationManagerImpl.getLocalizations().getLanguages().keySet().stream().skip(columnIndex - 2).findFirst().orElse(null); + final String langShortName = LocalizationEditor.this.localizationManagerImpl.getLocalizations().getLanguages().keySet().stream().skip(columnIndex - 1).findFirst().orElse(null); if (langShortName == null) { return; } diff --git a/src/main/java/de/extio/game_engine/i18n/LocalizationServiceImpl.java b/src/main/java/de/extio/game_engine/i18n/LocalizationServiceImpl.java index 013a2b3..1af9b07 100644 --- a/src/main/java/de/extio/game_engine/i18n/LocalizationServiceImpl.java +++ b/src/main/java/de/extio/game_engine/i18n/LocalizationServiceImpl.java @@ -68,7 +68,6 @@ public class LocalizationServiceImpl implements LocalizationService { } }); this.localizations.getLanguagesInfo().putAll(localizations.getLanguagesInfo()); - this.localizations.getDescriptions().putAll(localizations.getDescriptions()); int maxId = 0; for (final Map entries : this.localizations.getLanguages().values()) { @@ -83,7 +82,7 @@ public class LocalizationServiceImpl implements LocalizationService { this.localizations.setPrefix(localizations.getPrefix()); - LOGGER.info("Loaded {} localizations for {} languages", localizations.getDescriptions().size(), localizations.getLanguages().size()); + LOGGER.info("Loaded localizations for {} languages", localizations.getLanguages().size()); } this.loadPersistedLanguageName(); @@ -131,7 +130,7 @@ public class LocalizationServiceImpl implements LocalizationService { if (this.currentLanguage == null) { return defaultText; } - var result = this.currentLanguage.get(id); + final var result = this.currentLanguage.get(id); if (result == null) { return defaultText; } diff --git a/src/main/java/de/extio/game_engine/i18n/Localizations.java b/src/main/java/de/extio/game_engine/i18n/Localizations.java index 5e01af8..391cd45 100644 --- a/src/main/java/de/extio/game_engine/i18n/Localizations.java +++ b/src/main/java/de/extio/game_engine/i18n/Localizations.java @@ -1,6 +1,5 @@ package de.extio.game_engine.i18n; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; @@ -16,8 +15,6 @@ public final class Localizations { private Map languagesInfo = new LinkedHashMap<>(); - private Map descriptions = new HashMap<>(); - private int curId; public Localizations() { @@ -33,7 +30,6 @@ public final class Localizations { for (final Entry entry : other.languagesInfo.entrySet()) { this.languagesInfo.put(entry.getKey(), new Language(entry.getValue())); } - this.descriptions = new HashMap<>(other.descriptions); this.curId = other.curId; this.prefix = other.prefix; } @@ -43,7 +39,7 @@ public final class Localizations { } public void setLanguages(final Map> languages) { - this.languages = languages; + this.languages = new LinkedHashMap<>(languages); } public Map getLanguagesInfo() { @@ -51,7 +47,7 @@ public final class Localizations { } public void setLanguagesInfo(final Map languagesInfo) { - this.languagesInfo = languagesInfo; + this.languagesInfo = new LinkedHashMap<>(languagesInfo); } public int getCurId() { @@ -62,14 +58,6 @@ public final class Localizations { this.curId = curId; } - public Map getDescriptions() { - return this.descriptions; - } - - public void setDescriptions(final Map descriptions) { - this.descriptions = descriptions; - } - public String getPrefix() { return this.prefix; }