From de88d0d96c1bf0c6cce4215b9cb6e39a51c5269d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Mon, 1 Nov 2021 14:38:48 +0100 Subject: [PATCH 01/49] extend plugin settings to include key sorting and nesting --- .../easyi18n/dialog/SettingsDialog.java | 47 ++++++++++++------- .../marhali/easyi18n/model/SettingsState.java | 20 ++++++++ src/main/resources/messages.properties | 2 + 3 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java index b774b3d..1f8c46d 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java @@ -9,6 +9,7 @@ import com.intellij.ui.components.JBCheckBox; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBTextField; +import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.service.SettingsService; import de.marhali.easyi18n.service.DataStore; @@ -28,6 +29,8 @@ public class SettingsDialog { private JBTextField filePatternText; private JBTextField previewLocaleText; private JBTextField pathPrefixText; + private JBCheckBox sortKeysCheckbox; + private JBCheckBox nestedKeysCheckbox; private JBCheckBox codeAssistanceCheckbox; public SettingsDialog(Project project) { @@ -35,30 +38,28 @@ public class SettingsDialog { } public void showAndHandle() { - String localesPath = SettingsService.getInstance(project).getState().getLocalesPath(); - String filePattern = SettingsService.getInstance(project).getState().getFilePattern(); - String previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale(); - String pathPrefix = SettingsService.getInstance(project).getState().getPathPrefix(); - boolean codeAssistance = SettingsService.getInstance(project).getState().isCodeAssistance(); + SettingsState state = SettingsService.getInstance(project).getState(); - if(prepare(localesPath, filePattern, previewLocale, pathPrefix, codeAssistance).show() == DialogWrapper.OK_EXIT_CODE) { // Save changes - SettingsService.getInstance(project).getState().setLocalesPath(pathText.getText()); - SettingsService.getInstance(project).getState().setFilePattern(filePatternText.getText()); - SettingsService.getInstance(project).getState().setPreviewLocale(previewLocaleText.getText()); - SettingsService.getInstance(project).getState().setCodeAssistance(codeAssistanceCheckbox.isSelected()); - SettingsService.getInstance(project).getState().setPathPrefix(pathPrefixText.getText()); + if(prepare(state).show() == DialogWrapper.OK_EXIT_CODE) { // Save changes + state.setLocalesPath(pathText.getText()); + state.setFilePattern(filePatternText.getText()); + state.setPreviewLocale(previewLocaleText.getText()); + state.setPathPrefix(pathPrefixText.getText()); + state.setSortKeys(sortKeysCheckbox.isSelected()); + state.setNestedKeys(nestedKeysCheckbox.isSelected()); + state.setCodeAssistance(codeAssistanceCheckbox.isSelected()); // Reload instance DataStore.getInstance(project).reloadFromDisk(); } } - private DialogBuilder prepare(String localesPath, String filePattern, String previewLocale, String pathPrefix, boolean codeAssistance) { + private DialogBuilder prepare(SettingsState state) { JPanel rootPanel = new JPanel(new GridLayout(0, 1, 2, 2)); /* path */ JBLabel pathLabel = new JBLabel(ResourceBundle.getBundle("messages").getString("settings.path.text")); - pathText = new TextFieldWithBrowseButton(new JTextField(localesPath)); + pathText = new TextFieldWithBrowseButton(new JTextField(state.getLocalesPath())); pathLabel.setLabelFor(pathText); pathText.addBrowseFolderListener(ResourceBundle.getBundle("messages").getString("settings.path.title"), null, project, new FileChooserDescriptor( @@ -69,14 +70,14 @@ public class SettingsDialog { /* file pattern */ JBLabel filePatternLabel = new JBLabel(ResourceBundle.getBundle("messages").getString("settings.path.file-pattern")); - filePatternText = new JBTextField(filePattern); + filePatternText = new JBTextField(state.getFilePattern()); rootPanel.add(filePatternLabel); rootPanel.add(filePatternText); /* preview locale */ JBLabel previewLocaleLabel = new JBLabel(ResourceBundle.getBundle("messages").getString("settings.preview")); - previewLocaleText = new JBTextField(previewLocale); + previewLocaleText = new JBTextField(state.getPreviewLocale()); previewLocaleLabel.setLabelFor(previewLocaleText); rootPanel.add(previewLocaleLabel); @@ -84,14 +85,26 @@ public class SettingsDialog { /* path prefix */ JBLabel pathPrefixLabel = new JBLabel(ResourceBundle.getBundle("messages").getString("settings.path.prefix")); - pathPrefixText = new JBTextField(pathPrefix); + pathPrefixText = new JBTextField(state.getPathPrefix()); rootPanel.add(pathPrefixLabel); rootPanel.add(pathPrefixText); + /* sort keys */ + sortKeysCheckbox = new JBCheckBox(ResourceBundle.getBundle("messages").getString("settings.keys.sort")); + sortKeysCheckbox.setSelected(state.isSortKeys()); + + rootPanel.add(sortKeysCheckbox); + + /* nested keys */ + nestedKeysCheckbox = new JBCheckBox(ResourceBundle.getBundle("messages").getString("settings.keys.nested")); + nestedKeysCheckbox.setSelected(state.isNestedKeys()); + + rootPanel.add(nestedKeysCheckbox); + /* code assistance */ codeAssistanceCheckbox = new JBCheckBox(ResourceBundle.getBundle("messages").getString("settings.editor.assistance")); - codeAssistanceCheckbox.setSelected(codeAssistance); + codeAssistanceCheckbox.setSelected(state.isCodeAssistance()); rootPanel.add(codeAssistanceCheckbox); diff --git a/src/main/java/de/marhali/easyi18n/model/SettingsState.java b/src/main/java/de/marhali/easyi18n/model/SettingsState.java index 2638c7d..5c322eb 100644 --- a/src/main/java/de/marhali/easyi18n/model/SettingsState.java +++ b/src/main/java/de/marhali/easyi18n/model/SettingsState.java @@ -12,12 +12,16 @@ public class SettingsState { public static final String DEFAULT_PREVIEW_LOCALE = "en"; public static final String DEFAULT_FILE_PATTERN = ".*"; public static final String DEFAULT_PATH_PREFIX = ""; + public static final boolean DEFAULT_SORT_KEYS = true; + public static final boolean DEFAULT_NESTED_KEYS = true; public static final boolean DEFAULT_CODE_ASSISTANCE = true; private String localesPath; private String filePattern; private String previewLocale; private String pathPrefix; + private Boolean sortKeys; + private Boolean nestedKeys; private Boolean codeAssistance; public SettingsState() {} @@ -54,6 +58,22 @@ public class SettingsState { this.pathPrefix = pathPrefix; } + public boolean isSortKeys() { + return sortKeys == null ? DEFAULT_SORT_KEYS : sortKeys; + } + + public void setSortKeys(boolean sortKeys) { + this.sortKeys = sortKeys; + } + + public boolean isNestedKeys() { + return nestedKeys == null ? DEFAULT_NESTED_KEYS : nestedKeys; + } + + public void setNestedKeys(boolean nestedKeys) { + this.nestedKeys = nestedKeys; + } + public boolean isCodeAssistance() { return codeAssistance == null ? DEFAULT_CODE_ASSISTANCE : codeAssistance; } diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 2be4dcf..70d5f45 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -16,4 +16,6 @@ settings.path.text=Locales directory settings.path.file-pattern=Translation file pattern settings.path.prefix=Path prefix settings.preview=Preview locale +settings.keys.sort=Sort translation keys alphabetically +settings.keys.nested=Nest translation keys if possible settings.editor.assistance=I18n key completion, annotation and reference inside editor \ No newline at end of file From befdea277b77b9d751b709386a539e0ee0e1167b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Tue, 2 Nov 2021 16:41:02 +0100 Subject: [PATCH 02/49] deprecate legacy data system --- .../de/marhali/easyi18n/action/ReloadAction.java | 4 ++-- .../java/de/marhali/easyi18n/dialog/AddDialog.java | 6 +++--- .../java/de/marhali/easyi18n/dialog/EditDialog.java | 8 ++++---- .../de/marhali/easyi18n/editor/KeyAnnotator.java | 4 ++-- .../easyi18n/editor/KeyCompletionProvider.java | 2 +- .../de/marhali/easyi18n/editor/KeyReference.java | 4 ++-- .../generic/GenericKeyReferenceContributor.java | 4 ++-- .../kotlin/KotlinKeyReferenceContributor.java | 4 ++-- .../de/marhali/easyi18n/model/DataSynchronizer.java | 1 + .../de/marhali/easyi18n/model/KeyedTranslation.java | 1 + .../de/marhali/easyi18n/model/LocalizedNode.java | 1 + .../de/marhali/easyi18n/model/Translations.java | 1 + .../{DataStore.java => LegacyDataStore.java} | 13 +++++++------ .../java/de/marhali/easyi18n/tabs/TableView.java | 8 ++++---- .../java/de/marhali/easyi18n/tabs/TreeView.java | 6 +++--- .../de/marhali/easyi18n/util/TranslationsUtil.java | 1 + src/main/resources/META-INF/plugin.xml | 2 +- 17 files changed, 38 insertions(+), 32 deletions(-) rename src/main/java/de/marhali/easyi18n/service/{DataStore.java => LegacyDataStore.java} (94%) diff --git a/src/main/java/de/marhali/easyi18n/action/ReloadAction.java b/src/main/java/de/marhali/easyi18n/action/ReloadAction.java index 5930963..1f380fc 100644 --- a/src/main/java/de/marhali/easyi18n/action/ReloadAction.java +++ b/src/main/java/de/marhali/easyi18n/action/ReloadAction.java @@ -4,7 +4,7 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import org.jetbrains.annotations.NotNull; @@ -23,6 +23,6 @@ public class ReloadAction extends AnAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - DataStore.getInstance(e.getProject()).reloadFromDisk(); + LegacyDataStore.getInstance(e.getProject()).reloadFromDisk(); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java b/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java index 8a50820..536e650 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java @@ -7,7 +7,7 @@ import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.JBTextField; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.model.KeyedTranslation; import de.marhali.easyi18n.model.TranslationCreate; @@ -57,7 +57,7 @@ public class AddDialog { }); TranslationCreate creation = new TranslationCreate(new KeyedTranslation(keyTextField.getText(), messages)); - DataStore.getInstance(project).processUpdate(creation); + LegacyDataStore.getInstance(project).processUpdate(creation); } private DialogBuilder prepare() { @@ -75,7 +75,7 @@ public class AddDialog { JPanel valuePanel = new JPanel(new GridLayout(0, 1, 2, 2)); valueTextFields = new HashMap<>(); - for(String locale : DataStore.getInstance(project).getTranslations().getLocales()) { + for(String locale : LegacyDataStore.getInstance(project).getTranslations().getLocales()) { JBLabel localeLabel = new JBLabel(locale); JBTextField localeText = new JBTextField(); localeLabel.setLabelFor(localeText); diff --git a/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java index 09f3e21..c67791c 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java @@ -6,7 +6,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.JBTextField; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.model.KeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; import de.marhali.easyi18n.model.TranslationUpdate; @@ -40,10 +40,10 @@ public class EditDialog { int code = prepare().show(); if(code == DialogWrapper.OK_EXIT_CODE) { // Edit - DataStore.getInstance(project).processUpdate(new TranslationUpdate(origin, getChanges())); + LegacyDataStore.getInstance(project).processUpdate(new TranslationUpdate(origin, getChanges())); } else if(code == DeleteActionDescriptor.EXIT_CODE) { // Delete - DataStore.getInstance(project).processUpdate(new TranslationDelete(origin)); + LegacyDataStore.getInstance(project).processUpdate(new TranslationDelete(origin)); } } @@ -74,7 +74,7 @@ public class EditDialog { JPanel valuePanel = new JPanel(new GridLayout(0, 1, 2, 2)); valueTextFields = new HashMap<>(); - for(String locale : DataStore.getInstance(project).getTranslations().getLocales()) { + for(String locale : LegacyDataStore.getInstance(project).getTranslations().getLocales()) { JBLabel localeLabel = new JBLabel(locale); JBTextField localeText = new JBTextField(this.origin.getTranslations().get(locale)); localeLabel.setLabelFor(localeText); diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java b/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java index baad8bb..f90e753 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java @@ -5,7 +5,7 @@ import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.project.Project; import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.service.SettingsService; import org.jetbrains.annotations.NotNull; @@ -39,7 +39,7 @@ public class KeyAnnotator { searchKey = searchKey.substring(1); } - LocalizedNode node = DataStore.getInstance(project).getTranslations().getNode(searchKey); + LocalizedNode node = LegacyDataStore.getInstance(project).getTranslations().getNode(searchKey); if(node == null) { // Unknown translation. Just ignore it return; diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java b/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java index a3a10b3..7166765 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java @@ -29,7 +29,7 @@ public class KeyCompletionProvider extends CompletionProvider { @Override public void navigate(boolean requestFocus) { - LocalizedNode node = DataStore.getInstance(getProject()).getTranslations().getNode(getKey()); + LocalizedNode node = LegacyDataStore.getInstance(getProject()).getTranslations().getNode(getKey()); if(node != null) { new EditDialog(getProject(), new KeyedTranslation(getKey(), node.getValue())).showAndHandle(); diff --git a/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java b/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java index 960f6fb..377ce8a 100644 --- a/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java +++ b/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java @@ -5,7 +5,7 @@ import com.intellij.psi.*; import com.intellij.util.ProcessingContext; import de.marhali.easyi18n.editor.KeyReference; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.service.SettingsService; import org.jetbrains.annotations.NotNull; @@ -38,7 +38,7 @@ public class GenericKeyReferenceContributor extends PsiReferenceContributor { return PsiReference.EMPTY_ARRAY; } - if(DataStore.getInstance(element.getProject()).getTranslations().getNode(value) == null) { + if(LegacyDataStore.getInstance(element.getProject()).getTranslations().getNode(value) == null) { if(!KeyReference.isReferencable(value)) { // Creation policy return PsiReference.EMPTY_ARRAY; } diff --git a/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java b/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java index e871fc9..3a18c8f 100644 --- a/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java +++ b/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java @@ -6,7 +6,7 @@ import com.intellij.psi.*; import com.intellij.util.ProcessingContext; import de.marhali.easyi18n.editor.KeyReference; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.service.SettingsService; import org.jetbrains.annotations.NotNull; @@ -45,7 +45,7 @@ public class KotlinKeyReferenceContributor extends PsiReferenceContributor { return PsiReference.EMPTY_ARRAY; } - if(DataStore.getInstance(element.getProject()).getTranslations().getNode(value) == null) { + if(LegacyDataStore.getInstance(element.getProject()).getTranslations().getNode(value) == null) { return PsiReference.EMPTY_ARRAY; } diff --git a/src/main/java/de/marhali/easyi18n/model/DataSynchronizer.java b/src/main/java/de/marhali/easyi18n/model/DataSynchronizer.java index 7cc3e71..6604520 100644 --- a/src/main/java/de/marhali/easyi18n/model/DataSynchronizer.java +++ b/src/main/java/de/marhali/easyi18n/model/DataSynchronizer.java @@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable; * Interface to communicate data changes between data store and ui components. * @author marhali */ +@Deprecated public interface DataSynchronizer { /** diff --git a/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java b/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java index 8e5849b..7c00104 100644 --- a/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java +++ b/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java @@ -6,6 +6,7 @@ import java.util.Map; * Translated messages for a dedicated key. * @author marhali */ +@Deprecated // Might be deprecated public class KeyedTranslation { private String key; diff --git a/src/main/java/de/marhali/easyi18n/model/LocalizedNode.java b/src/main/java/de/marhali/easyi18n/model/LocalizedNode.java index 3c7eb2b..85376f1 100644 --- a/src/main/java/de/marhali/easyi18n/model/LocalizedNode.java +++ b/src/main/java/de/marhali/easyi18n/model/LocalizedNode.java @@ -11,6 +11,7 @@ import java.util.*; * Represents structured tree view for translated messages. * @author marhali */ +@Deprecated public class LocalizedNode { public static final String ROOT_KEY = "root"; diff --git a/src/main/java/de/marhali/easyi18n/model/Translations.java b/src/main/java/de/marhali/easyi18n/model/Translations.java index 44bd03f..8727507 100644 --- a/src/main/java/de/marhali/easyi18n/model/Translations.java +++ b/src/main/java/de/marhali/easyi18n/model/Translations.java @@ -12,6 +12,7 @@ import java.util.List; * Represents translation state instance. IO operations will be based on this file. * @author marhali */ +@Deprecated public class Translations { public static Translations empty() { diff --git a/src/main/java/de/marhali/easyi18n/service/DataStore.java b/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java similarity index 94% rename from src/main/java/de/marhali/easyi18n/service/DataStore.java rename to src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java index e0bd369..ade0046 100644 --- a/src/main/java/de/marhali/easyi18n/service/DataStore.java +++ b/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java @@ -27,9 +27,10 @@ import java.util.function.Consumer; * Factory service to manage localized messages for multiple projects at once. * @author marhali */ -public class DataStore { +@Deprecated +public class LegacyDataStore { - private static final Map INSTANCES = new WeakHashMap<>(); + private static final Map INSTANCES = new WeakHashMap<>(); private final Project project; private final List synchronizer; @@ -37,18 +38,18 @@ public class DataStore { private Translations translations; private String searchQuery; - public static DataStore getInstance(@NotNull Project project) { - DataStore store = INSTANCES.get(project); + public static LegacyDataStore getInstance(@NotNull Project project) { + LegacyDataStore store = INSTANCES.get(project); if(store == null) { - store = new DataStore(project); + store = new LegacyDataStore(project); INSTANCES.put(project, store); } return store; } - private DataStore(@NotNull Project project) { + private LegacyDataStore(@NotNull Project project) { this.project = project; this.synchronizer = new ArrayList<>(); this.translations = Translations.empty(); diff --git a/src/main/java/de/marhali/easyi18n/tabs/TableView.java b/src/main/java/de/marhali/easyi18n/tabs/TableView.java index 4b7dc31..82ae93d 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TableView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TableView.java @@ -4,7 +4,7 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.JBTable; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.model.LocalizedNode; import de.marhali.easyi18n.model.DataSynchronizer; import de.marhali.easyi18n.model.Translations; @@ -54,7 +54,7 @@ public class TableView implements DataSynchronizer { if(row >= 0) { String fullPath = String.valueOf(table.getValueAt(row, 0)); - LocalizedNode node = DataStore.getInstance(project).getTranslations().getNode(fullPath); + LocalizedNode node = LegacyDataStore.getInstance(project).getTranslations().getNode(fullPath); if(node != null) { new EditDialog(project, new KeyedTranslation(fullPath, node.getValue())).showAndHandle(); @@ -67,7 +67,7 @@ public class TableView implements DataSynchronizer { for (int selectedRow : table.getSelectedRows()) { String fullPath = String.valueOf(table.getValueAt(selectedRow, 0)); - DataStore.getInstance(project).processUpdate( + LegacyDataStore.getInstance(project).processUpdate( new TranslationDelete(new KeyedTranslation(fullPath, null))); } }; @@ -78,7 +78,7 @@ public class TableView implements DataSynchronizer { @Nullable String searchQuery, @Nullable String scrollTo) { table.setModel(new TableModelTranslator(translations, searchQuery, update -> - DataStore.getInstance(project).processUpdate(update))); + LegacyDataStore.getInstance(project).processUpdate(update))); if(scrollTo != null) { int row = -1; diff --git a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java index 95ddecb..2d0c347 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java @@ -8,7 +8,7 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.model.LocalizedNode; import de.marhali.easyi18n.model.DataSynchronizer; import de.marhali.easyi18n.model.Translations; @@ -100,7 +100,7 @@ public class TreeView implements DataSynchronizer { if(node.getUserObject() instanceof PresentationData) { String fullPath = TreeUtil.getFullPath(path); - LocalizedNode localizedNode = DataStore.getInstance(project).getTranslations().getNode(fullPath); + LocalizedNode localizedNode = LegacyDataStore.getInstance(project).getTranslations().getNode(fullPath); if(localizedNode != null) { new EditDialog(project,new KeyedTranslation(fullPath, localizedNode.getValue())).showAndHandle(); @@ -120,7 +120,7 @@ public class TreeView implements DataSynchronizer { for (TreePath path : tree.getSelectionPaths()) { String fullPath = TreeUtil.getFullPath(path); - DataStore.getInstance(project).processUpdate( + LegacyDataStore.getInstance(project).processUpdate( new TranslationDelete(new KeyedTranslation(fullPath, null))); } }; diff --git a/src/main/java/de/marhali/easyi18n/util/TranslationsUtil.java b/src/main/java/de/marhali/easyi18n/util/TranslationsUtil.java index bbe21a7..e26d4e7 100644 --- a/src/main/java/de/marhali/easyi18n/util/TranslationsUtil.java +++ b/src/main/java/de/marhali/easyi18n/util/TranslationsUtil.java @@ -11,6 +11,7 @@ import java.util.List; * Utility tool to support the translations instance * @author marhali */ +@Deprecated // SectionUtil public class TranslationsUtil { /** diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 598db67..1ad856a 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -10,7 +10,7 @@ org.jetbrains.kotlin - + Date: Tue, 2 Nov 2021 16:41:38 +0100 Subject: [PATCH 03/49] move into service package --- .../{ => service}/TranslatorToolWindowFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename src/main/java/de/marhali/easyi18n/{ => service}/TranslatorToolWindowFactory.java (88%) diff --git a/src/main/java/de/marhali/easyi18n/TranslatorToolWindowFactory.java b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java similarity index 88% rename from src/main/java/de/marhali/easyi18n/TranslatorToolWindowFactory.java rename to src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java index 161d4b4..844985a 100644 --- a/src/main/java/de/marhali/easyi18n/TranslatorToolWindowFactory.java +++ b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java @@ -1,4 +1,4 @@ -package de.marhali.easyi18n; +package de.marhali.easyi18n.service; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.project.Project; @@ -7,7 +7,7 @@ import com.intellij.openapi.wm.ToolWindowFactory; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.service.WindowManager; import de.marhali.easyi18n.action.*; import de.marhali.easyi18n.tabs.TableView; @@ -48,14 +48,14 @@ public class TranslatorToolWindowFactory implements ToolWindowFactory { actions.add(new AddAction()); actions.add(new ReloadAction()); actions.add(new SettingsAction()); - actions.add(new SearchAction((searchString) -> DataStore.getInstance(project).searchBeyKey(searchString))); + actions.add(new SearchAction((searchString) -> LegacyDataStore.getInstance(project).searchBeyKey(searchString))); toolWindow.setTitleActions(actions); // Initialize Window Manager WindowManager.getInstance().initialize(toolWindow, treeView, tableView); // Synchronize ui with underlying data - DataStore store = DataStore.getInstance(project); + LegacyDataStore store = LegacyDataStore.getInstance(project); store.addSynchronizer(treeView); store.addSynchronizer(tableView); store.synchronize(null, null); From 91c9ab14964e965575fa2d8756358b2f94c87f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Tue, 2 Nov 2021 16:42:09 +0100 Subject: [PATCH 04/49] fix import --- src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java index 1f8c46d..bf388d1 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java @@ -11,7 +11,7 @@ import com.intellij.ui.components.JBTextField; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.service.SettingsService; -import de.marhali.easyi18n.service.DataStore; +import de.marhali.easyi18n.service.LegacyDataStore; import javax.swing.*; import java.awt.*; @@ -50,7 +50,7 @@ public class SettingsDialog { state.setCodeAssistance(codeAssistanceCheckbox.isSelected()); // Reload instance - DataStore.getInstance(project).reloadFromDisk(); + LegacyDataStore.getInstance(project).reloadFromDisk(); } } From 2b36b355e4069b076adf400c97351b204e82ad34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Tue, 2 Nov 2021 16:43:13 +0100 Subject: [PATCH 05/49] introduce new event system bus --- .../java/de/marhali/easyi18n/DataBus.java | 55 +++++++++++++++++++ .../marhali/easyi18n/model/BusListener.java | 29 ++++++++++ 2 files changed, 84 insertions(+) create mode 100644 src/main/java/de/marhali/easyi18n/DataBus.java create mode 100644 src/main/java/de/marhali/easyi18n/model/BusListener.java diff --git a/src/main/java/de/marhali/easyi18n/DataBus.java b/src/main/java/de/marhali/easyi18n/DataBus.java new file mode 100644 index 0000000..56dba9b --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/DataBus.java @@ -0,0 +1,55 @@ +package de.marhali.easyi18n; + +import de.marhali.easyi18n.model.BusListener; +import de.marhali.easyi18n.model.TranslationData; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.HashSet; +import java.util.Set; + +/** + * Data-bus which is used to distribute changes regarding translations or ui tools to the participating components. + * @author marhali + */ +public class DataBus { + + private final Set listener; + + protected DataBus() { + this.listener = new HashSet<>(); + } + + /** + * Adds a participant to the event bus. Every participant needs to be added manually. + * @param listener Bus listener + */ + public void addListener(BusListener listener) { + this.listener.add(listener); + } + + /** + * Fires the called events on the returned prototype. + * The event will be distributed to all participants which were registered at execution time. + * @return Listener prototype + */ + public BusListener propagate() { + return new BusListener() { + @Override + public void onUpdateData(@NotNull TranslationData data) { + listener.forEach(li -> li.onUpdateData(data)); + } + + @Override + public void onFocusKey(@Nullable String key) { + listener.forEach(li -> li.onFocusKey(key)); + } + + @Override + public void onSearchQuery(@Nullable String query) { + listener.forEach(li -> li.onSearchQuery(query)); + } + }; + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/BusListener.java b/src/main/java/de/marhali/easyi18n/model/BusListener.java new file mode 100644 index 0000000..752dde0 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/BusListener.java @@ -0,0 +1,29 @@ +package de.marhali.easyi18n.model; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * Interface for communication of changes for participants of the data bus. + * @author marhali + */ +public interface BusListener { + /** + * Update the translations based on the supplied data. + * @param data Updated translations + */ + void onUpdateData(@NotNull TranslationData data); + + /** + * Move the specified translation key (full-key) into focus. + * @param key Absolute translation key + */ + void onFocusKey(@Nullable String key); + + /** + * Filter the displayed data according to the search query. Supply 'null' to return to the normal state. + * The keys and the content itself should be considered. + * @param query Filter key or content + */ + void onSearchQuery(@Nullable String query); +} \ No newline at end of file From 594fc82be7321459dfa17a12324879b5f40873fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Tue, 2 Nov 2021 16:45:39 +0100 Subject: [PATCH 06/49] implement new translation data holder with optimized tree structure --- .../marhali/easyi18n/model/Translation.java | 19 ++ .../easyi18n/model/TranslationData.java | 181 ++++++++++++ .../easyi18n/model/TranslationNode.java | 101 +++++++ .../de/marhali/easyi18n/util/PathUtil.java | 73 +++++ .../easyi18n/util/TranslationBuilder.java | 30 ++ .../marhali/easyi18n/TranslationDataTest.java | 271 ++++++++++++++++++ 6 files changed, 675 insertions(+) create mode 100644 src/main/java/de/marhali/easyi18n/model/Translation.java create mode 100644 src/main/java/de/marhali/easyi18n/model/TranslationData.java create mode 100644 src/main/java/de/marhali/easyi18n/model/TranslationNode.java create mode 100644 src/main/java/de/marhali/easyi18n/util/PathUtil.java create mode 100644 src/main/java/de/marhali/easyi18n/util/TranslationBuilder.java create mode 100644 src/test/java/de/marhali/easyi18n/TranslationDataTest.java diff --git a/src/main/java/de/marhali/easyi18n/model/Translation.java b/src/main/java/de/marhali/easyi18n/model/Translation.java new file mode 100644 index 0000000..2870837 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/Translation.java @@ -0,0 +1,19 @@ +package de.marhali.easyi18n.model; + +import java.util.HashMap; + +/** + * Represents all translations for an element. The assignment to an element is done in the using class. + * This class contains only the translations for this unspecific element. + * @author marhali + */ +public class Translation extends HashMap { + public Translation() { + super(); + } + + @Override + public String toString() { + return super.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationData.java b/src/main/java/de/marhali/easyi18n/model/TranslationData.java new file mode 100644 index 0000000..a399ca5 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/TranslationData.java @@ -0,0 +1,181 @@ +package de.marhali.easyi18n.model; + +import de.marhali.easyi18n.util.PathUtil; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.*; + +/** + * Cached translation data. The data is stored in a tree structure. + * Tree behaviour (sorted, non-sorted) can be specified via constructor. + * For more please see {@link TranslationNode}. Example tree view: + * + * ################################# + * # - user: # + * # - principal: 'Principal' # + * # - username: # + * # - title: 'Username' # + * # - auth: # + * # - logout: 'Logout' # + * # - login: 'Login' # + * ################################# + * + * @author marhali + */ +public class TranslationData { + + private final PathUtil pathUtil; + + @NotNull + private final Set locales; + + @NotNull + private final TranslationNode rootNode; + + /** + * Creates an empty instance. + * @param sort Should the translation keys be sorted alphabetically + */ + public TranslationData(boolean sort, boolean nestKeys) { + this(nestKeys, new HashSet<>(), new TranslationNode(sort ? new TreeMap<>() : new LinkedHashMap<>())); + } + + /** + * @param nestKeys Apply key nesting. See {@link PathUtil} + * @param locales Languages which can be used for translation + * @param rootNode Translation tree structure + */ + public TranslationData(boolean nestKeys, @NotNull Set locales, @NotNull TranslationNode rootNode) { + this.pathUtil = new PathUtil(nestKeys); + this.locales = locales; + this.rootNode = rootNode; + } + + /** + * @return Set of languages which can receive translations + */ + public @NotNull Set getLocales() { + return this.locales; + } + + /** + * @return root node which contains all translations + */ + public @NotNull TranslationNode getRootNode() { + return this.rootNode; + } + + /** + * @param fullPath Absolute translation path + * @return Translation node which leads to translations or nested child's + */ + public @Nullable TranslationNode getNode(@NotNull String fullPath) { + List sections = this.pathUtil.split(fullPath); + TranslationNode node = this.rootNode; + + if(fullPath.isEmpty()) { // Return root node if empty path was supplied + return node; + } + + for(String section : sections) { + if(node == null) { + return null; + } + node = node.getChildren().get(section); + } + + return node; + } + + /** + * @param fullPath Absolute translation key path + * @return Found translation. Can be null if path is empty or is not a leaf element + */ + public @Nullable Translation getTranslation(@NotNull String fullPath) { + TranslationNode node = this.getNode(fullPath); + + if(node == null || !node.isLeaf()) { + return null; + } + + return node.getValue(); + } + + /** + * @param fullPath Absolute translation key path + * @param translation Translation to set. Can be null to delete the corresponding node + */ + public void setTranslation(@NotNull String fullPath, @Nullable Translation translation) throws Exception { + List sections = this.pathUtil.split(fullPath); + String nodeKey = sections.remove(sections.size() - 1); // Edge case last section + TranslationNode node = this.rootNode; + + if(fullPath.isEmpty()) { + throw new IllegalArgumentException("Path cannot be empty"); + } + + for(String section : sections) { // Go to the level of the key (@nodeKey) + TranslationNode childNode = node.getChildren().get(section); + + if(childNode == null) { + if(translation == null) { // Path should not be empty for delete + throw new IllegalArgumentException("Delete action on empty path"); + } + + // Created nested section + childNode = node.addChildren(section); + } + + node = childNode; + } + + if(translation == null) { // Delete + node.removeChildren(nodeKey); + + if(node.getChildren().isEmpty() && !node.isRoot()) { // Parent is empty now. Run delete recursively + this.setTranslation(this.pathUtil.concat(sections), null); + } + + } else { // Create or overwrite + node.addChildren(nodeKey, translation); + } + } + + /** + * @return All translation keys as absolute paths (full-key) + */ + public @NotNull Set getFullKeys() { + return this.getFullKeys("", this.rootNode); // Just use root node + } + + /** + * @param parentPath Parent key path + * @param node Node section to begin with + * @return All translation keys where the path contains the specified @parentPath + */ + public @NotNull Set getFullKeys(String parentPath, TranslationNode node) { + Set keys = new LinkedHashSet<>(); + + if(node.isLeaf()) { // This node does not lead to child's - just add the key + keys.add(parentPath); + } + + for(Map.Entry children : node.getChildren().entrySet()) { + keys.addAll(this.getFullKeys(this.pathUtil.append(parentPath, children.getKey()), children.getValue())); + } + + return keys; + } + + @Override + public String toString() { + return "TranslationData{" + + "mapClass=" + rootNode.getChildren().getClass().getSimpleName() + + ", pathUtil=" + pathUtil + + ", locales=" + locales + + ", rootNode=" + rootNode + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationNode.java b/src/main/java/de/marhali/easyi18n/model/TranslationNode.java new file mode 100644 index 0000000..4056598 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/TranslationNode.java @@ -0,0 +1,101 @@ +package de.marhali.easyi18n.model; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Map; + +/** + * Translation tree node. Manages child nodes which can be translations or also + * nodes which can lead to another translation or node. + * Navigation inside a node can be upward and downward. To construct the full + * translation key (full-key) every parent needs to be resolved recursively. + * - + * Whether the children nodes should be sorted is determined by the parent node. + * For root nodes (empty parent) the {@link java.util.Map}-Type must be specified + * to determine which sorting should be applied. + * + * @author marhali + */ +public class TranslationNode { + + @Nullable + private TranslationNode parent; + + @NotNull + private Map children; + + @NotNull + private Translation value; + + /** + * Root node initializer. E.g. see {@link java.util.TreeMap} or {@link java.util.HashMap} + * @param children Decide which implementation should be used (sorted, non-sorted) + */ + public TranslationNode(@NotNull Map children) { + this.parent = null; + this.children = children; + this.value = new Translation(); + } + + /** + * @return true if this node is considered as root node + */ + public boolean isRoot() { + return this.parent == null; + } + + /** + * @return true if this node does not lead to other children nodes (just contains {@link Translation} itself). + * The root node is never treated as a leaf node. + */ + public boolean isLeaf() { + return this.children.isEmpty() && !this.isRoot(); + } + + public void setParent(@Nullable TranslationNode parent) { + this.parent = parent; + } + + public @NotNull Translation getValue() { + return value; + } + + public void setValue(@NotNull Translation value) { + this.children.clear(); + this.value = value; + } + + public @NotNull Map getChildren() { + return this.children; + } + + public void addChildren(@NotNull String key, @NotNull TranslationNode node) { + node.setParent(this); // Track parent if adding children's + this.value.clear(); + this.children.put(key, node); + } + + public TranslationNode addChildren(@NotNull String key) throws Exception { + TranslationNode node = new TranslationNode(this.children.getClass().getDeclaredConstructor().newInstance()); + this.addChildren(key, node); + return node; + } + + public void addChildren(@NotNull String key, @NotNull Translation translation) throws Exception { + this.addChildren(key).setValue(translation); + } + + public void removeChildren(@NotNull String key) { + this.children.remove(key); + } + + @Override + public String toString() { + return "TranslationNode{" + + "parent=" + parent + + ", children=" + children.keySet() + + ", value=" + value + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/util/PathUtil.java b/src/main/java/de/marhali/easyi18n/util/PathUtil.java new file mode 100644 index 0000000..64aee8e --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/util/PathUtil.java @@ -0,0 +1,73 @@ +package de.marhali.easyi18n.util; + +import de.marhali.easyi18n.service.SettingsService; + +import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * Utility tool for split and merge translation key paths. + * Some i18n implementations require to NOT nest the translation keys. + * This util takes care of this and checks the configured setting for this case. + * @author marhali + */ +public class PathUtil { + + public static final char DELIMITER = '.'; + + private final boolean nestKeys; + + public PathUtil(boolean nestKeys) { + this.nestKeys = nestKeys; + } + + public PathUtil(Project project) { + this.nestKeys = SettingsService.getInstance(project).getState().isNestedKeys(); + } + + public @NotNull List split(@NotNull String path) { + // Does not contain any sections or key nesting is disabled + if(!path.contains(String.valueOf(DELIMITER)) || !nestKeys) { + return new ArrayList<>(Collections.singletonList(path)); + } + + return new ArrayList<>(Arrays.asList(path.split("\\" + DELIMITER))); + } + + public @NotNull String concat(@NotNull List sections) { + StringBuilder builder = new StringBuilder(); + + // For disabled key nesting this should be only one section + for(String section : sections) { + if(builder.length() > 0) { + builder.append(DELIMITER); + } + + builder.append(section); + } + + return builder.toString(); + } + + public @NotNull String append(@NotNull String parentPath, @NotNull String children) { + StringBuilder builder = new StringBuilder(parentPath); + + if(builder.length() > 0) { // Only add delimiter between parent and child if parent is NOT empty + builder.append(DELIMITER); + } + + return builder.append(children).toString(); + } + + @Override + public String toString() { + return "PathUtil{" + + "nestKeys=" + nestKeys + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/util/TranslationBuilder.java b/src/main/java/de/marhali/easyi18n/util/TranslationBuilder.java new file mode 100644 index 0000000..21adf1e --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/util/TranslationBuilder.java @@ -0,0 +1,30 @@ +package de.marhali.easyi18n.util; + +import de.marhali.easyi18n.model.Translation; + +/** + * Translation builder utility. + * @author marhali + */ +public class TranslationBuilder { + + private Translation translation; + + public TranslationBuilder() { + this.translation = new Translation(); + } + + public TranslationBuilder(String locale, String content) { + this(); + this.translation.put(locale, content); + } + + public TranslationBuilder add(String locale, String content) { + this.translation.put(locale, content); + return this; + } + + public Translation build() { + return this.translation; + } +} \ No newline at end of file diff --git a/src/test/java/de/marhali/easyi18n/TranslationDataTest.java b/src/test/java/de/marhali/easyi18n/TranslationDataTest.java new file mode 100644 index 0000000..111a7e8 --- /dev/null +++ b/src/test/java/de/marhali/easyi18n/TranslationDataTest.java @@ -0,0 +1,271 @@ +package de.marhali.easyi18n; + +import de.marhali.easyi18n.model.Translation; +import de.marhali.easyi18n.model.TranslationData; +import de.marhali.easyi18n.model.TranslationNode; +import de.marhali.easyi18n.util.TranslationBuilder; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.*; + +/** + * Unit tests for {@link TranslationData} in combination with {@link TranslationNode} + * @author marhali + */ +public class TranslationDataTest { + + private final int numOfTranslations = 18; + + private void addTranslations(TranslationData data) throws Exception { + data.setTranslation("zulu", new TranslationBuilder("en", "test").build()); + data.setTranslation("gamma", new TranslationBuilder("en", "test").build()); + + data.setTranslation("foxtrot.super.long.key", new TranslationBuilder("en", "test").build()); + + data.setTranslation("bravo.b", new TranslationBuilder("en", "test").build()); + data.setTranslation("bravo.c", new TranslationBuilder("en", "test").build()); + data.setTranslation("bravo.a", new TranslationBuilder("en", "test").build()); + data.setTranslation("bravo.d", new TranslationBuilder("en", "test").build()); + data.setTranslation("bravo.long.bravo", new TranslationBuilder("en", "test").build()); + data.setTranslation("bravo.long.charlie.a", new TranslationBuilder("en", "test").build()); + data.setTranslation("bravo.long.alpha", new TranslationBuilder("en", "test").build()); + + data.setTranslation("alpha.b", new TranslationBuilder("en", "test").build()); + data.setTranslation("alpha.c", new TranslationBuilder("en", "test").build()); + data.setTranslation("alpha.a", new TranslationBuilder("en", "test").build()); + data.setTranslation("alpha.d", new TranslationBuilder("en", "test").build()); + + data.setTranslation("charlie.b", new TranslationBuilder("en", "test").build()); + data.setTranslation("charlie.c", new TranslationBuilder("en", "test").build()); + data.setTranslation("charlie.a", new TranslationBuilder("en", "test").build()); + data.setTranslation("charlie.d", new TranslationBuilder("en", "test").build()); + } + + @Test + public void testKeySorting() throws Exception { + TranslationData data = new TranslationData(true, true); + this.addTranslations(data); + + Set expectation = new LinkedHashSet<>(Arrays.asList( + "alpha.a", "alpha.b", "alpha.c", "alpha.d", + "bravo.a", "bravo.b", "bravo.c", "bravo.d", + "bravo.long.alpha", "bravo.long.bravo", "bravo.long.charlie.a", + "charlie.a", "charlie.b", "charlie.c", "charlie.d", + "foxtrot.super.long.key", + "gamma", + "zulu" + )); + + Assert.assertEquals(data.getFullKeys(), expectation); + } + + @Test + public void testKeyUnordered() throws Exception { + TranslationData data = new TranslationData(false, true); + this.addTranslations(data); + + Set expectation = new LinkedHashSet<>(Arrays.asList( + "zulu", + "gamma", + "foxtrot.super.long.key", + "bravo.b", "bravo.c", "bravo.a", "bravo.d", + "bravo.long.bravo", "bravo.long.charlie.a", "bravo.long.alpha", + "alpha.b", "alpha.c", "alpha.a", "alpha.d", + "charlie.b", "charlie.c", "charlie.a", "charlie.d" + )); + + Assert.assertEquals(data.getFullKeys(), expectation); + } + + @Test + public void testKeyNesting() throws Exception { + TranslationData data = new TranslationData(true, true); + + data.setTranslation("nested.alpha", new TranslationBuilder("en", "test").build()); + data.setTranslation("nested.bravo", new TranslationBuilder("en", "test").build()); + data.setTranslation("other.alpha", new TranslationBuilder("en", "test").build()); + data.setTranslation("other.bravo", new TranslationBuilder("en", "test").build()); + + Assert.assertEquals(data.getRootNode().getChildren().size(), 2); + + for(TranslationNode node : data.getRootNode().getChildren().values()) { + Assert.assertFalse(node.isLeaf()); + } + } + + @Test + public void testKeyNonNested() throws Exception { + TranslationData data = new TranslationData(true, false); + this.addTranslations(data); + + Assert.assertEquals(data.getRootNode().getChildren().size(), this.numOfTranslations); + + for(TranslationNode node : data.getRootNode().getChildren().values()) { + Assert.assertTrue(node.isLeaf()); + } + } + + @Test + public void testDeleteNested() throws Exception { + TranslationData data = new TranslationData(true, true); + + Translation value = new TranslationBuilder("en", "test").build(); + + data.setTranslation("alpha", value); + data.setTranslation("nested.alpha", value); + data.setTranslation("nested.long.bravo", value); + + Assert.assertEquals(data.getFullKeys().size(), 3); + + data.setTranslation("alpha", null); + data.setTranslation("nested.alpha", null); + data.setTranslation("nested.long.bravo", null); + + Assert.assertEquals(data.getFullKeys().size(), 0); + Assert.assertNull(data.getTranslation("alpha")); + Assert.assertNull(data.getTranslation("nested.alpha")); + Assert.assertNull(data.getTranslation("nested.long.bravo")); + } + + @Test + public void testDeleteNonNested() throws Exception { + TranslationData data = new TranslationData(true, false); + + Translation value = new TranslationBuilder("en", "test").build(); + + data.setTranslation("alpha", value); + data.setTranslation("nested.alpha", value); + data.setTranslation("nested.long.bravo", value); + + Assert.assertEquals(data.getFullKeys().size(), 3); + + data.setTranslation("alpha", null); + data.setTranslation("nested.alpha", null); + data.setTranslation("nested.long.bravo", null); + + Assert.assertEquals(data.getFullKeys().size(), 0); + Assert.assertNull(data.getTranslation("alpha")); + Assert.assertNull(data.getTranslation("nested.alpha")); + Assert.assertNull(data.getTranslation("nested.long.bravo")); + } + + @Test + public void testRecurseDeleteNonNested() throws Exception { + TranslationData data = new TranslationData(true, false); + this.addTranslations(data); + + data.setTranslation("foxtrot.super.long.key", null); + + Assert.assertNull(data.getTranslation("foxtrot.super.long.key")); + Assert.assertNull(data.getRootNode().getChildren().get("foxtrot")); + } + + @Test + public void testRecurseDeleteNested() throws Exception { + TranslationData data = new TranslationData(true, true); + this.addTranslations(data); + + data.setTranslation("foxtrot.super.long.key", null); + + Assert.assertNull(data.getTranslation("foxtrot.super.long.key")); + Assert.assertNull(data.getRootNode().getChildren().get("foxtrot")); + } + + @Test + public void testOverwriteNonNested() throws Exception { + TranslationData data = new TranslationData(true, false); + + Translation before = new TranslationBuilder("en", "before").build(); + Translation after = new TranslationBuilder("en", "after").build(); + + data.setTranslation("alpha", before); + data.setTranslation("nested.alpha", before); + data.setTranslation("nested.long.bravo", before); + + Assert.assertEquals(data.getTranslation("alpha"), before); + Assert.assertEquals(data.getTranslation("alpha"), before); + Assert.assertEquals(data.getTranslation("alpha"), before); + + data.setTranslation("alpha", after); + data.setTranslation("nested.alpha", after); + data.setTranslation("nested.long.bravo", after); + + Assert.assertEquals(data.getTranslation("alpha"), after); + Assert.assertEquals(data.getTranslation("alpha"), after); + Assert.assertEquals(data.getTranslation("alpha"), after); + } + + @Test + public void testOverwriteNested() throws Exception { + TranslationData data = new TranslationData(true, true); + + Translation before = new TranslationBuilder("en", "before").build(); + Translation after = new TranslationBuilder("en", "after").build(); + + data.setTranslation("alpha", before); + data.setTranslation("nested.alpha", before); + data.setTranslation("nested.long.bravo", before); + + Assert.assertEquals(data.getTranslation("alpha"), before); + Assert.assertEquals(data.getTranslation("alpha"), before); + Assert.assertEquals(data.getTranslation("alpha"), before); + + data.setTranslation("alpha", after); + data.setTranslation("nested.alpha", after); + data.setTranslation("nested.long.bravo", after); + + Assert.assertEquals(data.getTranslation("alpha"), after); + Assert.assertEquals(data.getTranslation("alpha"), after); + Assert.assertEquals(data.getTranslation("alpha"), after); + } + + @Test + public void testRecurseTransformNested() throws Exception { + TranslationData data = new TranslationData(true, true); + + Translation value = new TranslationBuilder("en", "test").build(); + + data.setTranslation("alpha.nested.key", value); + data.setTranslation("alpha.other", value); + data.setTranslation("bravo", value); + + Assert.assertEquals(data.getFullKeys().size(), 3); + + data.setTranslation("alpha.nested", value); + data.setTranslation("alpha.other.new", value); + data.setTranslation("bravo", null); + + Assert.assertEquals(data.getFullKeys().size(), 2); + Assert.assertNull(data.getTranslation("alpha.nested.key")); + Assert.assertNull(data.getTranslation("alpha.other")); + Assert.assertNull(data.getTranslation("bravo")); + Assert.assertEquals(data.getTranslation("alpha.nested"), value); + Assert.assertEquals(data.getTranslation("alpha.other.new"), value); + } + + @Test + public void testRecurseTransformNonNested() throws Exception { + TranslationData data = new TranslationData(true, false); + + Translation value = new TranslationBuilder("en", "test").build(); + + data.setTranslation("alpha.nested.key", value); + data.setTranslation("alpha.other", value); + data.setTranslation("bravo", value); + + Assert.assertEquals(data.getFullKeys().size(), 3); + + data.setTranslation("alpha.nested", value); + data.setTranslation("alpha.other.new", value); + data.setTranslation("bravo", null); + + Assert.assertEquals(data.getFullKeys().size(), 4); + Assert.assertNull(data.getTranslation("bravo")); + Assert.assertEquals(data.getTranslation("alpha.nested.key"), value); + Assert.assertEquals(data.getTranslation("alpha.other"), value); + Assert.assertEquals(data.getTranslation("alpha.nested"), value); + Assert.assertEquals(data.getTranslation("alpha.other.new"), value); + } +} \ No newline at end of file From d2d8ef4cb49520719d3eb6d8ed9829f0952420c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Wed, 3 Nov 2021 11:06:28 +0100 Subject: [PATCH 07/49] optimize javadoc --- .../easyi18n/model/TranslationData.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationData.java b/src/main/java/de/marhali/easyi18n/model/TranslationData.java index a399ca5..0b10263 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationData.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationData.java @@ -11,16 +11,14 @@ import java.util.*; * Cached translation data. The data is stored in a tree structure. * Tree behaviour (sorted, non-sorted) can be specified via constructor. * For more please see {@link TranslationNode}. Example tree view: - * - * ################################# - * # - user: # - * # - principal: 'Principal' # - * # - username: # - * # - title: 'Username' # - * # - auth: # - * # - logout: 'Logout' # - * # - login: 'Login' # - * ################################# + *
+ * user:
+ * -- principal: 'Principal'
+ * -- username:
+ * -- -- title: 'Username'
+ * auth:
+ * -- logout: 'Logout'
+ * -- login: 'Login'
* * @author marhali */ From 356038f9874d6c0102501d77e83cc9a3add63806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Wed, 3 Nov 2021 11:07:04 +0100 Subject: [PATCH 08/49] create new interface for io operations --- .../de/marhali/easyi18n/io/IOStrategy.java | 51 +++++++++++++++++++ .../de/marhali/easyi18n/io/TranslatorIO.java | 1 + 2 files changed, 52 insertions(+) create mode 100644 src/main/java/de/marhali/easyi18n/io/IOStrategy.java diff --git a/src/main/java/de/marhali/easyi18n/io/IOStrategy.java b/src/main/java/de/marhali/easyi18n/io/IOStrategy.java new file mode 100644 index 0000000..0826024 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/IOStrategy.java @@ -0,0 +1,51 @@ +package de.marhali.easyi18n.io; + +import com.intellij.openapi.project.Project; + +import de.marhali.easyi18n.model.SettingsState; +import de.marhali.easyi18n.model.TranslationData; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.function.Consumer; + +/** + * Primary interface for the exchange of translation data with the underlying IO system. + * The selection of the right IO strategy is done by the @canUse method (first match). + * Every strategy needs to be registered inside {@link de.marhali.easyi18n.DataStore} + * + * @author marhali + */ +public interface IOStrategy { + /** + * Decides whether this strategy should be applied or not. First matching one will be used. + * @param project IntelliJ project context + * @param localesPath Root directory which leads to all i18n files + * @param state Plugin configuration + * @return true if strategy is responsible for the found structure + */ + boolean canUse(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state); + + /** + * Loads the translation files and passes them in the result consumer. + * Result payload might be null if operation failed. + * @param project IntelliJ project context + * @param localesPath Root directory which leads to all i18n files + * @param state Plugin configuration + * @param result Passes loaded data + */ + void read(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state, + @NotNull Consumer<@Nullable TranslationData> result); + + /** + * Writes the provided translation data to the IO system. + * @param project InteliJ project context + * @param localesPath Root directory which leads to all i18n files + * @param state Plugin configuration + * @param data Translations to save + * @param result Indicates whether the operation was successful + */ + void write(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state, + @NotNull TranslationData data, @NotNull Consumer result); +} diff --git a/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java index 91a40d1..1d18872 100644 --- a/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java +++ b/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java @@ -13,6 +13,7 @@ import java.util.function.Consumer; * Can be implemented by various standards. Such as JSON, Properties-Bundle and so on. * @author marhali */ +@Deprecated public interface TranslatorIO { /** From 15db7423ed1745fe1ce35f99b43165b9aa117825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 10:15:09 +0100 Subject: [PATCH 09/49] deprecate legacy files --- src/main/java/de/marhali/easyi18n/util/IOUtil.java | 1 + src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java | 1 + src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/de/marhali/easyi18n/util/IOUtil.java b/src/main/java/de/marhali/easyi18n/util/IOUtil.java index ac569b6..a83629d 100644 --- a/src/main/java/de/marhali/easyi18n/util/IOUtil.java +++ b/src/main/java/de/marhali/easyi18n/util/IOUtil.java @@ -15,6 +15,7 @@ import java.io.File; * IO operations utility. * @author marhali */ +@Deprecated public class IOUtil { /** diff --git a/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java index 2360e22..c13e57c 100644 --- a/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java +++ b/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java @@ -13,6 +13,7 @@ import java.util.regex.Pattern; * Utility methods for simple array support. * @author marhali */ +@Deprecated public abstract class ArrayUtil { static final String PREFIX = "!arr["; diff --git a/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java index d61969c..8905c1f 100644 --- a/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java +++ b/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java @@ -7,6 +7,7 @@ import com.google.gson.JsonElement; * Utility methods to read and write json arrays. * @author marhali */ +@Deprecated public class JsonArrayUtil extends ArrayUtil { public static String read(JsonArray array) { return read(array.iterator(), JsonElement::getAsString); From 94d63b88d3f9523ded2c0f4b935dfc8e91a92389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 10:15:34 +0100 Subject: [PATCH 10/49] add builtin translation builder --- .../marhali/easyi18n/model/Translation.java | 10 +++++++ .../easyi18n/util/TranslationBuilder.java | 30 ------------------- 2 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 src/main/java/de/marhali/easyi18n/util/TranslationBuilder.java diff --git a/src/main/java/de/marhali/easyi18n/model/Translation.java b/src/main/java/de/marhali/easyi18n/model/Translation.java index 2870837..3237813 100644 --- a/src/main/java/de/marhali/easyi18n/model/Translation.java +++ b/src/main/java/de/marhali/easyi18n/model/Translation.java @@ -12,6 +12,16 @@ public class Translation extends HashMap { super(); } + public Translation(String locale, String content) { + this(); + super.put(locale, content); + } + + public Translation add(String locale, String content) { + super.put(locale, content); + return this; + } + @Override public String toString() { return super.toString(); diff --git a/src/main/java/de/marhali/easyi18n/util/TranslationBuilder.java b/src/main/java/de/marhali/easyi18n/util/TranslationBuilder.java deleted file mode 100644 index 21adf1e..0000000 --- a/src/main/java/de/marhali/easyi18n/util/TranslationBuilder.java +++ /dev/null @@ -1,30 +0,0 @@ -package de.marhali.easyi18n.util; - -import de.marhali.easyi18n.model.Translation; - -/** - * Translation builder utility. - * @author marhali - */ -public class TranslationBuilder { - - private Translation translation; - - public TranslationBuilder() { - this.translation = new Translation(); - } - - public TranslationBuilder(String locale, String content) { - this(); - this.translation.put(locale, content); - } - - public TranslationBuilder add(String locale, String content) { - this.translation.put(locale, content); - return this; - } - - public Translation build() { - return this.translation; - } -} \ No newline at end of file From 4513570a5ded8905a5dce12f7b5fe0880f3a8aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 10:18:52 +0100 Subject: [PATCH 11/49] handle exception inside method --- .../easyi18n/model/TranslationNode.java | 29 +++++-- .../marhali/easyi18n/TranslationDataTest.java | 87 +++++++++---------- 2 files changed, 65 insertions(+), 51 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationNode.java b/src/main/java/de/marhali/easyi18n/model/TranslationNode.java index 4056598..0ed69a0 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationNode.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationNode.java @@ -70,20 +70,35 @@ public class TranslationNode { return this.children; } - public void addChildren(@NotNull String key, @NotNull TranslationNode node) { + public void setChildren(@NotNull String key, @NotNull TranslationNode node) { node.setParent(this); // Track parent if adding children's this.value.clear(); this.children.put(key, node); } - public TranslationNode addChildren(@NotNull String key) throws Exception { - TranslationNode node = new TranslationNode(this.children.getClass().getDeclaredConstructor().newInstance()); - this.addChildren(key, node); - return node; + public @NotNull TranslationNode setChildren(@NotNull String key) { + try { + TranslationNode node = new TranslationNode(this.children.getClass().getDeclaredConstructor().newInstance()); + this.setChildren(key, node); + return node; + } catch(Exception e) { + e.printStackTrace(); + throw new RuntimeException("Cannot create children of map type " + this.children.getClass().getSimpleName()); + } } - public void addChildren(@NotNull String key, @NotNull Translation translation) throws Exception { - this.addChildren(key).setValue(translation); + public void setChildren(@NotNull String key, @NotNull Translation translation) { + this.setChildren(key).setValue(translation); + } + + public @NotNull TranslationNode getOrCreateChildren(@NotNull String key) { + TranslationNode node = this.children.get(key); + + if(node == null) { + node = this.setChildren(key); + } + + return node; } public void removeChildren(@NotNull String key) { diff --git a/src/test/java/de/marhali/easyi18n/TranslationDataTest.java b/src/test/java/de/marhali/easyi18n/TranslationDataTest.java index 111a7e8..7e09eed 100644 --- a/src/test/java/de/marhali/easyi18n/TranslationDataTest.java +++ b/src/test/java/de/marhali/easyi18n/TranslationDataTest.java @@ -3,7 +3,6 @@ package de.marhali.easyi18n; import de.marhali.easyi18n.model.Translation; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationNode; -import de.marhali.easyi18n.util.TranslationBuilder; import org.junit.Assert; import org.junit.Test; @@ -18,33 +17,33 @@ public class TranslationDataTest { private final int numOfTranslations = 18; - private void addTranslations(TranslationData data) throws Exception { - data.setTranslation("zulu", new TranslationBuilder("en", "test").build()); - data.setTranslation("gamma", new TranslationBuilder("en", "test").build()); + private void addTranslations(TranslationData data) { + data.setTranslation("zulu", new Translation("en", "test")); + data.setTranslation("gamma", new Translation("en", "test")); - data.setTranslation("foxtrot.super.long.key", new TranslationBuilder("en", "test").build()); + data.setTranslation("foxtrot.super.long.key", new Translation("en", "test")); - data.setTranslation("bravo.b", new TranslationBuilder("en", "test").build()); - data.setTranslation("bravo.c", new TranslationBuilder("en", "test").build()); - data.setTranslation("bravo.a", new TranslationBuilder("en", "test").build()); - data.setTranslation("bravo.d", new TranslationBuilder("en", "test").build()); - data.setTranslation("bravo.long.bravo", new TranslationBuilder("en", "test").build()); - data.setTranslation("bravo.long.charlie.a", new TranslationBuilder("en", "test").build()); - data.setTranslation("bravo.long.alpha", new TranslationBuilder("en", "test").build()); + data.setTranslation("bravo.b", new Translation("en", "test")); + data.setTranslation("bravo.c", new Translation("en", "test")); + data.setTranslation("bravo.a", new Translation("en", "test")); + data.setTranslation("bravo.d", new Translation("en", "test")); + data.setTranslation("bravo.long.bravo", new Translation("en", "test")); + data.setTranslation("bravo.long.charlie.a", new Translation("en", "test")); + data.setTranslation("bravo.long.alpha", new Translation("en", "test")); - data.setTranslation("alpha.b", new TranslationBuilder("en", "test").build()); - data.setTranslation("alpha.c", new TranslationBuilder("en", "test").build()); - data.setTranslation("alpha.a", new TranslationBuilder("en", "test").build()); - data.setTranslation("alpha.d", new TranslationBuilder("en", "test").build()); + data.setTranslation("alpha.b", new Translation("en", "test")); + data.setTranslation("alpha.c", new Translation("en", "test")); + data.setTranslation("alpha.a", new Translation("en", "test")); + data.setTranslation("alpha.d", new Translation("en", "test")); - data.setTranslation("charlie.b", new TranslationBuilder("en", "test").build()); - data.setTranslation("charlie.c", new TranslationBuilder("en", "test").build()); - data.setTranslation("charlie.a", new TranslationBuilder("en", "test").build()); - data.setTranslation("charlie.d", new TranslationBuilder("en", "test").build()); + data.setTranslation("charlie.b", new Translation("en", "test")); + data.setTranslation("charlie.c", new Translation("en", "test")); + data.setTranslation("charlie.a", new Translation("en", "test")); + data.setTranslation("charlie.d", new Translation("en", "test")); } @Test - public void testKeySorting() throws Exception { + public void testKeySorting() { TranslationData data = new TranslationData(true, true); this.addTranslations(data); @@ -62,7 +61,7 @@ public class TranslationDataTest { } @Test - public void testKeyUnordered() throws Exception { + public void testKeyUnordered() { TranslationData data = new TranslationData(false, true); this.addTranslations(data); @@ -80,13 +79,13 @@ public class TranslationDataTest { } @Test - public void testKeyNesting() throws Exception { + public void testKeyNesting() { TranslationData data = new TranslationData(true, true); - data.setTranslation("nested.alpha", new TranslationBuilder("en", "test").build()); - data.setTranslation("nested.bravo", new TranslationBuilder("en", "test").build()); - data.setTranslation("other.alpha", new TranslationBuilder("en", "test").build()); - data.setTranslation("other.bravo", new TranslationBuilder("en", "test").build()); + data.setTranslation("nested.alpha", new Translation("en", "test")); + data.setTranslation("nested.bravo", new Translation("en", "test")); + data.setTranslation("other.alpha", new Translation("en", "test")); + data.setTranslation("other.bravo", new Translation("en", "test")); Assert.assertEquals(data.getRootNode().getChildren().size(), 2); @@ -96,7 +95,7 @@ public class TranslationDataTest { } @Test - public void testKeyNonNested() throws Exception { + public void testKeyNonNested() { TranslationData data = new TranslationData(true, false); this.addTranslations(data); @@ -108,10 +107,10 @@ public class TranslationDataTest { } @Test - public void testDeleteNested() throws Exception { + public void testDeleteNested() { TranslationData data = new TranslationData(true, true); - Translation value = new TranslationBuilder("en", "test").build(); + Translation value = new Translation("en", "test"); data.setTranslation("alpha", value); data.setTranslation("nested.alpha", value); @@ -130,10 +129,10 @@ public class TranslationDataTest { } @Test - public void testDeleteNonNested() throws Exception { + public void testDeleteNonNested() { TranslationData data = new TranslationData(true, false); - Translation value = new TranslationBuilder("en", "test").build(); + Translation value = new Translation("en", "test"); data.setTranslation("alpha", value); data.setTranslation("nested.alpha", value); @@ -152,7 +151,7 @@ public class TranslationDataTest { } @Test - public void testRecurseDeleteNonNested() throws Exception { + public void testRecurseDeleteNonNested() { TranslationData data = new TranslationData(true, false); this.addTranslations(data); @@ -163,7 +162,7 @@ public class TranslationDataTest { } @Test - public void testRecurseDeleteNested() throws Exception { + public void testRecurseDeleteNested() { TranslationData data = new TranslationData(true, true); this.addTranslations(data); @@ -174,11 +173,11 @@ public class TranslationDataTest { } @Test - public void testOverwriteNonNested() throws Exception { + public void testOverwriteNonNested() { TranslationData data = new TranslationData(true, false); - Translation before = new TranslationBuilder("en", "before").build(); - Translation after = new TranslationBuilder("en", "after").build(); + Translation before = new Translation("en", "before"); + Translation after = new Translation("en", "after"); data.setTranslation("alpha", before); data.setTranslation("nested.alpha", before); @@ -198,11 +197,11 @@ public class TranslationDataTest { } @Test - public void testOverwriteNested() throws Exception { + public void testOverwriteNested() { TranslationData data = new TranslationData(true, true); - Translation before = new TranslationBuilder("en", "before").build(); - Translation after = new TranslationBuilder("en", "after").build(); + Translation before = new Translation("en", "before"); + Translation after = new Translation("en", "after"); data.setTranslation("alpha", before); data.setTranslation("nested.alpha", before); @@ -222,10 +221,10 @@ public class TranslationDataTest { } @Test - public void testRecurseTransformNested() throws Exception { + public void testRecurseTransformNested() { TranslationData data = new TranslationData(true, true); - Translation value = new TranslationBuilder("en", "test").build(); + Translation value = new Translation("en", "test"); data.setTranslation("alpha.nested.key", value); data.setTranslation("alpha.other", value); @@ -246,10 +245,10 @@ public class TranslationDataTest { } @Test - public void testRecurseTransformNonNested() throws Exception { + public void testRecurseTransformNonNested() { TranslationData data = new TranslationData(true, false); - Translation value = new TranslationBuilder("en", "test").build(); + Translation value = new Translation("en", "test"); data.setTranslation("alpha.nested.key", value); data.setTranslation("alpha.other", value); From 4da585c64209edfadf644622937e46b83a47eb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 10:20:03 +0100 Subject: [PATCH 12/49] implement addLocale method and clarify children methods --- .../de/marhali/easyi18n/model/TranslationData.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationData.java b/src/main/java/de/marhali/easyi18n/model/TranslationData.java index 0b10263..ba042b2 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationData.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationData.java @@ -58,6 +58,13 @@ public class TranslationData { return this.locales; } + /** + * @param locale Adds the provided locale to the supported languages list + */ + public void addLocale(@NotNull String locale) { + this.locales.add(locale); + } + /** * @return root node which contains all translations */ @@ -105,7 +112,7 @@ public class TranslationData { * @param fullPath Absolute translation key path * @param translation Translation to set. Can be null to delete the corresponding node */ - public void setTranslation(@NotNull String fullPath, @Nullable Translation translation) throws Exception { + public void setTranslation(@NotNull String fullPath, @Nullable Translation translation) { List sections = this.pathUtil.split(fullPath); String nodeKey = sections.remove(sections.size() - 1); // Edge case last section TranslationNode node = this.rootNode; @@ -123,7 +130,7 @@ public class TranslationData { } // Created nested section - childNode = node.addChildren(section); + childNode = node.setChildren(section); } node = childNode; @@ -137,7 +144,7 @@ public class TranslationData { } } else { // Create or overwrite - node.addChildren(nodeKey, translation); + node.setChildren(nodeKey, translation); } } From 0e80b4a6fb152a0ea306444b64c987817e8a3583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 10:20:55 +0100 Subject: [PATCH 13/49] implement common is file relevant method --- src/main/java/de/marhali/easyi18n/io/IOStrategy.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/de/marhali/easyi18n/io/IOStrategy.java b/src/main/java/de/marhali/easyi18n/io/IOStrategy.java index 0826024..7a9fdc9 100644 --- a/src/main/java/de/marhali/easyi18n/io/IOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/IOStrategy.java @@ -2,6 +2,7 @@ package de.marhali.easyi18n.io; import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.VirtualFile; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; @@ -48,4 +49,14 @@ public interface IOStrategy { */ void write(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state, @NotNull TranslationData data, @NotNull Consumer result); + + /** + * Checks if the provided file should be processed for translation data + * @param state Plugin configuration + * @param file File to check + * @return true if file matches pattern + */ + default boolean isFileRelevant(@NotNull SettingsState state, @NotNull VirtualFile file) { + return file.getName().matches(state.getFilePattern()); + } } From 3d7f28f8cc2224a1d7c90e90774b5814a2bba561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 10:21:35 +0100 Subject: [PATCH 14/49] create array mapper for io strategies --- .../de/marhali/easyi18n/io/ArrayMapper.java | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 src/main/java/de/marhali/easyi18n/io/ArrayMapper.java diff --git a/src/main/java/de/marhali/easyi18n/io/ArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/ArrayMapper.java new file mode 100644 index 0000000..bebe612 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/ArrayMapper.java @@ -0,0 +1,61 @@ +package de.marhali.easyi18n.io; + +import de.marhali.easyi18n.util.StringUtil; + +import org.apache.commons.lang.StringEscapeUtils; + +import java.text.MessageFormat; +import java.util.Iterator; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.regex.Pattern; + +/** + * Simple array support for translation values. + * Some i18n systems allows the user to define array values for some translations. + * We support array values by wrapping them into: '!arr[valueA;valueB]'. + * + * @author marhali + */ +public abstract class ArrayMapper { + static final String PREFIX = "!arr["; + static final String SUFFIX = "]"; + static final char DELIMITER = ';'; + + static final String SPLITERATOR_REGEX = + MessageFormat.format("(? String read(Iterator elements, Function stringFactory) { + StringBuilder builder = new StringBuilder(PREFIX); + + int i = 0; + while(elements.hasNext()) { + if(i > 0) { + builder.append(DELIMITER); + } + + String value = stringFactory.apply(elements.next()); + + builder.append(StringUtil.escapeControls( + value.replace(String.valueOf(DELIMITER), "\\" + DELIMITER), true)); + + i++; + } + + builder.append(SUFFIX); + return builder.toString(); + } + + protected static void write(String concat, Consumer writeElement) { + concat = concat.substring(PREFIX.length(), concat.length() - SUFFIX.length()); + + for(String element : concat.split(SPLITERATOR_REGEX)) { + element = element.replace("\\" + DELIMITER, String.valueOf(DELIMITER)); + writeElement.accept(StringEscapeUtils.unescapeJava(element)); + } + } + + public static boolean isArray(String concat) { + return concat != null && concat.startsWith(PREFIX) && concat.endsWith(SUFFIX); + } +} \ No newline at end of file From bc3717d8748fd74f828c4d237f7d0a78e3caff8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 10:22:21 +0100 Subject: [PATCH 15/49] implement standard json io strategy --- .../easyi18n/io/json/JsonArrayMapper.java | 21 +++ .../easyi18n/io/json/JsonIOStrategy.java | 92 +++++++++++ .../marhali/easyi18n/io/json/JsonMapper.java | 73 +++++++++ .../easyi18n/mapper/AbstractMapperTest.java | 45 ++++++ .../easyi18n/mapper/JsonMapperTest.java | 153 ++++++++++++++++++ 5 files changed, 384 insertions(+) create mode 100644 src/main/java/de/marhali/easyi18n/io/json/JsonArrayMapper.java create mode 100644 src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java create mode 100644 src/main/java/de/marhali/easyi18n/io/json/JsonMapper.java create mode 100644 src/test/java/de/marhali/easyi18n/mapper/AbstractMapperTest.java create mode 100644 src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java diff --git a/src/main/java/de/marhali/easyi18n/io/json/JsonArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/json/JsonArrayMapper.java new file mode 100644 index 0000000..aac41ed --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/json/JsonArrayMapper.java @@ -0,0 +1,21 @@ +package de.marhali.easyi18n.io.json; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import de.marhali.easyi18n.io.ArrayMapper; + +/** + * Map json array values. + * @author marhali + */ +public class JsonArrayMapper extends ArrayMapper { + public static String read(JsonArray array) { + return read(array.iterator(), JsonElement::getAsString); + } + + public static JsonArray write(String concat) { + JsonArray array = new JsonArray(); + write(concat, array::add); + return array; + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java new file mode 100644 index 0000000..26f7930 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java @@ -0,0 +1,92 @@ +package de.marhali.easyi18n.io.json; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.project.Project; + +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; +import de.marhali.easyi18n.io.IOStrategy; +import de.marhali.easyi18n.model.SettingsState; +import de.marhali.easyi18n.model.TranslationData; + +import de.marhali.easyi18n.model.TranslationNode; +import net.minidev.json.JSONObject; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.TreeMap; +import java.util.function.Consumer; + +/** + * Strategy for simple json locale files. Each locale has its own file. + * For example localesPath/en.json, localesPath/de.json. + * @author marhali + */ +public class JsonIOStrategy implements IOStrategy { + + private static final String FILE_EXTENSION = "json"; + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create(); + + @Override + public boolean canUse(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state) { + VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(directory == null || directory.getChildren() == null) { + return false; + } + + for(VirtualFile children : directory.getChildren()) { + if(!children.isDirectory() && isFileRelevant(state, children)) { + if(children.getFileType().getDefaultExtension().toLowerCase().equals(FILE_EXTENSION)) { + return true; + } + } + } + + return false; + } + + @Override + public void read(@NotNull Project project, @NotNull String localesPath, + @NotNull SettingsState state, @NotNull Consumer<@Nullable TranslationData> result) { + ApplicationManager.getApplication().saveAll(); // Save opened files (required if new locales were added) + + ApplicationManager.getApplication().runReadAction(() -> { + VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(directory == null || directory.getChildren() == null) { + throw new IllegalArgumentException("Specified folder is invalid (" + localesPath + ")"); + } + + TranslationData data = new TranslationData(state.isSortKeys(), state.isNestedKeys()); + + try { + for(VirtualFile file : directory.getChildren()) { + if(!isFileRelevant(state, file)) { + continue; + } + + data.addLocale(file.getNameWithoutExtension()); + + JSONObject tree = GSON.fromJson(new InputStreamReader(file.getInputStream(), file.getCharset()), JSONObject.class); + } + } catch(IOException e) { + e.printStackTrace(); + result.accept(null); + } + }); + } + + @Override + public void write(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state, @NotNull TranslationData data, @NotNull Consumer result) { + + } +} diff --git a/src/main/java/de/marhali/easyi18n/io/json/JsonMapper.java b/src/main/java/de/marhali/easyi18n/io/json/JsonMapper.java new file mode 100644 index 0000000..55f5c43 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/json/JsonMapper.java @@ -0,0 +1,73 @@ +package de.marhali.easyi18n.io.json; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; + +import de.marhali.easyi18n.model.Translation; +import de.marhali.easyi18n.model.TranslationNode; +import de.marhali.easyi18n.util.StringUtil; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.math.NumberUtils; + +import java.util.Map; + +/** + * Mapper for mapping json objects into translation nodes and backwards. + * @author marhali + */ +public class JsonMapper { + + public static void read(String locale, JsonObject json, TranslationNode node) { + for(Map.Entry entry : json.entrySet()) { + String key = entry.getKey(); + JsonElement value = entry.getValue(); + + TranslationNode childNode = node.getOrCreateChildren(key); + + if(value.isJsonObject()) { + // Nested element - run recursively + read(locale, value.getAsJsonObject(), childNode); + } else { + Translation translation = childNode.getValue(); + + String content = entry.getValue().isJsonArray() + ? JsonArrayMapper.read(value.getAsJsonArray()) + : StringUtil.escapeControls(value.getAsString(), true); + + translation.put(locale, content); + childNode.setValue(translation); + } + } + } + + public static void write(String locale, JsonObject json, TranslationNode node) { + for(Map.Entry entry : node.getChildren().entrySet()) { + String key = entry.getKey(); + TranslationNode childNode = entry.getValue(); + + if(!childNode.isLeaf()) { + // Nested node - run recursively + JsonObject childJson = new JsonObject(); + write(locale, childJson, childNode); + if(childJson.size() > 0) { + json.add(key, childJson); + } + } else { + Translation translation = childNode.getValue(); + String content = translation.get(locale); + + if(content != null) { + if(JsonArrayMapper.isArray(content)) { + json.add(key, JsonArrayMapper.write(content)); + } else if(NumberUtils.isNumber(content)) { + json.add(key, new JsonPrimitive(NumberUtils.createNumber(content))); + } else { + json.add(key, new JsonPrimitive(StringEscapeUtils.unescapeJava(content))); + } + } + } + } + } +} \ No newline at end of file diff --git a/src/test/java/de/marhali/easyi18n/mapper/AbstractMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/AbstractMapperTest.java new file mode 100644 index 0000000..9771660 --- /dev/null +++ b/src/test/java/de/marhali/easyi18n/mapper/AbstractMapperTest.java @@ -0,0 +1,45 @@ +package de.marhali.easyi18n.mapper; + +import de.marhali.easyi18n.model.Translation; + +import org.junit.Test; + +/** + * Defines test cases for {@link de.marhali.easyi18n.model.TranslationNode} mapping. + * @author marhali + */ +public abstract class AbstractMapperTest { + + protected final String specialCharacters = "Special characters: äü@Öä€/$§;.-?+~#```'' end"; + protected final String arraySimple = "!arr[first;second]"; + protected final String arrayEscaped = "!arr[first\\;element;second element;third\\;element]"; + protected final String leadingSpace = " leading space"; + + @Test + public abstract void testNonSorting(); + + @Test + public abstract void testSorting(); + + @Test + public abstract void testArrays(); + + @Test + public abstract void testSpecialCharacters(); + + @Test + public abstract void testNestedKeys(); + + @Test + public abstract void testNonNestedKeys(); + + @Test + public abstract void testLeadingSpace(); + + @Test + public abstract void testNumbers(); + + protected Translation create(String content) { + return new Translation("en", content); + } +} \ No newline at end of file diff --git a/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java new file mode 100644 index 0000000..37ae662 --- /dev/null +++ b/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java @@ -0,0 +1,153 @@ +package de.marhali.easyi18n.mapper; + +import com.google.gson.JsonObject; + +import com.google.gson.JsonPrimitive; + +import de.marhali.easyi18n.io.json.JsonArrayMapper; +import de.marhali.easyi18n.io.json.JsonMapper; +import de.marhali.easyi18n.model.TranslationData; + +import org.apache.commons.lang.StringEscapeUtils; +import org.junit.Assert; + +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; + +/** + * Unit tests for {@link de.marhali.easyi18n.io.json.JsonMapper} + * @author marhali + */ +public class JsonMapperTest extends AbstractMapperTest { + + @Override + public void testNonSorting() { + JsonObject input = new JsonObject(); + input.add("zulu", new JsonPrimitive("test")); + input.add("alpha", new JsonPrimitive("test")); + input.add("bravo", new JsonPrimitive("test")); + + TranslationData data = new TranslationData(false, true); + JsonMapper.read("en", input, data.getRootNode()); + + JsonObject output = new JsonObject(); + JsonMapper.write("en", output, data.getRootNode()); + + Set expect = new LinkedHashSet<>(Arrays.asList("zulu", "alpha", "bravo")); + Assert.assertEquals(expect, output.keySet()); + } + + @Override + public void testSorting() { + JsonObject input = new JsonObject(); + input.add("zulu", new JsonPrimitive("test")); + input.add("alpha", new JsonPrimitive("test")); + input.add("bravo", new JsonPrimitive("test")); + + TranslationData data = new TranslationData(true, true); + JsonMapper.read("en", input, data.getRootNode()); + + JsonObject output = new JsonObject(); + JsonMapper.write("en", output, data.getRootNode()); + + Set expect = new LinkedHashSet<>(Arrays.asList("alpha", "bravo", "zulu")); + Assert.assertEquals(expect, output.keySet()); + } + + @Override + public void testArrays() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("simple", create(arraySimple)); + data.setTranslation("escaped", create(arrayEscaped)); + + JsonObject output = new JsonObject(); + JsonMapper.write("en", output, data.getRootNode()); + + Assert.assertTrue(output.get("simple").isJsonArray()); + Assert.assertEquals(arraySimple, JsonArrayMapper.read(output.get("simple").getAsJsonArray())); + Assert.assertTrue(output.get("escaped").isJsonArray()); + Assert.assertEquals(arrayEscaped, StringEscapeUtils.unescapeJava(JsonArrayMapper.read(output.get("escaped").getAsJsonArray()))); + } + + @Override + public void testSpecialCharacters() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("chars", create(specialCharacters)); + + JsonObject output = new JsonObject(); + JsonMapper.write("en", output, data.getRootNode()); + + Assert.assertEquals(specialCharacters, output.get("chars").getAsString()); + + TranslationData input = new TranslationData(true, true); + JsonMapper.read("en", output, input.getRootNode()); + + Assert.assertEquals(specialCharacters, StringEscapeUtils.unescapeJava(input.getTranslation("chars").get("en"))); + } + + @Override + public void testNestedKeys() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("nested.key.section", create("test")); + + JsonObject output = new JsonObject(); + JsonMapper.write("en", output, data.getRootNode()); + + Assert.assertEquals("test", output.getAsJsonObject("nested").getAsJsonObject("key").get("section").getAsString()); + + TranslationData input = new TranslationData(true, true); + JsonMapper.read("en", output, input.getRootNode()); + + Assert.assertEquals("test", input.getTranslation("nested.key.section").get("en")); + } + + @Override + public void testNonNestedKeys() { + TranslationData data = new TranslationData(true, false); + data.setTranslation("long.key.with.many.sections", create("test")); + + JsonObject output = new JsonObject(); + JsonMapper.write("en", output, data.getRootNode()); + + Assert.assertTrue(output.has("long.key.with.many.sections")); + + TranslationData input = new TranslationData(true, false); + JsonMapper.read("en", output, input.getRootNode()); + + Assert.assertEquals("test", input.getTranslation("long.key.with.many.sections").get("en")); + } + + @Override + public void testLeadingSpace() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("space", create(leadingSpace)); + + JsonObject output = new JsonObject(); + JsonMapper.write("en", output, data.getRootNode()); + + Assert.assertEquals(leadingSpace, output.get("space").getAsString()); + + TranslationData input = new TranslationData(true, true); + JsonMapper.read("en", output, input.getRootNode()); + + Assert.assertEquals(leadingSpace, input.getTranslation("space").get("en")); + } + + @Override + public void testNumbers() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("numbered", create("15000")); + + JsonObject output = new JsonObject(); + JsonMapper.write("en", output, data.getRootNode()); + + Assert.assertEquals(15000, output.get("numbered").getAsNumber()); + + JsonObject input = new JsonObject(); + input.addProperty("numbered", 143.23); + JsonMapper.read("en", input, data.getRootNode()); + + Assert.assertEquals("143.23", data.getTranslation("numbered").get("en")); + } +} \ No newline at end of file From 7cb4238fc326d5d0dfb4ed16e60507b7b73a1bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 16:14:38 +0100 Subject: [PATCH 16/49] complete read and write action --- .../easyi18n/io/json/JsonIOStrategy.java | 50 ++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java index 26f7930..d4ab551 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java @@ -2,27 +2,23 @@ package de.marhali.easyi18n.io.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; + import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; - import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; + import de.marhali.easyi18n.io.IOStrategy; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; -import de.marhali.easyi18n.model.TranslationNode; -import net.minidev.json.JSONObject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.TreeMap; import java.util.function.Consumer; /** @@ -45,7 +41,7 @@ public class JsonIOStrategy implements IOStrategy { for(VirtualFile children : directory.getChildren()) { if(!children.isDirectory() && isFileRelevant(state, children)) { - if(children.getFileType().getDefaultExtension().toLowerCase().equals(FILE_EXTENSION)) { + if(children.getFileType().getDefaultExtension().equalsIgnoreCase(FILE_EXTENSION)) { return true; } } @@ -74,10 +70,17 @@ public class JsonIOStrategy implements IOStrategy { continue; } - data.addLocale(file.getNameWithoutExtension()); + String locale = file.getNameWithoutExtension(); + data.addLocale(locale); - JSONObject tree = GSON.fromJson(new InputStreamReader(file.getInputStream(), file.getCharset()), JSONObject.class); + JsonObject tree = GSON.fromJson(new InputStreamReader(file.getInputStream(), file.getCharset()), + JsonObject.class); + + JsonMapper.read(locale, tree, data.getRootNode()); } + + result.accept(data); + } catch(IOException e) { e.printStackTrace(); result.accept(null); @@ -86,7 +89,30 @@ public class JsonIOStrategy implements IOStrategy { } @Override - public void write(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state, @NotNull TranslationData data, @NotNull Consumer result) { + public void write(@NotNull Project project, @NotNull String localesPath, + @NotNull SettingsState state, @NotNull TranslationData data, @NotNull Consumer result) { + ApplicationManager.getApplication().runWriteAction(() -> { + try { + for(String locale : data.getLocales()) { + JsonObject content = new JsonObject(); + JsonMapper.write(locale, content, data.getRootNode()); + File file = new File(localesPath + "/" + locale + "." + FILE_EXTENSION); + boolean exists = file.createNewFile(); + + VirtualFile vf = exists + ? LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file) + : LocalFileSystem.getInstance().findFileByIoFile(file); + + vf.setBinaryContent(GSON.toJson(content).getBytes(vf.getCharset())); + } + + result.accept(true); + + } catch(IOException e) { + e.printStackTrace(); + result.accept(false); + } + }); } -} +} \ No newline at end of file From 1e1624541dc10f928e9e0b16767cb33734a499e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 17:29:55 +0100 Subject: [PATCH 17/49] introduce new data store --- .../java/de/marhali/easyi18n/DataStore.java | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 src/main/java/de/marhali/easyi18n/DataStore.java diff --git a/src/main/java/de/marhali/easyi18n/DataStore.java b/src/main/java/de/marhali/easyi18n/DataStore.java new file mode 100644 index 0000000..680d22a --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/DataStore.java @@ -0,0 +1,103 @@ +package de.marhali.easyi18n; + +import com.intellij.openapi.project.Project; + +import de.marhali.easyi18n.io.IOStrategy; +import de.marhali.easyi18n.io.json.JsonIOStrategy; +import de.marhali.easyi18n.model.SettingsState; +import de.marhali.easyi18n.model.TranslationData; +import de.marhali.easyi18n.service.SettingsService; + +import org.jetbrains.annotations.NotNull; + +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.function.Consumer; + +/** + * Responsible for loading, saving and updating translation files. + * Provides access to the cached translation data which is used in the whole project. + * @author marhali + */ +public class DataStore { + + private static final Set STRATEGIES = new LinkedHashSet<>(Arrays.asList( + new JsonIOStrategy() + )); + + private final Project project; + + private @NotNull TranslationData data; + + protected DataStore(Project project) { + this.project = project; + this.data = new TranslationData(true, true); // Initialize with hard-coded configuration + } + + public @NotNull TranslationData getData() { + return data; + } + + /** + * Loads the translation data into cache and overwrites any previous cached data. + * If the configuration does not fit an empty translation instance will be populated. + * @param successResult Consumer will inform if operation was successful + */ + public void loadFromPersistenceLayer(@NotNull Consumer successResult) { + SettingsState state = SettingsService.getInstance(this.project).getState(); + String localesPath = state.getLocalesPath(); + + if(localesPath == null || localesPath.isEmpty()) { // Populate empty instance + this.data = new TranslationData(state.isSortKeys(), state.isNestedKeys()); + return; + } + + IOStrategy strategy = this.determineStrategy(state, localesPath); + + strategy.read(this.project, localesPath, state, (data) -> { + this.data = data == null + ? new TranslationData(state.isSortKeys(), state.isNestedKeys()) + : data; + + successResult.accept(data != null); + }); + } + + /** + * Saves the cached translation data to the underlying io system. + * @param successResult Consumer will inform if operation was successful + */ + public void saveToPersistenceLayer(@NotNull Consumer successResult) { + SettingsState state = SettingsService.getInstance(this.project).getState(); + String localesPath = state.getLocalesPath(); + + if(localesPath == null || localesPath.isEmpty()) { // Cannot save without valid path + successResult.accept(false); + return; + } + + IOStrategy strategy = this.determineStrategy(state, localesPath); + + strategy.write(this.project, localesPath, state, this.data, successResult); + } + + /** + * Chooses the right strategy for the opened project. An exception might be thrown on + * runtime if the project configuration (e.g. locale files does not fit in any strategy). + * @param state Plugin configuration + * @param localesPath Locales directory + * @return matching {@link IOStrategy} + */ + public @NotNull IOStrategy determineStrategy(@NotNull SettingsState state, @NotNull String localesPath) { + for(IOStrategy strategy : STRATEGIES) { + if(strategy.canUse(this.project, localesPath, state)) { + return strategy; + } + } + + throw new IllegalArgumentException("Could not determine i18n strategy. " + + "At least one locale file must be defined. " + + "For examples please visit https://github.com/marhali/easy-i18n"); + } +} \ No newline at end of file From 568db9fc94b293b2eaa761b093f58e76235b54f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 17:32:42 +0100 Subject: [PATCH 18/49] rename to legacy component --- .../java/de/marhali/easyi18n/dialog/AddDialog.java | 4 ++-- .../java/de/marhali/easyi18n/dialog/EditDialog.java | 10 +++++----- .../java/de/marhali/easyi18n/editor/KeyReference.java | 4 ++-- ...yedTranslation.java => LegacyKeyedTranslation.java} | 4 ++-- .../de/marhali/easyi18n/model/TranslationCreate.java | 2 +- .../de/marhali/easyi18n/model/TranslationDelete.java | 2 +- .../de/marhali/easyi18n/model/TranslationUpdate.java | 10 +++++----- .../easyi18n/model/table/TableModelTranslator.java | 6 +++--- .../de/marhali/easyi18n/service/LegacyDataStore.java | 4 ++-- src/main/java/de/marhali/easyi18n/tabs/TableView.java | 6 +++--- src/main/java/de/marhali/easyi18n/tabs/TreeView.java | 6 +++--- 11 files changed, 29 insertions(+), 29 deletions(-) rename src/main/java/de/marhali/easyi18n/model/{KeyedTranslation.java => LegacyKeyedTranslation.java} (87%) diff --git a/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java b/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java index 536e650..7466206 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java @@ -8,7 +8,7 @@ import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.JBTextField; import de.marhali.easyi18n.service.LegacyDataStore; -import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.TranslationCreate; import javax.swing.*; @@ -56,7 +56,7 @@ public class AddDialog { } }); - TranslationCreate creation = new TranslationCreate(new KeyedTranslation(keyTextField.getText(), messages)); + TranslationCreate creation = new TranslationCreate(new LegacyKeyedTranslation(keyTextField.getText(), messages)); LegacyDataStore.getInstance(project).processUpdate(creation); } diff --git a/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java index c67791c..edb4855 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java @@ -7,7 +7,7 @@ import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.JBTextField; import de.marhali.easyi18n.service.LegacyDataStore; -import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; import de.marhali.easyi18n.model.TranslationUpdate; import de.marhali.easyi18n.dialog.descriptor.DeleteActionDescriptor; @@ -26,12 +26,12 @@ import java.util.ResourceBundle; public class EditDialog { private final Project project; - private final KeyedTranslation origin; + private final LegacyKeyedTranslation origin; private JBTextField keyTextField; private Map valueTextFields; - public EditDialog(Project project, KeyedTranslation origin) { + public EditDialog(Project project, LegacyKeyedTranslation origin) { this.project = project; this.origin = origin; } @@ -47,7 +47,7 @@ public class EditDialog { } } - private KeyedTranslation getChanges() { + private LegacyKeyedTranslation getChanges() { Map messages = new HashMap<>(); valueTextFields.forEach((k, v) -> { @@ -56,7 +56,7 @@ public class EditDialog { } }); - return new KeyedTranslation(keyTextField.getText(), messages); + return new LegacyKeyedTranslation(keyTextField.getText(), messages); } private DialogBuilder prepare() { diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyReference.java b/src/main/java/de/marhali/easyi18n/editor/KeyReference.java index d116f39..e319075 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyReference.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyReference.java @@ -6,7 +6,7 @@ import com.intellij.psi.impl.FakePsiElement; import de.marhali.easyi18n.dialog.AddDialog; import de.marhali.easyi18n.dialog.EditDialog; -import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.LocalizedNode; import de.marhali.easyi18n.service.LegacyDataStore; @@ -55,7 +55,7 @@ public class KeyReference extends PsiReferenceBase { LocalizedNode node = LegacyDataStore.getInstance(getProject()).getTranslations().getNode(getKey()); if(node != null) { - new EditDialog(getProject(), new KeyedTranslation(getKey(), node.getValue())).showAndHandle(); + new EditDialog(getProject(), new LegacyKeyedTranslation(getKey(), node.getValue())).showAndHandle(); } else { new AddDialog(getProject(), getKey()).showAndHandle(); } diff --git a/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java b/src/main/java/de/marhali/easyi18n/model/LegacyKeyedTranslation.java similarity index 87% rename from src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java rename to src/main/java/de/marhali/easyi18n/model/LegacyKeyedTranslation.java index 7c00104..1ef1e34 100644 --- a/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java +++ b/src/main/java/de/marhali/easyi18n/model/LegacyKeyedTranslation.java @@ -7,12 +7,12 @@ import java.util.Map; * @author marhali */ @Deprecated // Might be deprecated -public class KeyedTranslation { +public class LegacyKeyedTranslation { private String key; private Map translations; - public KeyedTranslation(String key, Map translations) { + public LegacyKeyedTranslation(String key, Map translations) { this.key = key; this.translations = translations; } diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java b/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java index 9c955a9..f3854e1 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull; * @author marhali */ public class TranslationCreate extends TranslationUpdate { - public TranslationCreate(@NotNull KeyedTranslation translation) { + public TranslationCreate(@NotNull LegacyKeyedTranslation translation) { super(null, translation); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java b/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java index 763cb16..aa1879c 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull; * @author marhali */ public class TranslationDelete extends TranslationUpdate { - public TranslationDelete(@NotNull KeyedTranslation translation) { + public TranslationDelete(@NotNull LegacyKeyedTranslation translation) { super(translation, null); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java b/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java index d4923b3..c698e00 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java @@ -8,19 +8,19 @@ import org.jetbrains.annotations.Nullable; */ public class TranslationUpdate { - private final @Nullable KeyedTranslation origin; - private final @Nullable KeyedTranslation change; + private final @Nullable LegacyKeyedTranslation origin; + private final @Nullable LegacyKeyedTranslation change; - public TranslationUpdate(@Nullable KeyedTranslation origin, @Nullable KeyedTranslation change) { + public TranslationUpdate(@Nullable LegacyKeyedTranslation origin, @Nullable LegacyKeyedTranslation change) { this.origin = origin; this.change = change; } - public KeyedTranslation getOrigin() { + public LegacyKeyedTranslation getOrigin() { return origin; } - public KeyedTranslation getChange() { + public LegacyKeyedTranslation getChange() { return change; } diff --git a/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java b/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java index d5011e9..5ea31e9 100644 --- a/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java +++ b/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java @@ -1,7 +1,7 @@ package de.marhali.easyi18n.model.table; import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.TranslationUpdate; import de.marhali.easyi18n.model.Translations; @@ -108,8 +108,8 @@ public class TableModelTranslator implements TableModel { } } - TranslationUpdate update = new TranslationUpdate(new KeyedTranslation(key, messages), - new KeyedTranslation(newKey, messages)); + TranslationUpdate update = new TranslationUpdate(new LegacyKeyedTranslation(key, messages), + new LegacyKeyedTranslation(newKey, messages)); updater.accept(update); } diff --git a/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java b/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java index ade0046..116ac8b 100644 --- a/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java +++ b/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java @@ -8,7 +8,7 @@ import de.marhali.easyi18n.model.LocalizedNode; import de.marhali.easyi18n.model.Translations; import de.marhali.easyi18n.io.TranslatorIO; import de.marhali.easyi18n.model.DataSynchronizer; -import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; import de.marhali.easyi18n.model.TranslationUpdate; import de.marhali.easyi18n.util.IOUtil; @@ -135,7 +135,7 @@ public class LegacyDataStore { // Parent is empty now, we need to remove it as well (except root) if(node.getChildren().isEmpty() && !node.getKey().equals(LocalizedNode.ROOT_KEY)) { - processUpdate(new TranslationDelete(new KeyedTranslation( + processUpdate(new TranslationDelete(new LegacyKeyedTranslation( TranslationsUtil.sectionsToFullPath(sections), null))); } } diff --git a/src/main/java/de/marhali/easyi18n/tabs/TableView.java b/src/main/java/de/marhali/easyi18n/tabs/TableView.java index 82ae93d..773038c 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TableView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TableView.java @@ -8,7 +8,7 @@ import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.model.LocalizedNode; import de.marhali.easyi18n.model.DataSynchronizer; import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; import de.marhali.easyi18n.model.table.TableModelTranslator; import de.marhali.easyi18n.dialog.EditDialog; @@ -57,7 +57,7 @@ public class TableView implements DataSynchronizer { LocalizedNode node = LegacyDataStore.getInstance(project).getTranslations().getNode(fullPath); if(node != null) { - new EditDialog(project, new KeyedTranslation(fullPath, node.getValue())).showAndHandle(); + new EditDialog(project, new LegacyKeyedTranslation(fullPath, node.getValue())).showAndHandle(); } } } @@ -68,7 +68,7 @@ public class TableView implements DataSynchronizer { String fullPath = String.valueOf(table.getValueAt(selectedRow, 0)); LegacyDataStore.getInstance(project).processUpdate( - new TranslationDelete(new KeyedTranslation(fullPath, null))); + new TranslationDelete(new LegacyKeyedTranslation(fullPath, null))); } }; } diff --git a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java index 2d0c347..3bc9ccb 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java @@ -12,7 +12,7 @@ import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.model.LocalizedNode; import de.marhali.easyi18n.model.DataSynchronizer; import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; import de.marhali.easyi18n.model.tree.TreeModelTranslator; import de.marhali.easyi18n.action.treeview.CollapseTreeViewAction; @@ -103,7 +103,7 @@ public class TreeView implements DataSynchronizer { LocalizedNode localizedNode = LegacyDataStore.getInstance(project).getTranslations().getNode(fullPath); if(localizedNode != null) { - new EditDialog(project,new KeyedTranslation(fullPath, localizedNode.getValue())).showAndHandle(); + new EditDialog(project,new LegacyKeyedTranslation(fullPath, localizedNode.getValue())).showAndHandle(); } } } @@ -121,7 +121,7 @@ public class TreeView implements DataSynchronizer { String fullPath = TreeUtil.getFullPath(path); LegacyDataStore.getInstance(project).processUpdate( - new TranslationDelete(new KeyedTranslation(fullPath, null))); + new TranslationDelete(new LegacyKeyedTranslation(fullPath, null))); } }; } From 760fc287e9499b34a27203fcd31fee7a1f7b5c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 17:41:27 +0100 Subject: [PATCH 19/49] deprecate translation update --- .../marhali/easyi18n/dialog/EditDialog.java | 4 +- .../easyi18n/model/KeyedTranslation.java | 42 +++++++++++++++++++ .../easyi18n/model/TranslationCreate.java | 2 +- .../easyi18n/model/TranslationDelete.java | 2 +- .../easyi18n/model/TranslationUpdate.java | 42 ------------------- .../model/table/TableModelTranslator.java | 8 ++-- .../easyi18n/service/LegacyDataStore.java | 6 +-- 7 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java diff --git a/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java index edb4855..33023c1 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java @@ -9,7 +9,7 @@ import com.intellij.ui.components.JBTextField; import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; -import de.marhali.easyi18n.model.TranslationUpdate; +import de.marhali.easyi18n.model.LegacyTranslationUpdate; import de.marhali.easyi18n.dialog.descriptor.DeleteActionDescriptor; import javax.swing.*; @@ -40,7 +40,7 @@ public class EditDialog { int code = prepare().show(); if(code == DialogWrapper.OK_EXIT_CODE) { // Edit - LegacyDataStore.getInstance(project).processUpdate(new TranslationUpdate(origin, getChanges())); + LegacyDataStore.getInstance(project).processUpdate(new LegacyTranslationUpdate(origin, getChanges())); } else if(code == DeleteActionDescriptor.EXIT_CODE) { // Delete LegacyDataStore.getInstance(project).processUpdate(new TranslationDelete(origin)); diff --git a/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java b/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java new file mode 100644 index 0000000..0e31269 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java @@ -0,0 +1,42 @@ +package de.marhali.easyi18n.model; + +import org.jetbrains.annotations.NotNull; + +/** + * I18n translation with associated key path (full-key). + * @author marhali + */ +public class KeyedTranslation { + + private @NotNull String key; + private @NotNull Translation translation; + + public KeyedTranslation(@NotNull String key, @NotNull Translation translation) { + this.key = key; + this.translation = translation; + } + + public @NotNull String getKey() { + return key; + } + + public void setKey(@NotNull String key) { + this.key = key; + } + + public @NotNull Translation getTranslation() { + return translation; + } + + public void setTranslation(@NotNull Translation translation) { + this.translation = translation; + } + + @Override + public String toString() { + return "KeyedTranslation{" + + "key='" + key + '\'' + + ", translation=" + translation + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java b/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java index f3854e1..0d6d2aa 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; * Represents update request to create a new translation. * @author marhali */ -public class TranslationCreate extends TranslationUpdate { +public class TranslationCreate extends LegacyTranslationUpdate { public TranslationCreate(@NotNull LegacyKeyedTranslation translation) { super(null, translation); } diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java b/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java index aa1879c..14d7ee0 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.NotNull; * Represents update request to delete a existing translation. * @author marhali */ -public class TranslationDelete extends TranslationUpdate { +public class TranslationDelete extends LegacyTranslationUpdate { public TranslationDelete(@NotNull LegacyKeyedTranslation translation) { super(translation, null); } diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java b/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java index c698e00..ad43ab0 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java @@ -1,46 +1,4 @@ package de.marhali.easyi18n.model; -import org.jetbrains.annotations.Nullable; - -/** - * Represents an update for a translated I18n-Key. Supports key creation, manipulation and deletion. - * @author marhali - */ public class TranslationUpdate { - - private final @Nullable LegacyKeyedTranslation origin; - private final @Nullable LegacyKeyedTranslation change; - - public TranslationUpdate(@Nullable LegacyKeyedTranslation origin, @Nullable LegacyKeyedTranslation change) { - this.origin = origin; - this.change = change; - } - - public LegacyKeyedTranslation getOrigin() { - return origin; - } - - public LegacyKeyedTranslation getChange() { - return change; - } - - public boolean isCreation() { - return origin == null; - } - - public boolean isDeletion() { - return change == null; - } - - public boolean isKeyChange() { - return origin != null && change != null && !origin.getKey().equals(change.getKey()); - } - - @Override - public String toString() { - return "TranslationUpdate{" + - "origin=" + origin + - ", change=" + change + - '}'; - } } diff --git a/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java b/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java index 5ea31e9..4a23fbc 100644 --- a/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java +++ b/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java @@ -2,7 +2,7 @@ package de.marhali.easyi18n.model.table; import de.marhali.easyi18n.model.LocalizedNode; import de.marhali.easyi18n.model.LegacyKeyedTranslation; -import de.marhali.easyi18n.model.TranslationUpdate; +import de.marhali.easyi18n.model.LegacyTranslationUpdate; import de.marhali.easyi18n.model.Translations; import org.jetbrains.annotations.Nls; @@ -23,14 +23,14 @@ public class TableModelTranslator implements TableModel { private final List locales; private final List fullKeys; - private final Consumer updater; + private final Consumer updater; /** * @param translations Translations instance * @param searchQuery Search / filter param * @param updater Consumer which can be called on cell change / update */ - public TableModelTranslator(Translations translations, String searchQuery, Consumer updater) { + public TableModelTranslator(Translations translations, String searchQuery, Consumer updater) { this.translations = translations; this.locales = translations.getLocales(); this.updater = updater; @@ -108,7 +108,7 @@ public class TableModelTranslator implements TableModel { } } - TranslationUpdate update = new TranslationUpdate(new LegacyKeyedTranslation(key, messages), + LegacyTranslationUpdate update = new LegacyTranslationUpdate(new LegacyKeyedTranslation(key, messages), new LegacyKeyedTranslation(newKey, messages)); updater.accept(update); diff --git a/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java b/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java index 116ac8b..bcf344e 100644 --- a/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java +++ b/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java @@ -10,7 +10,7 @@ import de.marhali.easyi18n.io.TranslatorIO; import de.marhali.easyi18n.model.DataSynchronizer; import de.marhali.easyi18n.model.LegacyKeyedTranslation; import de.marhali.easyi18n.model.TranslationDelete; -import de.marhali.easyi18n.model.TranslationUpdate; +import de.marhali.easyi18n.model.LegacyTranslationUpdate; import de.marhali.easyi18n.util.IOUtil; import de.marhali.easyi18n.util.TranslationsUtil; @@ -113,9 +113,9 @@ public class LegacyDataStore { /** * Processes the provided update. Updates translation instance and propagates changes. See {@link DataSynchronizer} - * @param update The update to process. For more information see {@link TranslationUpdate} + * @param update The update to process. For more information see {@link LegacyTranslationUpdate} */ - public void processUpdate(TranslationUpdate update) { + public void processUpdate(LegacyTranslationUpdate update) { if(update.isDeletion() || update.isKeyChange()) { // Delete origin i18n key String originKey = update.getOrigin().getKey(); List sections = TranslationsUtil.getSections(originKey); From 5aa46593e0ba8f46bc08b7fca029bef99c33af2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 17:59:54 +0100 Subject: [PATCH 20/49] deprecate translation update and add replacement --- .../model/LegacyTranslationUpdate.java | 47 +++++++++++++++++++ .../easyi18n/model/TranslationUpdate.java | 44 +++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 src/main/java/de/marhali/easyi18n/model/LegacyTranslationUpdate.java diff --git a/src/main/java/de/marhali/easyi18n/model/LegacyTranslationUpdate.java b/src/main/java/de/marhali/easyi18n/model/LegacyTranslationUpdate.java new file mode 100644 index 0000000..2a73c01 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/LegacyTranslationUpdate.java @@ -0,0 +1,47 @@ +package de.marhali.easyi18n.model; + +import org.jetbrains.annotations.Nullable; + +/** + * Represents an update for a translated I18n-Key. Supports key creation, manipulation and deletion. + * @author marhali + */ +@Deprecated +public class LegacyTranslationUpdate { + + private final @Nullable LegacyKeyedTranslation origin; + private final @Nullable LegacyKeyedTranslation change; + + public LegacyTranslationUpdate(@Nullable LegacyKeyedTranslation origin, @Nullable LegacyKeyedTranslation change) { + this.origin = origin; + this.change = change; + } + + public LegacyKeyedTranslation getOrigin() { + return origin; + } + + public LegacyKeyedTranslation getChange() { + return change; + } + + public boolean isCreation() { + return origin == null; + } + + public boolean isDeletion() { + return change == null; + } + + public boolean isKeyChange() { + return origin != null && change != null && !origin.getKey().equals(change.getKey()); + } + + @Override + public String toString() { + return "TranslationUpdate{" + + "origin=" + origin + + ", change=" + change + + '}'; + } +} diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java b/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java index ad43ab0..6b9dac8 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationUpdate.java @@ -1,4 +1,48 @@ package de.marhali.easyi18n.model; +import org.jetbrains.annotations.Nullable; + +/** + * Represents an update for a translated i18n key. + * Supports translation creation, manipulation and deletion. + * + * @author marhali + */ public class TranslationUpdate { + + private final @Nullable KeyedTranslation origin; + private final @Nullable KeyedTranslation change; + + public TranslationUpdate(@Nullable KeyedTranslation origin, @Nullable KeyedTranslation change) { + this.origin = origin; + this.change = change; + } + + public @Nullable KeyedTranslation getOrigin() { + return origin; + } + + public @Nullable KeyedTranslation getChange() { + return change; + } + + public boolean isCreation() { + return this.origin == null; + } + + public boolean isDeletion() { + return this.change == null; + } + + public boolean isKeyChange() { + return this.origin != null && this.change != null && !this.origin.getKey().equals(this.change.getKey()); + } + + @Override + public String toString() { + return "TranslationUpdate{" + + "origin=" + origin + + ", change=" + change + + '}'; + } } From a44f7a7c9912e17e5a651a907a293e16d44b3f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 18:00:07 +0100 Subject: [PATCH 21/49] introduce instance manager --- .../de/marhali/easyi18n/InstanceManager.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 src/main/java/de/marhali/easyi18n/InstanceManager.java diff --git a/src/main/java/de/marhali/easyi18n/InstanceManager.java b/src/main/java/de/marhali/easyi18n/InstanceManager.java new file mode 100644 index 0000000..41ec935 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/InstanceManager.java @@ -0,0 +1,74 @@ +package de.marhali.easyi18n; + +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.project.Project; + +import de.marhali.easyi18n.model.TranslationUpdate; + +import org.jetbrains.annotations.NotNull; + +import java.util.Map; +import java.util.WeakHashMap; + +/** + * Central singleton component for managing an easy-i18n instance for a specific project. + * @author marhali + */ +public class InstanceManager { + + private static final Map INSTANCES = new WeakHashMap<>(); + + private final DataStore store; + private final DataBus bus; + + public static InstanceManager get(@NotNull Project project) { + InstanceManager instance = INSTANCES.get(project); + + if(instance == null){ + instance = new InstanceManager(project); + INSTANCES.put(project, instance); + } + + return instance; + } + + private InstanceManager(@NotNull Project project) { + this.store = new DataStore(project); + this.bus = new DataBus(); + + // Load data after first initialization + ApplicationManager.getApplication().invokeLater(() -> { + this.store.loadFromPersistenceLayer((success) -> { + this.bus.propagate().onUpdateData(this.store.getData()); + }); + }); + } + + public DataStore store() { + return this.store; + } + + public DataBus bus() { + return this.bus; + } + + public void processUpdate(TranslationUpdate update) { + if(update.isDeletion() || update.isKeyChange()) { // Remove origin translation + this.store.getData().setTranslation(update.getOrigin().getKey(), null); + } + + if(!update.isDeletion()) { // Create or re-create translation with changed data + this.store.getData().setTranslation(update.getChange().getKey(), update.getChange().getTranslation()); + } + + this.store.saveToPersistenceLayer(success -> { + if(success) { + this.bus.propagate().onUpdateData(this.store.getData()); + + if(!update.isDeletion()) { // TODO: maybe focus parent if key was deleted + this.bus.propagate().onFocusKey(update.getChange().getKey()); + } + } + }); + } +} From d48986ea78387dfc4a6b7561845a882f5604ea75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 4 Nov 2021 19:21:42 +0100 Subject: [PATCH 22/49] add javadoc --- src/main/java/de/marhali/easyi18n/service/WindowManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/de/marhali/easyi18n/service/WindowManager.java b/src/main/java/de/marhali/easyi18n/service/WindowManager.java index c92883e..51d8b01 100644 --- a/src/main/java/de/marhali/easyi18n/service/WindowManager.java +++ b/src/main/java/de/marhali/easyi18n/service/WindowManager.java @@ -5,6 +5,10 @@ import com.intellij.openapi.wm.ToolWindow; import de.marhali.easyi18n.tabs.TableView; import de.marhali.easyi18n.tabs.TreeView; +/** + * Provides access to the plugin's own tool-window. + * @author marhali + */ public class WindowManager { private static WindowManager INSTANCE; From 5fa8c46efcabfb50f5f400c1c2ebcbe63add41e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Fri, 5 Nov 2021 15:10:23 +0100 Subject: [PATCH 23/49] upgrade to new data structure --- .../java/de/marhali/easyi18n/DataBus.java | 2 +- .../marhali/easyi18n/action/ReloadAction.java | 4 +- .../de/marhali/easyi18n/dialog/AddDialog.java | 16 +- .../marhali/easyi18n/dialog/EditDialog.java | 29 +-- .../easyi18n/dialog/SettingsDialog.java | 4 +- .../marhali/easyi18n/editor/KeyAnnotator.java | 2 - .../editor/KeyCompletionProvider.java | 2 - .../marhali/easyi18n/editor/KeyReference.java | 3 - .../GenericKeyReferenceContributor.java | 1 - .../kotlin/KotlinKeyReferenceContributor.java | 1 - .../de/marhali/easyi18n/io/TranslatorIO.java | 2 - .../io/implementation/JsonTranslatorIO.java | 4 - .../ModularizedJsonTranslatorIO.java | 4 - .../PropertiesTranslatorIO.java | 4 - .../marhali/easyi18n/model/BusListener.java | 29 --- .../easyi18n/model/DataSynchronizer.java | 20 -- .../model/LegacyKeyedTranslation.java | 43 ----- .../model/LegacyTranslationUpdate.java | 47 ----- .../marhali/easyi18n/model/LocalizedNode.java | 78 -------- .../easyi18n/model/TranslationCreate.java | 4 +- .../easyi18n/model/TranslationDelete.java | 4 +- .../marhali/easyi18n/model/Translations.java | 109 ----------- .../easyi18n/model/bus/BusListener.java | 8 + .../easyi18n/model/bus/FocusKeyListener.java | 15 ++ .../model/bus/SearchQueryListener.java | 16 ++ .../model/bus/UpdateDataListener.java | 16 ++ .../model/table/TableModelTranslator.java | 5 - .../model/tree/TreeModelTranslator.java | 3 - .../easyi18n/service/LegacyDataStore.java | 174 ------------------ .../service/TranslatorToolWindowFactory.java | 13 +- .../de/marhali/easyi18n/tabs/TableView.java | 60 +++--- .../de/marhali/easyi18n/tabs/TreeView.java | 49 ++--- .../tabs/mapper/TableModelMapper.java | 112 +++++++++++ .../easyi18n/tabs/mapper/TreeModelMapper.java | 104 +++++++++++ .../java/de/marhali/easyi18n/util/IOUtil.java | 72 -------- .../de/marhali/easyi18n/util/JsonUtil.java | 97 ---------- .../de/marhali/easyi18n/util/MapUtil.java | 3 +- .../easyi18n/util/SortedProperties.java | 1 + .../easyi18n/util/TranslationsUtil.java | 48 ----- .../de/marhali/easyi18n/util/TreeUtil.java | 4 +- 40 files changed, 371 insertions(+), 841 deletions(-) delete mode 100644 src/main/java/de/marhali/easyi18n/model/BusListener.java delete mode 100644 src/main/java/de/marhali/easyi18n/model/DataSynchronizer.java delete mode 100644 src/main/java/de/marhali/easyi18n/model/LegacyKeyedTranslation.java delete mode 100644 src/main/java/de/marhali/easyi18n/model/LegacyTranslationUpdate.java delete mode 100644 src/main/java/de/marhali/easyi18n/model/LocalizedNode.java delete mode 100644 src/main/java/de/marhali/easyi18n/model/Translations.java create mode 100644 src/main/java/de/marhali/easyi18n/model/bus/BusListener.java create mode 100644 src/main/java/de/marhali/easyi18n/model/bus/FocusKeyListener.java create mode 100644 src/main/java/de/marhali/easyi18n/model/bus/SearchQueryListener.java create mode 100644 src/main/java/de/marhali/easyi18n/model/bus/UpdateDataListener.java delete mode 100644 src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java create mode 100644 src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java create mode 100644 src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java delete mode 100644 src/main/java/de/marhali/easyi18n/util/IOUtil.java delete mode 100644 src/main/java/de/marhali/easyi18n/util/JsonUtil.java delete mode 100644 src/main/java/de/marhali/easyi18n/util/TranslationsUtil.java diff --git a/src/main/java/de/marhali/easyi18n/DataBus.java b/src/main/java/de/marhali/easyi18n/DataBus.java index 56dba9b..101a8fd 100644 --- a/src/main/java/de/marhali/easyi18n/DataBus.java +++ b/src/main/java/de/marhali/easyi18n/DataBus.java @@ -1,6 +1,6 @@ package de.marhali.easyi18n; -import de.marhali.easyi18n.model.BusListener; +import de.marhali.easyi18n.model.bus.BusListener; import de.marhali.easyi18n.model.TranslationData; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/action/ReloadAction.java b/src/main/java/de/marhali/easyi18n/action/ReloadAction.java index 1f380fc..3e24e04 100644 --- a/src/main/java/de/marhali/easyi18n/action/ReloadAction.java +++ b/src/main/java/de/marhali/easyi18n/action/ReloadAction.java @@ -4,7 +4,7 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import de.marhali.easyi18n.service.LegacyDataStore; +import de.marhali.easyi18n.InstanceManager; import org.jetbrains.annotations.NotNull; @@ -23,6 +23,6 @@ public class ReloadAction extends AnAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - LegacyDataStore.getInstance(e.getProject()).reloadFromDisk(); + InstanceManager.get(e.getProject()).store().loadFromPersistenceLayer((success) -> {}); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java b/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java index 7466206..7702fba 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/AddDialog.java @@ -7,8 +7,9 @@ import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.JBTextField; -import de.marhali.easyi18n.service.LegacyDataStore; -import de.marhali.easyi18n.model.LegacyKeyedTranslation; +import de.marhali.easyi18n.InstanceManager; +import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.Translation; import de.marhali.easyi18n.model.TranslationCreate; import javax.swing.*; @@ -48,16 +49,16 @@ public class AddDialog { } private void saveTranslation() { - Map messages = new HashMap<>(); + Translation translation = new Translation(); valueTextFields.forEach((k, v) -> { if(!v.getText().isEmpty()) { - messages.put(k, v.getText()); + translation.put(k, v.getText()); } }); - TranslationCreate creation = new TranslationCreate(new LegacyKeyedTranslation(keyTextField.getText(), messages)); - LegacyDataStore.getInstance(project).processUpdate(creation); + TranslationCreate creation = new TranslationCreate(new KeyedTranslation(keyTextField.getText(), translation)); + InstanceManager.get(project).processUpdate(creation); } private DialogBuilder prepare() { @@ -75,7 +76,8 @@ public class AddDialog { JPanel valuePanel = new JPanel(new GridLayout(0, 1, 2, 2)); valueTextFields = new HashMap<>(); - for(String locale : LegacyDataStore.getInstance(project).getTranslations().getLocales()) { + + for(String locale : InstanceManager.get(project).store().getData().getLocales()) { JBLabel localeLabel = new JBLabel(locale); JBTextField localeText = new JBTextField(); localeLabel.setLabelFor(localeText); diff --git a/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java index 33023c1..7e788bf 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/EditDialog.java @@ -6,11 +6,12 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.components.JBTextField; -import de.marhali.easyi18n.service.LegacyDataStore; -import de.marhali.easyi18n.model.LegacyKeyedTranslation; +import de.marhali.easyi18n.InstanceManager; +import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.Translation; import de.marhali.easyi18n.model.TranslationDelete; -import de.marhali.easyi18n.model.LegacyTranslationUpdate; import de.marhali.easyi18n.dialog.descriptor.DeleteActionDescriptor; +import de.marhali.easyi18n.model.TranslationUpdate; import javax.swing.*; import javax.swing.border.EtchedBorder; @@ -26,12 +27,12 @@ import java.util.ResourceBundle; public class EditDialog { private final Project project; - private final LegacyKeyedTranslation origin; + private final KeyedTranslation origin; private JBTextField keyTextField; private Map valueTextFields; - public EditDialog(Project project, LegacyKeyedTranslation origin) { + public EditDialog(Project project, KeyedTranslation origin) { this.project = project; this.origin = origin; } @@ -40,23 +41,22 @@ public class EditDialog { int code = prepare().show(); if(code == DialogWrapper.OK_EXIT_CODE) { // Edit - LegacyDataStore.getInstance(project).processUpdate(new LegacyTranslationUpdate(origin, getChanges())); - + InstanceManager.get(project).processUpdate(new TranslationUpdate(origin, getChanges())); } else if(code == DeleteActionDescriptor.EXIT_CODE) { // Delete - LegacyDataStore.getInstance(project).processUpdate(new TranslationDelete(origin)); + InstanceManager.get(project).processUpdate(new TranslationDelete(origin)); } } - private LegacyKeyedTranslation getChanges() { - Map messages = new HashMap<>(); + private KeyedTranslation getChanges() { + Translation translation = new Translation(); valueTextFields.forEach((k, v) -> { if(!v.getText().isEmpty()) { - messages.put(k, v.getText()); + translation.put(k, v.getText()); } }); - return new LegacyKeyedTranslation(keyTextField.getText(), messages); + return new KeyedTranslation(keyTextField.getText(), translation); } private DialogBuilder prepare() { @@ -74,9 +74,10 @@ public class EditDialog { JPanel valuePanel = new JPanel(new GridLayout(0, 1, 2, 2)); valueTextFields = new HashMap<>(); - for(String locale : LegacyDataStore.getInstance(project).getTranslations().getLocales()) { + + for(String locale : InstanceManager.get(project).store().getData().getLocales()) { JBLabel localeLabel = new JBLabel(locale); - JBTextField localeText = new JBTextField(this.origin.getTranslations().get(locale)); + JBTextField localeText = new JBTextField(this.origin.getTranslation().get(locale)); localeLabel.setLabelFor(localeText); valuePanel.add(localeLabel); diff --git a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java index bf388d1..e0dd7eb 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java @@ -9,9 +9,9 @@ import com.intellij.ui.components.JBCheckBox; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBTextField; +import de.marhali.easyi18n.InstanceManager; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.service.SettingsService; -import de.marhali.easyi18n.service.LegacyDataStore; import javax.swing.*; import java.awt.*; @@ -50,7 +50,7 @@ public class SettingsDialog { state.setCodeAssistance(codeAssistanceCheckbox.isSelected()); // Reload instance - LegacyDataStore.getInstance(project).reloadFromDisk(); + InstanceManager.get(project).store().loadFromPersistenceLayer((success) -> {}); } } diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java b/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java index f90e753..6b9f91d 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java @@ -4,8 +4,6 @@ import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.project.Project; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.service.SettingsService; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java b/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java index 7166765..79e1e8e 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java @@ -5,9 +5,7 @@ import com.intellij.codeInsight.lookup.*; import com.intellij.icons.AllIcons; import com.intellij.openapi.project.*; import com.intellij.util.*; -import de.marhali.easyi18n.model.*; import de.marhali.easyi18n.service.*; -import de.marhali.easyi18n.util.TranslationsUtil; import org.jetbrains.annotations.*; import java.util.*; diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyReference.java b/src/main/java/de/marhali/easyi18n/editor/KeyReference.java index e319075..960f680 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyReference.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyReference.java @@ -6,9 +6,6 @@ import com.intellij.psi.impl.FakePsiElement; import de.marhali.easyi18n.dialog.AddDialog; import de.marhali.easyi18n.dialog.EditDialog; -import de.marhali.easyi18n.model.LegacyKeyedTranslation; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.service.LegacyDataStore; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java b/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java index 377ce8a..4debdc3 100644 --- a/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java +++ b/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java @@ -5,7 +5,6 @@ import com.intellij.psi.*; import com.intellij.util.ProcessingContext; import de.marhali.easyi18n.editor.KeyReference; -import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.service.SettingsService; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java b/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java index 3a18c8f..1ae339e 100644 --- a/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java +++ b/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java @@ -6,7 +6,6 @@ import com.intellij.psi.*; import com.intellij.util.ProcessingContext; import de.marhali.easyi18n.editor.KeyReference; -import de.marhali.easyi18n.service.LegacyDataStore; import de.marhali.easyi18n.service.SettingsService; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java index 1d18872..aee3088 100644 --- a/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java +++ b/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java @@ -2,8 +2,6 @@ package de.marhali.easyi18n.io; import com.intellij.openapi.project.Project; -import de.marhali.easyi18n.model.Translations; - import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; diff --git a/src/main/java/de/marhali/easyi18n/io/implementation/JsonTranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/implementation/JsonTranslatorIO.java index 1efbd0e..9bc18e3 100644 --- a/src/main/java/de/marhali/easyi18n/io/implementation/JsonTranslatorIO.java +++ b/src/main/java/de/marhali/easyi18n/io/implementation/JsonTranslatorIO.java @@ -7,10 +7,6 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import de.marhali.easyi18n.io.TranslatorIO; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.util.IOUtil; -import de.marhali.easyi18n.util.JsonUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/io/implementation/ModularizedJsonTranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/implementation/ModularizedJsonTranslatorIO.java index 0cc70d9..c49cd97 100644 --- a/src/main/java/de/marhali/easyi18n/io/implementation/ModularizedJsonTranslatorIO.java +++ b/src/main/java/de/marhali/easyi18n/io/implementation/ModularizedJsonTranslatorIO.java @@ -10,10 +10,6 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import de.marhali.easyi18n.io.TranslatorIO; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.util.IOUtil; -import de.marhali.easyi18n.util.JsonUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/io/implementation/PropertiesTranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/implementation/PropertiesTranslatorIO.java index 458c49a..ec25a04 100644 --- a/src/main/java/de/marhali/easyi18n/io/implementation/PropertiesTranslatorIO.java +++ b/src/main/java/de/marhali/easyi18n/io/implementation/PropertiesTranslatorIO.java @@ -6,12 +6,8 @@ import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import de.marhali.easyi18n.io.TranslatorIO; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.util.IOUtil; import de.marhali.easyi18n.util.SortedProperties; import de.marhali.easyi18n.util.StringUtil; -import de.marhali.easyi18n.util.TranslationsUtil; import org.apache.commons.lang.StringEscapeUtils; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/model/BusListener.java b/src/main/java/de/marhali/easyi18n/model/BusListener.java deleted file mode 100644 index 752dde0..0000000 --- a/src/main/java/de/marhali/easyi18n/model/BusListener.java +++ /dev/null @@ -1,29 +0,0 @@ -package de.marhali.easyi18n.model; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * Interface for communication of changes for participants of the data bus. - * @author marhali - */ -public interface BusListener { - /** - * Update the translations based on the supplied data. - * @param data Updated translations - */ - void onUpdateData(@NotNull TranslationData data); - - /** - * Move the specified translation key (full-key) into focus. - * @param key Absolute translation key - */ - void onFocusKey(@Nullable String key); - - /** - * Filter the displayed data according to the search query. Supply 'null' to return to the normal state. - * The keys and the content itself should be considered. - * @param query Filter key or content - */ - void onSearchQuery(@Nullable String query); -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/DataSynchronizer.java b/src/main/java/de/marhali/easyi18n/model/DataSynchronizer.java deleted file mode 100644 index 6604520..0000000 --- a/src/main/java/de/marhali/easyi18n/model/DataSynchronizer.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.marhali.easyi18n.model; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * Interface to communicate data changes between data store and ui components. - * @author marhali - */ -@Deprecated -public interface DataSynchronizer { - - /** - * Propagates data changes to implementation classes. - * @param translations Updated translations model - * @param searchQuery Can be used to filter visible data. Like a search function for the full key path - * @param scrollToKey Focus specific translation. Can be null to disable this function - */ - void synchronize(@NotNull Translations translations, @Nullable String searchQuery, @Nullable String scrollToKey); -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/LegacyKeyedTranslation.java b/src/main/java/de/marhali/easyi18n/model/LegacyKeyedTranslation.java deleted file mode 100644 index 1ef1e34..0000000 --- a/src/main/java/de/marhali/easyi18n/model/LegacyKeyedTranslation.java +++ /dev/null @@ -1,43 +0,0 @@ -package de.marhali.easyi18n.model; - -import java.util.Map; - -/** - * Translated messages for a dedicated key. - * @author marhali - */ -@Deprecated // Might be deprecated -public class LegacyKeyedTranslation { - - private String key; - private Map translations; - - public LegacyKeyedTranslation(String key, Map translations) { - this.key = key; - this.translations = translations; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public Map getTranslations() { - return translations; - } - - public void setTranslations(Map translations) { - this.translations = translations; - } - - @Override - public String toString() { - return "KeyedTranslation{" + - "key='" + key + '\'' + - ", translations=" + translations + - '}'; - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/LegacyTranslationUpdate.java b/src/main/java/de/marhali/easyi18n/model/LegacyTranslationUpdate.java deleted file mode 100644 index 2a73c01..0000000 --- a/src/main/java/de/marhali/easyi18n/model/LegacyTranslationUpdate.java +++ /dev/null @@ -1,47 +0,0 @@ -package de.marhali.easyi18n.model; - -import org.jetbrains.annotations.Nullable; - -/** - * Represents an update for a translated I18n-Key. Supports key creation, manipulation and deletion. - * @author marhali - */ -@Deprecated -public class LegacyTranslationUpdate { - - private final @Nullable LegacyKeyedTranslation origin; - private final @Nullable LegacyKeyedTranslation change; - - public LegacyTranslationUpdate(@Nullable LegacyKeyedTranslation origin, @Nullable LegacyKeyedTranslation change) { - this.origin = origin; - this.change = change; - } - - public LegacyKeyedTranslation getOrigin() { - return origin; - } - - public LegacyKeyedTranslation getChange() { - return change; - } - - public boolean isCreation() { - return origin == null; - } - - public boolean isDeletion() { - return change == null; - } - - public boolean isKeyChange() { - return origin != null && change != null && !origin.getKey().equals(change.getKey()); - } - - @Override - public String toString() { - return "TranslationUpdate{" + - "origin=" + origin + - ", change=" + change + - '}'; - } -} diff --git a/src/main/java/de/marhali/easyi18n/model/LocalizedNode.java b/src/main/java/de/marhali/easyi18n/model/LocalizedNode.java deleted file mode 100644 index 85376f1..0000000 --- a/src/main/java/de/marhali/easyi18n/model/LocalizedNode.java +++ /dev/null @@ -1,78 +0,0 @@ -package de.marhali.easyi18n.model; - -import de.marhali.easyi18n.util.MapUtil; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.*; - -/** - * Represents structured tree view for translated messages. - * @author marhali - */ -@Deprecated -public class LocalizedNode { - - public static final String ROOT_KEY = "root"; - - @NotNull - private final String key; - - @NotNull - private TreeMap children; - - @NotNull - private Map value; - - public LocalizedNode(@NotNull String key, @NotNull List children) { - this.key = key; - this.children = MapUtil.convertToTreeMap(children); - this.value = new HashMap<>(); - } - - public LocalizedNode(@NotNull String key, @NotNull Map value) { - this.key = key; - this.children = new TreeMap<>(); - this.value = value; - } - - public @NotNull String getKey() { - return key; - } - - public boolean isLeaf() { - return children.isEmpty(); - } - - public @NotNull Collection getChildren() { - return children.values(); - } - - public @Nullable LocalizedNode getChildren(@NotNull String key) { - return children.get(key); - } - - public void setChildren(@NotNull LocalizedNode... children) { - this.value.clear(); - this.children = MapUtil.convertToTreeMap(Arrays.asList(children)); - } - - public void addChildren(@NotNull LocalizedNode... children) { - this.value.clear(); - Arrays.stream(children).forEach(e -> this.children.put(e.getKey(), e)); - } - - public void removeChildren(@NotNull String key) { - this.children.remove(key); - } - - public @NotNull Map getValue() { - return value; - } - - public void setValue(@NotNull Map value) { - this.children.clear(); - this.value = value; - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java b/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java index 0d6d2aa..9c955a9 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationCreate.java @@ -6,8 +6,8 @@ import org.jetbrains.annotations.NotNull; * Represents update request to create a new translation. * @author marhali */ -public class TranslationCreate extends LegacyTranslationUpdate { - public TranslationCreate(@NotNull LegacyKeyedTranslation translation) { +public class TranslationCreate extends TranslationUpdate { + public TranslationCreate(@NotNull KeyedTranslation translation) { super(null, translation); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java b/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java index 14d7ee0..763cb16 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationDelete.java @@ -6,8 +6,8 @@ import org.jetbrains.annotations.NotNull; * Represents update request to delete a existing translation. * @author marhali */ -public class TranslationDelete extends LegacyTranslationUpdate { - public TranslationDelete(@NotNull LegacyKeyedTranslation translation) { +public class TranslationDelete extends TranslationUpdate { + public TranslationDelete(@NotNull KeyedTranslation translation) { super(translation, null); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/Translations.java b/src/main/java/de/marhali/easyi18n/model/Translations.java deleted file mode 100644 index 8727507..0000000 --- a/src/main/java/de/marhali/easyi18n/model/Translations.java +++ /dev/null @@ -1,109 +0,0 @@ -package de.marhali.easyi18n.model; - -import de.marhali.easyi18n.util.TranslationsUtil; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.List; - -/** - * Represents translation state instance. IO operations will be based on this file. - * @author marhali - */ -@Deprecated -public class Translations { - - public static Translations empty() { - return new Translations(new ArrayList<>(), new LocalizedNode(LocalizedNode.ROOT_KEY, new ArrayList<>())); - } - - @NotNull - private final List locales; - - @NotNull - private final LocalizedNode nodes; - - /** - * Constructs a new translation state instance. - * @param locales List of all locales which are used for create / edit I18n-Key operations - * @param nodes Represents the translation state. Internally handled as a tree. See {@link LocalizedNode} - */ - public Translations(@NotNull List locales, @NotNull LocalizedNode nodes) { - this.locales = locales; - this.nodes = nodes; - } - - public @NotNull List getLocales() { - return locales; - } - - public @NotNull LocalizedNode getNodes() { - return nodes; - } - - public @Nullable LocalizedNode getNode(@NotNull String fullPath) { - List sections = TranslationsUtil.getSections(fullPath); - - LocalizedNode node = nodes; - - for(String section : sections) { - if(node == null) { - return null; - } - node = node.getChildren(section); - } - - return node; - } - - public @NotNull LocalizedNode getOrCreateNode(@NotNull String fullPath) { - List sections = TranslationsUtil.getSections(fullPath); - - LocalizedNode node = nodes; - - for(String section : sections) { - LocalizedNode subNode = node.getChildren(section); - - if(subNode == null) { - subNode = new LocalizedNode(section, new ArrayList<>()); - node.addChildren(subNode); - } - - node = subNode; - } - - return node; - } - - public @NotNull List getFullKeys() { - List keys = new ArrayList<>(); - - if(nodes.isLeaf()) { // Root has no children - return keys; - } - - for(LocalizedNode children : nodes.getChildren()) { - keys.addAll(getFullKeys("", children)); - } - - return keys; - } - - public @NotNull List getFullKeys(String parentFullPath, LocalizedNode localizedNode) { - List keys = new ArrayList<>(); - - if(localizedNode.isLeaf()) { - keys.add(parentFullPath + (parentFullPath.isEmpty() ? "" : ".") + localizedNode.getKey()); - return keys; - } - - for(LocalizedNode children : localizedNode.getChildren()) { - String childrenPath = parentFullPath + (parentFullPath.isEmpty() ? "" : ".") + localizedNode.getKey(); - keys.addAll(getFullKeys(childrenPath, children)); - } - - return keys; - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/bus/BusListener.java b/src/main/java/de/marhali/easyi18n/model/bus/BusListener.java new file mode 100644 index 0000000..76a7c17 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/bus/BusListener.java @@ -0,0 +1,8 @@ +package de.marhali.easyi18n.model.bus; + +/** + * Interface for communication of changes for participants of the data bus. + * Every listener needs to be registered manually via {@link de.marhali.easyi18n.DataBus}. + * @author marhali + */ +public interface BusListener extends UpdateDataListener, FocusKeyListener, SearchQueryListener {} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/bus/FocusKeyListener.java b/src/main/java/de/marhali/easyi18n/model/bus/FocusKeyListener.java new file mode 100644 index 0000000..ce3069f --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/bus/FocusKeyListener.java @@ -0,0 +1,15 @@ +package de.marhali.easyi18n.model.bus; + +import org.jetbrains.annotations.Nullable; + +/** + * Single event listener. + * @author marhali + */ +public interface FocusKeyListener { + /** + * Move the specified translation key (full-key) into focus. + * @param key Absolute translation key + */ + void onFocusKey(@Nullable String key); +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/bus/SearchQueryListener.java b/src/main/java/de/marhali/easyi18n/model/bus/SearchQueryListener.java new file mode 100644 index 0000000..293f3ce --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/bus/SearchQueryListener.java @@ -0,0 +1,16 @@ +package de.marhali.easyi18n.model.bus; + +import org.jetbrains.annotations.Nullable; + +/** + * Single event listener. + * @author marhali + */ +public interface SearchQueryListener { + /** + * Filter the displayed data according to the search query. Supply 'null' to return to the normal state. + * The keys and the content itself should be considered. + * @param query Filter key or content + */ + void onSearchQuery(@Nullable String query); +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/bus/UpdateDataListener.java b/src/main/java/de/marhali/easyi18n/model/bus/UpdateDataListener.java new file mode 100644 index 0000000..d6c9cb2 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/model/bus/UpdateDataListener.java @@ -0,0 +1,16 @@ +package de.marhali.easyi18n.model.bus; + +import de.marhali.easyi18n.model.TranslationData; +import org.jetbrains.annotations.NotNull; + +/** + * Single event listener. + * @author marhali + */ +public interface UpdateDataListener { + /** + * Update the translations based on the supplied data. + * @param data Updated translations + */ + void onUpdateData(@NotNull TranslationData data); +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java b/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java index 4a23fbc..8f76acb 100644 --- a/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java +++ b/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java @@ -1,10 +1,5 @@ package de.marhali.easyi18n.model.table; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.LegacyKeyedTranslation; -import de.marhali.easyi18n.model.LegacyTranslationUpdate; -import de.marhali.easyi18n.model.Translations; - import org.jetbrains.annotations.Nls; import javax.swing.event.TableModelListener; diff --git a/src/main/java/de/marhali/easyi18n/model/tree/TreeModelTranslator.java b/src/main/java/de/marhali/easyi18n/model/tree/TreeModelTranslator.java index a479deb..7c7bc4a 100644 --- a/src/main/java/de/marhali/easyi18n/model/tree/TreeModelTranslator.java +++ b/src/main/java/de/marhali/easyi18n/model/tree/TreeModelTranslator.java @@ -5,9 +5,6 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.JBColor; import de.marhali.easyi18n.service.SettingsService; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.util.TranslationsUtil; import de.marhali.easyi18n.util.UiUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java b/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java deleted file mode 100644 index bcf344e..0000000 --- a/src/main/java/de/marhali/easyi18n/service/LegacyDataStore.java +++ /dev/null @@ -1,174 +0,0 @@ -package de.marhali.easyi18n.service; - -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.ModalityState; -import com.intellij.openapi.project.Project; - -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.io.TranslatorIO; -import de.marhali.easyi18n.model.DataSynchronizer; -import de.marhali.easyi18n.model.LegacyKeyedTranslation; -import de.marhali.easyi18n.model.TranslationDelete; -import de.marhali.easyi18n.model.LegacyTranslationUpdate; -import de.marhali.easyi18n.util.IOUtil; -import de.marhali.easyi18n.util.TranslationsUtil; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.function.Consumer; - -/** - * Factory service to manage localized messages for multiple projects at once. - * @author marhali - */ -@Deprecated -public class LegacyDataStore { - - private static final Map INSTANCES = new WeakHashMap<>(); - - private final Project project; - private final List synchronizer; - - private Translations translations; - private String searchQuery; - - public static LegacyDataStore getInstance(@NotNull Project project) { - LegacyDataStore store = INSTANCES.get(project); - - if(store == null) { - store = new LegacyDataStore(project); - INSTANCES.put(project, store); - } - - return store; - } - - private LegacyDataStore(@NotNull Project project) { - this.project = project; - this.synchronizer = new ArrayList<>(); - this.translations = Translations.empty(); - - // Load data after first initialization - ApplicationManager.getApplication().invokeLater(this::reloadFromDisk, ModalityState.NON_MODAL); - } - - /** - * Registers a new synchronizer which will receive {@link #translations} updates. - * @param synchronizer Synchronizer. See {@link DataSynchronizer} - */ - public void addSynchronizer(DataSynchronizer synchronizer) { - this.synchronizer.add(synchronizer); - } - - /** - * Loads all translations from disk and overrides current {@link #translations} state. - */ - public void reloadFromDisk() { - String localesPath = SettingsService.getInstance(project).getState().getLocalesPath(); - - if(localesPath == null || localesPath.isEmpty()) { - // Propagate empty state - this.translations = Translations.empty(); - synchronize(searchQuery, null); - - } else { - TranslatorIO io = IOUtil.determineFormat(project, localesPath); - - io.read(project, localesPath, (loadedTranslations) -> { - this.translations = loadedTranslations == null ? Translations.empty() : loadedTranslations; - synchronize(searchQuery, null); - }); - } - } - - /** - * Saves the current translation state to disk. See {@link TranslatorIO#save(Project, Translations, String, Consumer)} - * @param callback Complete callback. Indicates if operation was successful(true) or not - */ - public void saveToDisk(@NotNull Consumer callback) { - String localesPath = SettingsService.getInstance(project).getState().getLocalesPath(); - - if(localesPath == null || localesPath.isEmpty()) { // Cannot save without valid path - return; - } - - TranslatorIO io = IOUtil.determineFormat(project, localesPath); - io.save(project, translations, localesPath, callback); - } - - /** - * Propagates provided search string to all synchronizer to display only relevant keys - * @param fullPath Full i18n key (e.g. user.username.title). Can be null to display all keys - */ - public void searchBeyKey(@Nullable String fullPath) { - // Use synchronizer to propagate search instance to all views - synchronize(this.searchQuery = fullPath, null); - } - - /** - * Processes the provided update. Updates translation instance and propagates changes. See {@link DataSynchronizer} - * @param update The update to process. For more information see {@link LegacyTranslationUpdate} - */ - public void processUpdate(LegacyTranslationUpdate update) { - if(update.isDeletion() || update.isKeyChange()) { // Delete origin i18n key - String originKey = update.getOrigin().getKey(); - List sections = TranslationsUtil.getSections(originKey); - String nodeKey = sections.remove(sections.size() - 1); // Remove last node, which needs to be removed by parent - - LocalizedNode node = translations.getNodes(); - for(String section : sections) { - if(node == null) { // Might be possible on multi-delete - break; - } - - node = node.getChildren(section); - } - - if(node != null) { // Only remove if parent exists. Might be already deleted on multi-delete - node.removeChildren(nodeKey); - - // Parent is empty now, we need to remove it as well (except root) - if(node.getChildren().isEmpty() && !node.getKey().equals(LocalizedNode.ROOT_KEY)) { - processUpdate(new TranslationDelete(new LegacyKeyedTranslation( - TranslationsUtil.sectionsToFullPath(sections), null))); - } - } - } - - String scrollTo = update.isDeletion() ? null : update.getChange().getKey(); - - if(!update.isDeletion()) { // Recreate with changed val / create - LocalizedNode node = translations.getOrCreateNode(update.getChange().getKey()); - node.setValue(update.getChange().getTranslations()); - } - - // Persist changes and propagate them on success - saveToDisk(success -> { - if(success) { - synchronize(searchQuery, scrollTo); - } - }); - } - - /** - * @return Current translation state - */ - public @NotNull Translations getTranslations() { - return translations; - } - - /** - * Synchronizes current translation's state to all connected subscribers. - * @param searchQuery Optional search by full key filter (ui view) - * @param scrollTo Optional scroll to full key (ui view) - */ - public void synchronize(@Nullable String searchQuery, @Nullable String scrollTo) { - synchronizer.forEach(subscriber -> subscriber.synchronize(this.translations, searchQuery, scrollTo)); - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java index 844985a..fb6a6e7 100644 --- a/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java +++ b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java @@ -7,8 +7,7 @@ import com.intellij.openapi.wm.ToolWindowFactory; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; -import de.marhali.easyi18n.service.LegacyDataStore; -import de.marhali.easyi18n.service.WindowManager; +import de.marhali.easyi18n.InstanceManager; import de.marhali.easyi18n.action.*; import de.marhali.easyi18n.tabs.TableView; import de.marhali.easyi18n.tabs.TreeView; @@ -48,16 +47,16 @@ public class TranslatorToolWindowFactory implements ToolWindowFactory { actions.add(new AddAction()); actions.add(new ReloadAction()); actions.add(new SettingsAction()); - actions.add(new SearchAction((searchString) -> LegacyDataStore.getInstance(project).searchBeyKey(searchString))); + actions.add(new SearchAction((query) -> InstanceManager.get(project).bus().propagate().onSearchQuery(query))); toolWindow.setTitleActions(actions); // Initialize Window Manager WindowManager.getInstance().initialize(toolWindow, treeView, tableView); // Synchronize ui with underlying data - LegacyDataStore store = LegacyDataStore.getInstance(project); - store.addSynchronizer(treeView); - store.addSynchronizer(tableView); - store.synchronize(null, null); + InstanceManager manager = InstanceManager.get(project); + manager.bus().addListener(treeView); + manager.bus().addListener(tableView); + manager.bus().propagate().onUpdateData(manager.store().getData()); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/tabs/TableView.java b/src/main/java/de/marhali/easyi18n/tabs/TableView.java index 773038c..c7f2e3b 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TableView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TableView.java @@ -4,17 +4,14 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.JBTable; -import de.marhali.easyi18n.service.LegacyDataStore; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.DataSynchronizer; -import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.model.LegacyKeyedTranslation; -import de.marhali.easyi18n.model.TranslationDelete; -import de.marhali.easyi18n.model.table.TableModelTranslator; +import de.marhali.easyi18n.InstanceManager; +import de.marhali.easyi18n.model.*; import de.marhali.easyi18n.dialog.EditDialog; import de.marhali.easyi18n.listener.DeleteKeyListener; import de.marhali.easyi18n.listener.PopupClickListener; +import de.marhali.easyi18n.model.bus.BusListener; import de.marhali.easyi18n.renderer.TableRenderer; +import de.marhali.easyi18n.tabs.mapper.TableModelMapper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,7 +25,7 @@ import java.util.ResourceBundle; * Shows translation state as table. * @author marhali */ -public class TableView implements DataSynchronizer { +public class TableView implements BusListener { private final Project project; @@ -54,10 +51,10 @@ public class TableView implements DataSynchronizer { if(row >= 0) { String fullPath = String.valueOf(table.getValueAt(row, 0)); - LocalizedNode node = LegacyDataStore.getInstance(project).getTranslations().getNode(fullPath); + Translation translation = InstanceManager.get(project).store().getData().getTranslation(fullPath); - if(node != null) { - new EditDialog(project, new LegacyKeyedTranslation(fullPath, node.getValue())).showAndHandle(); + if(translation != null) { + new EditDialog(project, new KeyedTranslation(fullPath, translation)).showAndHandle(); } } } @@ -67,33 +64,38 @@ public class TableView implements DataSynchronizer { for (int selectedRow : table.getSelectedRows()) { String fullPath = String.valueOf(table.getValueAt(selectedRow, 0)); - LegacyDataStore.getInstance(project).processUpdate( - new TranslationDelete(new LegacyKeyedTranslation(fullPath, null))); + InstanceManager.get(project).processUpdate( + new TranslationDelete(new KeyedTranslation(fullPath, null)) + ); } }; } @Override - public void synchronize(@NotNull Translations translations, - @Nullable String searchQuery, @Nullable String scrollTo) { + public void onUpdateData(@NotNull TranslationData data) { + table.setModel(new TableModelMapper(data, update -> + InstanceManager.get(project).processUpdate(update))); + } - table.setModel(new TableModelTranslator(translations, searchQuery, update -> - LegacyDataStore.getInstance(project).processUpdate(update))); + @Override + public void onFocusKey(@Nullable String key) { + int row = -1; - if(scrollTo != null) { - int row = -1; - - for (int i = 0; i < table.getRowCount(); i++) { - if (String.valueOf(table.getValueAt(i, 0)).equals(scrollTo)) { - row = i; - } - } - - if (row > -1) { // Matched @scrollTo - table.scrollRectToVisible( - new Rectangle(0, (row * table.getRowHeight()) + table.getHeight(), 0, 0)); + for (int i = 0; i < table.getRowCount(); i++) { + if (String.valueOf(table.getValueAt(i, 0)).equals(key)) { + row = i; } } + + if (row > -1) { // Matched @scrollTo + table.scrollRectToVisible( + new Rectangle(0, (row * table.getRowHeight()) + table.getHeight(), 0, 0)); + } + } + + @Override + public void onSearchQuery(@Nullable String query) { + // TODO: handle search functionality } public JPanel getRootPanel() { diff --git a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java index 3bc9ccb..726526b 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java @@ -8,19 +8,20 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.treeStructure.Tree; -import de.marhali.easyi18n.service.LegacyDataStore; -import de.marhali.easyi18n.model.LocalizedNode; -import de.marhali.easyi18n.model.DataSynchronizer; -import de.marhali.easyi18n.model.Translations; -import de.marhali.easyi18n.model.LegacyKeyedTranslation; +import de.marhali.easyi18n.InstanceManager; +import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.Translation; +import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationDelete; -import de.marhali.easyi18n.model.tree.TreeModelTranslator; +import de.marhali.easyi18n.model.bus.BusListener; import de.marhali.easyi18n.action.treeview.CollapseTreeViewAction; import de.marhali.easyi18n.action.treeview.ExpandTreeViewAction; import de.marhali.easyi18n.dialog.EditDialog; import de.marhali.easyi18n.listener.DeleteKeyListener; import de.marhali.easyi18n.listener.PopupClickListener; import de.marhali.easyi18n.renderer.TreeRenderer; +import de.marhali.easyi18n.service.SettingsService; +import de.marhali.easyi18n.tabs.mapper.TreeModelMapper; import de.marhali.easyi18n.util.TreeUtil; import org.jetbrains.annotations.NotNull; @@ -36,7 +37,7 @@ import java.util.ResourceBundle; * Show translation state as tree. * @author marhali */ -public class TreeView implements DataSynchronizer { +public class TreeView implements BusListener { private final Project project; @@ -46,6 +47,8 @@ public class TreeView implements DataSynchronizer { private Tree tree; + private TreeModelMapper mapper; + public TreeView(Project project) { this.project = project; @@ -77,19 +80,20 @@ public class TreeView implements DataSynchronizer { } @Override - public void synchronize(@NotNull Translations translations, - @Nullable String searchQuery, @Nullable String scrollTo) { + public void onUpdateData(@NotNull TranslationData data) { + tree.setModel(this.mapper = new TreeModelMapper(data, SettingsService.getInstance(project).getState(), null)); + } - TreeModelTranslator model = new TreeModelTranslator(project, translations, searchQuery); - tree.setModel(model); - - if(searchQuery != null && !searchQuery.isEmpty()) { - expandAll().run(); + @Override + public void onFocusKey(@Nullable String key) { + if(key != null && mapper != null) { + this.tree.scrollPathToVisible(mapper.findTreePath(key)); } + } - if(scrollTo != null) { - tree.scrollPathToVisible(model.findTreePath(scrollTo)); - } + @Override + public void onSearchQuery(@Nullable String query) { + // TODO: handle search functionality } private void handlePopup(MouseEvent e) { @@ -100,10 +104,10 @@ public class TreeView implements DataSynchronizer { if(node.getUserObject() instanceof PresentationData) { String fullPath = TreeUtil.getFullPath(path); - LocalizedNode localizedNode = LegacyDataStore.getInstance(project).getTranslations().getNode(fullPath); + Translation translation = InstanceManager.get(project).store().getData().getTranslation(fullPath); - if(localizedNode != null) { - new EditDialog(project,new LegacyKeyedTranslation(fullPath, localizedNode.getValue())).showAndHandle(); + if(translation != null) { + new EditDialog(project, new KeyedTranslation(fullPath, translation)).showAndHandle(); } } } @@ -120,8 +124,9 @@ public class TreeView implements DataSynchronizer { for (TreePath path : tree.getSelectionPaths()) { String fullPath = TreeUtil.getFullPath(path); - LegacyDataStore.getInstance(project).processUpdate( - new TranslationDelete(new LegacyKeyedTranslation(fullPath, null))); + InstanceManager.get(project).processUpdate( + new TranslationDelete(new KeyedTranslation(fullPath, null)) + ); } }; } diff --git a/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java b/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java new file mode 100644 index 0000000..513b14b --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java @@ -0,0 +1,112 @@ +package de.marhali.easyi18n.tabs.mapper; + +import de.marhali.easyi18n.model.*; + +import de.marhali.easyi18n.model.bus.BusListener; +import de.marhali.easyi18n.model.bus.SearchQueryListener; +import de.marhali.easyi18n.model.bus.UpdateDataListener; +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.event.TableModelListener; +import javax.swing.table.TableModel; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +/** + * Mapping {@link TranslationData} to {@link TableModel}. + * @author marhali + */ +public class TableModelMapper implements TableModel { + + private final @NotNull TranslationData data; + private final @NotNull List locales; + private final @NotNull List fullKeys; + + private final @NotNull Consumer updater; + + public TableModelMapper(@NotNull TranslationData data, Consumer updater) { + this.data = data; + this.locales = new ArrayList<>(data.getLocales()); + this.fullKeys = new ArrayList<>(data.getFullKeys()); + + this.updater = updater; + } + + @Override + public int getRowCount() { + return this.fullKeys.size(); + } + + @Override + public int getColumnCount() { + return this.locales.size() + 1; // Number of locales + 1 (key column) + } + + @Nls + @Override + public String getColumnName(int columnIndex) { + if(columnIndex == 0) { + return "Key"; + } + + return "" + this.locales.get(columnIndex - 1) + ""; + } + + @Override + public Class getColumnClass(int columnIndex) { + return String.class; + } + + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return rowIndex > 0; // Everything should be editable except the headline + } + + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + if(columnIndex == 0) { // Keys + return this.fullKeys.get(rowIndex); + } + + String key = this.fullKeys.get(rowIndex); + String locale = this.locales.get(columnIndex - 1); + Translation translation = this.data.getTranslation(key); + + return translation == null ? null : translation.get(locale); + } + + @Override + public void setValueAt(Object aValue, int rowIndex, int columnIndex) { + String key = String.valueOf(this.getValueAt(rowIndex, 0)); + Translation translation = this.data.getTranslation(key); + + if(translation == null) { // Unknown cell + return; + } + + String newKey = columnIndex == 0 ? String.valueOf(aValue) : key; + + // Translation content update + if(columnIndex > 0) { + if(aValue == null || ((String) aValue).isEmpty()) { + translation.remove(this.locales.get(columnIndex - 1)); + } else { + translation.put(this.locales.get(columnIndex - 1), String.valueOf(aValue)); + } + } + + TranslationUpdate update = new TranslationUpdate(new KeyedTranslation(key, translation), + new KeyedTranslation(newKey, translation)); + + this.updater.accept(update); + } + + @Override + public void addTableModelListener(TableModelListener l) {} + + @Override + public void removeTableModelListener(TableModelListener l) {} +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java b/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java new file mode 100644 index 0000000..1c08dac --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java @@ -0,0 +1,104 @@ +package de.marhali.easyi18n.tabs.mapper; + +import com.intellij.ide.projectView.PresentationData; +import com.intellij.ui.JBColor; + +import de.marhali.easyi18n.model.SettingsState; +import de.marhali.easyi18n.model.TranslationData; +import de.marhali.easyi18n.model.TranslationNode; +import de.marhali.easyi18n.util.PathUtil; +import de.marhali.easyi18n.util.UiUtil; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.tree.*; +import java.util.List; +import java.util.Map; + +/** + * Mapping {@link TranslationData} to {@link TreeModel}. + * @author marhali + */ +public class TreeModelMapper extends DefaultTreeModel { + + private final TranslationData data; + private final SettingsState state; + + public TreeModelMapper(TranslationData data, SettingsState state, String searchQuery) { + super(null); + + this.data = data; + this.state = state; + + DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(); + this.generateNodes(rootNode, this.data.getRootNode()); + super.setRoot(rootNode); + } + + private void generateNodes(DefaultMutableTreeNode parent, TranslationNode translationNode) { + for(Map.Entry entry : translationNode.getChildren().entrySet()) { + String key = entry.getKey(); + TranslationNode childTranslationNode = entry.getValue(); + + if(!childTranslationNode.isLeaf()) { + // Nested node - run recursively + DefaultMutableTreeNode childNode = new DefaultMutableTreeNode(key); + this.generateNodes(childNode, childTranslationNode); + parent.add(childNode); + } else { + String previewLocale = this.state.getPreviewLocale(); + String sub = "(" + previewLocale + ": " + childTranslationNode.getValue().get(previewLocale) + ")"; + String tooltip = UiUtil.generateHtmlTooltip(childTranslationNode.getValue()); + + PresentationData data = new PresentationData(key, sub, null, null); + data.setTooltip(tooltip); + + if(childTranslationNode.getValue().size() != this.data.getLocales().size()) { + data.setForcedTextForeground(JBColor.RED); + } + + parent.add(new DefaultMutableTreeNode(data)); + } + } + } + + + public @NotNull TreePath findTreePath(@NotNull String fullPath) { + List sections = new PathUtil(this.state.isNestedKeys()).split(fullPath); + Object[] nodes = new Object[sections.size() + 1]; + + int pos = 0; + TreeNode currentNode = (TreeNode) this.getRoot(); + nodes[pos] = currentNode; + + for(String section : sections) { + pos++; + currentNode = this.findNode(currentNode, section); + nodes[pos] = currentNode; + } + + return new TreePath(nodes); + } + + public @Nullable DefaultMutableTreeNode findNode(@NotNull TreeNode parent, @NotNull String key) { + for(int i = 0; i < parent.getChildCount(); i++) { + TreeNode child = parent.getChildAt(i); + + if(child instanceof DefaultMutableTreeNode) { + DefaultMutableTreeNode mutableChild = (DefaultMutableTreeNode) child; + String childKey = mutableChild.getUserObject().toString(); + + if(mutableChild.getUserObject() instanceof PresentationData) { + childKey = ((PresentationData) mutableChild.getUserObject()).getPresentableText(); + } + + if(childKey != null && childKey.equals(key)) { + return mutableChild; + } + } + } + + throw new NullPointerException("Cannot find node by key: " + key); + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/util/IOUtil.java b/src/main/java/de/marhali/easyi18n/util/IOUtil.java deleted file mode 100644 index a83629d..0000000 --- a/src/main/java/de/marhali/easyi18n/util/IOUtil.java +++ /dev/null @@ -1,72 +0,0 @@ -package de.marhali.easyi18n.util; - -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; -import de.marhali.easyi18n.io.implementation.*; -import de.marhali.easyi18n.io.TranslatorIO; - -import de.marhali.easyi18n.service.SettingsService; -import org.jetbrains.annotations.NotNull; - -import java.io.File; - -/** - * IO operations utility. - * @author marhali - */ -@Deprecated -public class IOUtil { - - /** - * Determines the {@link TranslatorIO} which should be used for the specified directoryPath - * @param project Current intellij project - * @param directoryPath The full path to the parent directory which holds the translation files - * @return IO handler to use for file operations - */ - public static TranslatorIO determineFormat(@NotNull Project project, @NotNull String directoryPath) { - VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(directoryPath)); - - if(directory == null || directory.getChildren() == null) { - throw new IllegalArgumentException("Specified folder is invalid (" + directoryPath + ")"); - } - - VirtualFile[] children = directory.getChildren(); - - for(VirtualFile file : children) { - if(file.isDirectory()) { // Modularized locale files - // ATM we only support modularized JSON files - return new ModularizedJsonTranslatorIO(); - } - - if(!isFileRelevant(project, file)) { - continue; - } - - switch(file.getFileType().getDefaultExtension().toLowerCase()) { - case "json": - return new JsonTranslatorIO(); - case "properties": - return new PropertiesTranslatorIO(); - case "yml": - return new YamlTranslatorIO(); - default: - System.err.println("Unsupported i18n locale file format: " - + file.getFileType().getDefaultExtension()); - } - } - - throw new IllegalStateException("Could not determine i18n format. At least one locale file must be defined"); - } - - /** - * Checks if the provided file matches the file pattern specified by configuration - * @param project Current intellij project - * @param file File to check - * @return True if relevant otherwise false - */ - public static boolean isFileRelevant(@NotNull Project project, @NotNull VirtualFile file) { - String pattern = SettingsService.getInstance(project).getState().getFilePattern(); - return file.getName().matches(pattern); - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/util/JsonUtil.java b/src/main/java/de/marhali/easyi18n/util/JsonUtil.java deleted file mode 100644 index 48c57cf..0000000 --- a/src/main/java/de/marhali/easyi18n/util/JsonUtil.java +++ /dev/null @@ -1,97 +0,0 @@ -package de.marhali.easyi18n.util; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; - -import de.marhali.easyi18n.model.LocalizedNode; - -import de.marhali.easyi18n.util.array.JsonArrayUtil; -import org.apache.commons.lang.StringEscapeUtils; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -/** - * Json tree utilities for writing and reading {@link LocalizedNode}'s - * @author marhali - */ -public class JsonUtil { - - /** - * Creates a {@link JsonObject} based from an {@link LocalizedNode} - * @param locale Current locale - * @param parent Parent json. Can be an entire json document - * @param node The node instance - */ - public static void writeTree(String locale, JsonObject parent, LocalizedNode node) { - if(node.isLeaf() && !node.getKey().equals(LocalizedNode.ROOT_KEY)) { - if(node.getValue().get(locale) != null) { - - if(JsonArrayUtil.isArray(node.getValue().get(locale))) { - parent.add(node.getKey(), JsonArrayUtil.write(node.getValue().get(locale))); - } else { - String value = StringEscapeUtils.unescapeJava(node.getValue().get(locale)); - parent.add(node.getKey(), new JsonPrimitive(value)); - } - } - - } else { - for(LocalizedNode children : node.getChildren()) { - if(children.isLeaf()) { - writeTree(locale, parent, children); - } else { - JsonObject childrenJson = new JsonObject(); - writeTree(locale, childrenJson, children); - if(childrenJson.size() > 0) { - parent.add(children.getKey(), childrenJson); - } - } - } - } - } - - /** - * Reads a {@link JsonObject} and writes the tree into the provided {@link LocalizedNode} - * @param locale Current locale - * @param json Json to read - * @param data Node. Can be a root node - */ - public static void readTree(String locale, JsonObject json, LocalizedNode data) { - for(Map.Entry entry : json.entrySet()) { - String key = entry.getKey(); - - try { - // Try to go one level deeper - JsonObject childObject = entry.getValue().getAsJsonObject(); - - LocalizedNode childrenNode = data.getChildren(key); - - if(childrenNode == null) { - childrenNode = new LocalizedNode(key, new ArrayList<>()); - data.addChildren(childrenNode); - } - - readTree(locale, childObject, childrenNode); - - } catch(IllegalStateException e) { // Reached end for this node - LocalizedNode leafNode = data.getChildren(key); - - if(leafNode == null) { - leafNode = new LocalizedNode(key, new HashMap<>()); - data.addChildren(leafNode); - } - - Map messages = leafNode.getValue(); - - String value = entry.getValue().isJsonArray() - ? JsonArrayUtil.read(entry.getValue().getAsJsonArray()) - : StringUtil.escapeControls(entry.getValue().getAsString(), true); - - messages.put(locale, value); - leafNode.setValue(messages); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/util/MapUtil.java b/src/main/java/de/marhali/easyi18n/util/MapUtil.java index e7a1c0d..d6b12ad 100644 --- a/src/main/java/de/marhali/easyi18n/util/MapUtil.java +++ b/src/main/java/de/marhali/easyi18n/util/MapUtil.java @@ -1,7 +1,5 @@ package de.marhali.easyi18n.util; -import de.marhali.easyi18n.model.LocalizedNode; - import java.util.List; import java.util.TreeMap; @@ -9,6 +7,7 @@ import java.util.TreeMap; * Map utilities. * @author marhali */ +@Deprecated public class MapUtil { /** diff --git a/src/main/java/de/marhali/easyi18n/util/SortedProperties.java b/src/main/java/de/marhali/easyi18n/util/SortedProperties.java index 5b8f9c7..8a5c321 100644 --- a/src/main/java/de/marhali/easyi18n/util/SortedProperties.java +++ b/src/main/java/de/marhali/easyi18n/util/SortedProperties.java @@ -6,6 +6,7 @@ import java.util.*; * Applies sorting to {@link Properties} files. * @author marhali */ +@Deprecated public class SortedProperties extends Properties { @Override diff --git a/src/main/java/de/marhali/easyi18n/util/TranslationsUtil.java b/src/main/java/de/marhali/easyi18n/util/TranslationsUtil.java deleted file mode 100644 index e26d4e7..0000000 --- a/src/main/java/de/marhali/easyi18n/util/TranslationsUtil.java +++ /dev/null @@ -1,48 +0,0 @@ -package de.marhali.easyi18n.util; - -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -/** - * Utility tool to support the translations instance - * @author marhali - */ -@Deprecated // SectionUtil -public class TranslationsUtil { - - /** - * Retrieve all sections for the specified path (mostly fullPath) - * @param path The path - * @return Sections. E.g. input user.username.title -> Output: [user, username, title] - */ - public static @NotNull List getSections(@NotNull String path) { - if(!path.contains(".")) { - return new ArrayList<>(Collections.singletonList(path)); - } - - return new ArrayList<>(Arrays.asList(path.split("\\."))); - } - - /** - * Concatenate the given sections to a single string. - * @param sections The sections - * @return Full path. E.g. input [user, username, title] -> Output: user.username.title - */ - public static @NotNull String sectionsToFullPath(@NotNull List sections) { - StringBuilder builder = new StringBuilder(); - - for (String section : sections) { - if(builder.length() > 0) { - builder.append("."); - } - - builder.append(section); - } - - return builder.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/util/TreeUtil.java b/src/main/java/de/marhali/easyi18n/util/TreeUtil.java index 6d9fe91..72a2744 100644 --- a/src/main/java/de/marhali/easyi18n/util/TreeUtil.java +++ b/src/main/java/de/marhali/easyi18n/util/TreeUtil.java @@ -1,7 +1,6 @@ package de.marhali.easyi18n.util; import com.intellij.ide.projectView.PresentationData; -import de.marhali.easyi18n.model.LocalizedNode; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; @@ -20,14 +19,13 @@ public class TreeUtil { public static String getFullPath(TreePath path) { StringBuilder builder = new StringBuilder(); - for (Object obj : path.getPath()) { DefaultMutableTreeNode node = (DefaultMutableTreeNode) obj; Object value = node.getUserObject(); String section = value instanceof PresentationData ? ((PresentationData) value).getPresentableText() : String.valueOf(value); - if(section == null || section.equals(LocalizedNode.ROOT_KEY)) { // Skip root node + if(section == null) { // Skip empty sections continue; } From e730dee6f580a944ff04498b58d6fd0566bbaced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Fri, 5 Nov 2021 15:41:00 +0100 Subject: [PATCH 24/49] implement json module strategy --- .../java/de/marhali/easyi18n/DataStore.java | 3 +- .../io/json/ModularizedJsonIOStrategy.java | 147 ++++++++++++++++++ 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java diff --git a/src/main/java/de/marhali/easyi18n/DataStore.java b/src/main/java/de/marhali/easyi18n/DataStore.java index 680d22a..593b9c2 100644 --- a/src/main/java/de/marhali/easyi18n/DataStore.java +++ b/src/main/java/de/marhali/easyi18n/DataStore.java @@ -4,6 +4,7 @@ import com.intellij.openapi.project.Project; import de.marhali.easyi18n.io.IOStrategy; import de.marhali.easyi18n.io.json.JsonIOStrategy; +import de.marhali.easyi18n.io.json.ModularizedJsonIOStrategy; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.service.SettingsService; @@ -23,7 +24,7 @@ import java.util.function.Consumer; public class DataStore { private static final Set STRATEGIES = new LinkedHashSet<>(Arrays.asList( - new JsonIOStrategy() + new JsonIOStrategy(), new ModularizedJsonIOStrategy() )); private final Project project; diff --git a/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java new file mode 100644 index 0000000..6cfb7db --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java @@ -0,0 +1,147 @@ +package de.marhali.easyi18n.io.json; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; + +import de.marhali.easyi18n.io.IOStrategy; +import de.marhali.easyi18n.model.SettingsState; +import de.marhali.easyi18n.model.TranslationData; +import de.marhali.easyi18n.model.TranslationNode; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TreeMap; +import java.util.function.Consumer; + +/** + * Strategy for distributed json files per locale. Each locale can have multiple modules. The file name + * of each module will be used as the key for the underlying translations.
+ * Full key example: .. + * + * @author marhali + */ +public class ModularizedJsonIOStrategy implements IOStrategy { + + private static final String FILE_EXTENSION = "json"; + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create(); + + @Override + public boolean canUse(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state) { + VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(directory == null || directory.getChildren() == null) { + return false; + } + + // We expect something like this: + // <localesPath>/<localeDir>/<moduleFile> + + for(VirtualFile children : directory.getChildren()) { + if(children.isDirectory()) { // Contains module folders + for(VirtualFile moduleFile : children.getChildren()) { + if(!moduleFile.isDirectory() && isFileRelevant(state, moduleFile)) { + if(moduleFile.getFileType().getDefaultExtension().equalsIgnoreCase(FILE_EXTENSION)) { + return true; + } + } + } + } + } + + return false; + } + + @Override + public void read(@NotNull Project project, @NotNull String localesPath, + @NotNull SettingsState state, @NotNull Consumer<@Nullable TranslationData> result) { + ApplicationManager.getApplication().saveAll(); // Save opened files (required if new locales were added) + + ApplicationManager.getApplication().runReadAction(() -> { + VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(directory == null || directory.getChildren() == null) { + throw new IllegalArgumentException("Specified folder is invalid (" + localesPath + ")"); + } + + TranslationData data = new TranslationData(state.isSortKeys(), state.isNestedKeys()); + VirtualFile[] localeDirectories = directory.getChildren(); + + try { + for(VirtualFile localeDir : localeDirectories) { + String locale = localeDir.getNameWithoutExtension(); + data.addLocale(locale); + + // Read all underlying module files + for(VirtualFile module : localeDir.getChildren()) { + if(module.isDirectory() || isFileRelevant(state, module)) { + continue; + } + + TranslationNode moduleNode = new TranslationNode(state.isSortKeys() + ? new TreeMap<>() + : new LinkedHashMap<>()); + + JsonObject tree = GSON.fromJson(new InputStreamReader(module.getInputStream(), + module.getCharset()), JsonObject.class); + + JsonMapper.read(locale, tree, moduleNode); + + data.getRootNode().setChildren(module.getNameWithoutExtension(), moduleNode); + } + } + + result.accept(data); + + } catch(IOException e) { + e.printStackTrace(); + result.accept(null); + } + }); + } + + // TODO: there will be problems when adding translations via TranslationData with non-nested key mode + + @Override + public void write(@NotNull Project project, @NotNull String localesPath, + @NotNull SettingsState state, @NotNull TranslationData data, @NotNull Consumer<Boolean> result) { + ApplicationManager.getApplication().runWriteAction(() -> { + try { + for(String locale : data.getLocales()) { + for(Map.Entry<String, TranslationNode> entry : data.getRootNode().getChildren().entrySet()) { + String module = entry.getKey(); + + JsonObject content = new JsonObject(); + JsonMapper.write(locale, content, entry.getValue()); + + String fullPath = localesPath + "/" + locale + "/" + module + "." + FILE_EXTENSION; + File file = new File(fullPath); + boolean exists = file.createNewFile(); + + VirtualFile vf = exists + ? LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file) + : LocalFileSystem.getInstance().findFileByIoFile(file); + + vf.setBinaryContent(GSON.toJson(content).getBytes(vf.getCharset())); + } + } + + result.accept(true); + + } catch(IOException e) { + e.printStackTrace(); + result.accept(false); + } + }); + } +} From dd783a0b2e41154ee34c0404a7b412234030aac4 Mon Sep 17 00:00:00 2001 From: marhali <me@marhali.de> Date: Fri, 5 Nov 2021 23:36:59 +0100 Subject: [PATCH 25/49] create new io strategies --- .../java/de/marhali/easyi18n/DataStore.java | 6 +- .../easyi18n/io/json/JsonIOStrategy.java | 2 +- .../io/json/ModularizedJsonIOStrategy.java | 2 +- .../io/properties/PropertiesIOStrategy.java | 116 +++++++++++++++++ .../io/properties/PropertiesMapper.java | 44 +++++++ .../io/properties/SortableProperties.java | 35 +++++ .../easyi18n/io/yaml/YamlArrayMapper.java | 21 +++ .../easyi18n/io/yaml/YamlIOStrategy.java | 121 ++++++++++++++++++ .../marhali/easyi18n/io/yaml/YamlMapper.java | 71 ++++++++++ .../easyi18n/util/array/YamlArrayUtil.java | 1 + 10 files changed, 416 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java create mode 100644 src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java create mode 100644 src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java create mode 100644 src/main/java/de/marhali/easyi18n/io/yaml/YamlArrayMapper.java create mode 100644 src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java create mode 100644 src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java diff --git a/src/main/java/de/marhali/easyi18n/DataStore.java b/src/main/java/de/marhali/easyi18n/DataStore.java index 593b9c2..d48444e 100644 --- a/src/main/java/de/marhali/easyi18n/DataStore.java +++ b/src/main/java/de/marhali/easyi18n/DataStore.java @@ -5,6 +5,8 @@ import com.intellij.openapi.project.Project; import de.marhali.easyi18n.io.IOStrategy; import de.marhali.easyi18n.io.json.JsonIOStrategy; import de.marhali.easyi18n.io.json.ModularizedJsonIOStrategy; +import de.marhali.easyi18n.io.properties.PropertiesIOStrategy; +import de.marhali.easyi18n.io.yaml.YamlIOStrategy; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.service.SettingsService; @@ -24,7 +26,9 @@ import java.util.function.Consumer; public class DataStore { private static final Set<IOStrategy> STRATEGIES = new LinkedHashSet<>(Arrays.asList( - new JsonIOStrategy(), new ModularizedJsonIOStrategy() + new JsonIOStrategy(), new ModularizedJsonIOStrategy(), + new YamlIOStrategy("yaml"), new YamlIOStrategy("yml"), + new PropertiesIOStrategy() )); private final Project project; diff --git a/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java index d4ab551..40d57af 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/json/JsonIOStrategy.java @@ -66,7 +66,7 @@ public class JsonIOStrategy implements IOStrategy { try { for(VirtualFile file : directory.getChildren()) { - if(!isFileRelevant(state, file)) { + if(file.isDirectory() || !isFileRelevant(state, file)) { continue; } diff --git a/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java index 6cfb7db..391b73a 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java @@ -84,7 +84,7 @@ public class ModularizedJsonIOStrategy implements IOStrategy { // Read all underlying module files for(VirtualFile module : localeDir.getChildren()) { - if(module.isDirectory() || isFileRelevant(state, module)) { + if(module.isDirectory() || !isFileRelevant(state, module)) { continue; } diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java new file mode 100644 index 0000000..a0063f8 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java @@ -0,0 +1,116 @@ +package de.marhali.easyi18n.io.properties; + +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; + +import de.marhali.easyi18n.io.IOStrategy; +import de.marhali.easyi18n.model.SettingsState; +import de.marhali.easyi18n.model.TranslationData; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.StringWriter; +import java.util.function.Consumer; + +/** + * Strategy for simple 'properties' locale files. Each locale has its own file. + * For example localesPath/en.properties, localesPath/de.properties. + * @author marhali + */ +public class PropertiesIOStrategy implements IOStrategy { + + private static final String FILE_EXTENSION = "properties"; + + @Override + public boolean canUse(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state) { + VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(directory == null || directory.getChildren() == null) { + return false; + } + + for(VirtualFile children : directory.getChildren()) { + if(!children.isDirectory() && isFileRelevant(state, children)) { + if(children.getFileType().getDefaultExtension().equalsIgnoreCase(FILE_EXTENSION)) { + return true; + } + } + } + + return false; + } + + @Override + public void read(@NotNull Project project, @NotNull String localesPath, + @NotNull SettingsState state, @NotNull Consumer<@Nullable TranslationData> result) { + ApplicationManager.getApplication().saveAll(); // Save opened files (required if new locales were added) + + ApplicationManager.getApplication().runReadAction(() -> { + VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(directory == null || directory.getChildren() == null) { + throw new IllegalArgumentException("Specified folder is invalid (" + localesPath + ")"); + } + + TranslationData data = new TranslationData(state.isSortKeys(), state.isNestedKeys()); + + try { + for(VirtualFile file : directory.getChildren()) { + if(file.isDirectory() || !isFileRelevant(state, file)) { + continue; + } + + String locale = file.getNameWithoutExtension(); + data.addLocale(locale); + + SortableProperties properties = new SortableProperties(state.isSortKeys()); + properties.load(new InputStreamReader(file.getInputStream())); + PropertiesMapper.read(locale, properties, data); + } + + result.accept(data); + + } catch(IOException e) { + e.printStackTrace(); + result.accept(null); + } + }); + } + + @Override + public void write(@NotNull Project project, @NotNull String localesPath, + @NotNull SettingsState state, @NotNull TranslationData data, @NotNull Consumer<Boolean> result) { + ApplicationManager.getApplication().runWriteAction(() -> { + try { + for(String locale : data.getLocales()) { + SortableProperties properties = new SortableProperties(state.isSortKeys()); + PropertiesMapper.write(locale, properties, data); + + File file = new File(localesPath + "/" + locale + "." + FILE_EXTENSION); + boolean exists = file.createNewFile(); + + VirtualFile vf = exists + ? LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file) + : LocalFileSystem.getInstance().findFileByIoFile(file); + + StringWriter writer = new StringWriter(); + properties.store(writer, null); + + vf.setBinaryContent(writer.toString().getBytes(vf.getCharset())); + } + + result.accept(true); + + } catch(IOException e) { + e.printStackTrace(); + result.accept(false); + } + }); + } +} diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java new file mode 100644 index 0000000..472416e --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java @@ -0,0 +1,44 @@ +package de.marhali.easyi18n.io.properties; + +import de.marhali.easyi18n.model.Translation; +import de.marhali.easyi18n.model.TranslationData; +import de.marhali.easyi18n.util.StringUtil; + +import org.apache.commons.lang.StringEscapeUtils; + +import java.util.Map; + +/** + * Mapper for mapping properties files into translation nodes and backwards. + * @author marhali + */ +public class PropertiesMapper { + + // TODO: support array values + + public static void read(String locale, SortableProperties properties, TranslationData data) { + for(Map.Entry<Object, Object> entry : properties.entrySet()) { + String key = String.valueOf(entry.getKey()); + String content = StringUtil.escapeControls(String.valueOf(entry.getValue()), true); + + Translation translation = data.getTranslation(key); + + if(translation == null) { + translation = new Translation(); + } + + translation.put(locale, content); + } + } + + public static void write(String locale, SortableProperties properties, TranslationData data) { + for(String key : data.getFullKeys()) { + Translation translation = data.getTranslation(key); + + if(translation != null && translation.containsKey(locale)) { + String content = StringEscapeUtils.unescapeJava(translation.get(locale)); + properties.put(key, content); + } + } + } +} diff --git a/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java b/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java new file mode 100644 index 0000000..c2d08ef --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java @@ -0,0 +1,35 @@ +package de.marhali.easyi18n.io.properties; + +import java.util.*; + +/** + * Extends {@link Properties} class to support sorted or non-sorted keys. + * @author marhali + */ +public class SortableProperties extends Properties { + + private final transient Map<Object, Object> properties; + + public SortableProperties(boolean sort) { + this.properties = sort ? new TreeMap<>() : new LinkedHashMap<>(); + } + + public Map<Object, Object> getProperties() { + return this.properties; + } + + @Override + public Set<Object> keySet() { + return Collections.unmodifiableSet(new TreeSet<>(super.keySet())); + } + + @Override + public Set<Map.Entry<Object, Object>> entrySet() { + return this.properties.entrySet(); + } + + @Override + public synchronized Object put(Object key, Object value) { + return this.properties.put(key, value); + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/yaml/YamlArrayMapper.java new file mode 100644 index 0000000..fb2b340 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/yaml/YamlArrayMapper.java @@ -0,0 +1,21 @@ +package de.marhali.easyi18n.io.yaml; + +import de.marhali.easyi18n.io.ArrayMapper; + +import thito.nodeflow.config.ListSection; + +/** + * Map for yaml array values. + * @author marhali + */ +public class YamlArrayMapper extends ArrayMapper { + public static String read(ListSection list) { + return read(list.iterator(), Object::toString); + } + + public static ListSection write(String concat) { + ListSection list = new ListSection(); + write(concat, list::add); + return list; + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java new file mode 100644 index 0000000..f5e7557 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java @@ -0,0 +1,121 @@ +package de.marhali.easyi18n.io.yaml; + +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; + +import de.marhali.easyi18n.io.IOStrategy; +import de.marhali.easyi18n.model.SettingsState; +import de.marhali.easyi18n.model.TranslationData; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import thito.nodeflow.config.MapSection; +import thito.nodeflow.config.Section; + +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.function.Consumer; + +/** + * Strategy for simple yaml locale files. Each locale has its own file. + * For example localesPath/en.y(a)ml, localesPath/de.y(a)ml + * @author marhali + */ +public class YamlIOStrategy implements IOStrategy { + + private final String FILE_EXTENSION; + + public YamlIOStrategy(@NotNull String fileExtension) { + this.FILE_EXTENSION = fileExtension; + } + + @Override + public boolean canUse(@NotNull Project project, @NotNull String localesPath, @NotNull SettingsState state) { + VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(directory == null || directory.getChildren() == null) { + return false; + } + + for(VirtualFile children : directory.getChildren()) { + if(!children.isDirectory() && isFileRelevant(state, children)) { + if(children.getFileType().getDefaultExtension().equalsIgnoreCase(FILE_EXTENSION)) { + return true; + } + } + } + + return false; + } + + @Override + public void read(@NotNull Project project, @NotNull String localesPath, + @NotNull SettingsState state, @NotNull Consumer<@Nullable TranslationData> result) { + ApplicationManager.getApplication().saveAll(); // Save opened files (required if new locales were added) + + ApplicationManager.getApplication().runReadAction(() -> { + VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(directory == null || directory.getChildren() == null) { + throw new IllegalArgumentException("Specified folder is invalid (" + localesPath + ")"); + } + + TranslationData data = new TranslationData(state.isSortKeys(), state.isNestedKeys()); + + try { + for(VirtualFile file : directory.getChildren()) { + if(file.isDirectory() || !isFileRelevant(state, file)) { + continue; + } + + String locale = file.getNameWithoutExtension(); + data.addLocale(locale); + + try(Reader reader = new InputStreamReader(file.getInputStream())) { + Section section = Section.parseToMap(reader); + YamlMapper.read(locale, section, data.getRootNode()); + } + } + + result.accept(data); + + } catch(IOException e) { + e.printStackTrace(); + result.accept(null); + } + }); + } + + @Override + public void write(@NotNull Project project, @NotNull String localesPath, + @NotNull SettingsState state, @NotNull TranslationData data, @NotNull Consumer<Boolean> result) { + ApplicationManager.getApplication().runWriteAction(() -> { + try { + for(String locale : data.getLocales()) { + Section section = new MapSection(); + YamlMapper.write(locale, section, data.getRootNode()); + + File file = new File(localesPath + "/" + locale + "." + FILE_EXTENSION); + boolean exists = file.createNewFile(); + + VirtualFile vf = exists + ? LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file) + : LocalFileSystem.getInstance().findFileByIoFile(file); + + vf.setBinaryContent(Section.toString(section).getBytes(vf.getCharset())); + } + + result.accept(true); + + } catch(IOException e) { + e.printStackTrace(); + result.accept(false); + } + }); + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java b/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java new file mode 100644 index 0000000..82618ca --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java @@ -0,0 +1,71 @@ +package de.marhali.easyi18n.io.yaml; + +import de.marhali.easyi18n.model.Translation; +import de.marhali.easyi18n.model.TranslationNode; +import de.marhali.easyi18n.util.StringUtil; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.math.NumberUtils; + +import thito.nodeflow.config.MapSection; +import thito.nodeflow.config.Section; + +import java.util.Map; + +/** + * Mapper for mapping yaml files into translation nodes and backwards. + * @author marhali + */ +public class YamlMapper { + + public static void read(String locale, Section section, TranslationNode node) { + for(String key : section.getKeys()) { + TranslationNode childNode = node.getOrCreateChildren(key); + + if(section.getMap(key).isPresent()) { + // Nested element - run recursively + read(locale, section.getMap(key).get(), childNode); + } else { + Translation translation = childNode.getValue(); + + if(section.getList(key).isPresent() || section.getString(key).isPresent()) { + String content = section.isList(key) && section.getList(key).isPresent() + ? YamlArrayMapper.read(section.getList(key).get()) + : StringUtil.escapeControls(section.getString(key).get(), true); + + translation.put(locale, content); + childNode.setValue(translation); + } + } + } + } + + public static void write(String locale, Section section, TranslationNode node) { + for(Map.Entry<String, TranslationNode> entry : node.getChildren().entrySet()) { + String key = entry.getKey(); + TranslationNode childNode = entry.getValue(); + + if(!childNode.isLeaf()) { + // Nested node - run recursively + MapSection childSection = new MapSection(); + write(locale, childSection, childNode); + if(childSection.size() > 0) { + section.set(key, childSection); + } + } else { + Translation translation = childNode.getValue(); + String content = translation.get(locale); + + if(content != null) { + if(YamlArrayMapper.isArray(content)) { + section.set(key, YamlArrayMapper.write(content)); + } else if(NumberUtils.isNumber(content)) { + section.set(key, NumberUtils.createNumber(content)); + } else { + section.set(key, StringEscapeUtils.unescapeJava(content)); + } + } + } + } + } +} diff --git a/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java index 86f4db6..6c4cac1 100644 --- a/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java +++ b/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java @@ -6,6 +6,7 @@ import thito.nodeflow.config.ListSection; * Utility methods to read and write yaml lists. * @author marhali */ +@Deprecated public class YamlArrayUtil extends ArrayUtil { public static String read(ListSection list) { From a20d4be2cfdb327bd73c1d074f491f0bc28792e2 Mon Sep 17 00:00:00 2001 From: marhali <me@marhali.de> Date: Sat, 6 Nov 2021 23:04:06 +0100 Subject: [PATCH 26/49] upgrade to new data structure --- .../marhali/easyi18n/editor/KeyAnnotator.java | 4 +++- .../editor/KeyCompletionProvider.java | 20 ++++++++++++------- .../marhali/easyi18n/editor/KeyReference.java | 9 ++++++--- .../GenericKeyReferenceContributor.java | 3 ++- .../kotlin/KotlinKeyReferenceContributor.java | 3 ++- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java b/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java index 6b9f91d..6bb9fe7 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyAnnotator.java @@ -4,6 +4,8 @@ import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.project.Project; +import de.marhali.easyi18n.InstanceManager; +import de.marhali.easyi18n.model.TranslationNode; import de.marhali.easyi18n.service.SettingsService; import org.jetbrains.annotations.NotNull; @@ -37,7 +39,7 @@ public class KeyAnnotator { searchKey = searchKey.substring(1); } - LocalizedNode node = LegacyDataStore.getInstance(project).getTranslations().getNode(searchKey); + TranslationNode node = InstanceManager.get(project).store().getData().getNode(searchKey); if(node == null) { // Unknown translation. Just ignore it return; diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java b/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java index 79e1e8e..d76b936 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java @@ -5,7 +5,11 @@ import com.intellij.codeInsight.lookup.*; import com.intellij.icons.AllIcons; import com.intellij.openapi.project.*; import com.intellij.util.*; +import de.marhali.easyi18n.DataStore; +import de.marhali.easyi18n.InstanceManager; +import de.marhali.easyi18n.model.Translation; import de.marhali.easyi18n.service.*; +import de.marhali.easyi18n.util.PathUtil; import org.jetbrains.annotations.*; import java.util.*; @@ -27,7 +31,8 @@ public class KeyCompletionProvider extends CompletionProvider<CompletionParamete return; } - LegacyDataStore store = LegacyDataStore.getInstance(project); + DataStore store = InstanceManager.get(project).store(); + PathUtil pathUtil = new PathUtil(project); String previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale(); String pathPrefix = SettingsService.getInstance(project).getState().getPathPrefix(); @@ -52,7 +57,7 @@ public class KeyCompletionProvider extends CompletionProvider<CompletionParamete pathPrefix += "."; } - List<String> fullKeys = store.getTranslations().getFullKeys(); + Set<String> fullKeys = store.getData().getFullKeys(); int sections = path.split("\\.").length; int maxSectionForwardLookup = 5; @@ -63,19 +68,20 @@ public class KeyCompletionProvider extends CompletionProvider<CompletionParamete String[] keySections = key.split("\\."); if(keySections.length > sections + maxSectionForwardLookup) { // Key is too deep nested - String shrinkKey = TranslationsUtil.sectionsToFullPath(Arrays.asList( - Arrays.copyOf(keySections, sections + maxSectionForwardLookup))); + String shrinkKey = pathUtil.concat(Arrays.asList( + Arrays.copyOf(keySections, sections + maxSectionForwardLookup) + )); result.addElement(LookupElementBuilder.create(pathPrefix + shrinkKey) .appendTailText(" I18n([])", true)); } else { - LocalizedNode node = store.getTranslations().getNode(key); - String translation = node != null ? node.getValue().get(previewLocale) : null; + Translation translation = store.getData().getTranslation(key); + String content = translation.get(previewLocale); result.addElement(LookupElementBuilder.create(pathPrefix + key) .withIcon(AllIcons.Actions.PreserveCaseHover) - .appendTailText(" I18n(" + previewLocale + ": " + translation + ")", true) + .appendTailText(" I18n(" + previewLocale + ": " + content + ")", true) ); } } diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyReference.java b/src/main/java/de/marhali/easyi18n/editor/KeyReference.java index 960f680..56d5733 100644 --- a/src/main/java/de/marhali/easyi18n/editor/KeyReference.java +++ b/src/main/java/de/marhali/easyi18n/editor/KeyReference.java @@ -4,9 +4,12 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.impl.FakePsiElement; +import de.marhali.easyi18n.InstanceManager; import de.marhali.easyi18n.dialog.AddDialog; import de.marhali.easyi18n.dialog.EditDialog; +import de.marhali.easyi18n.model.KeyedTranslation; +import de.marhali.easyi18n.model.Translation; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -49,10 +52,10 @@ public class KeyReference extends PsiReferenceBase<PsiElement> { @Override public void navigate(boolean requestFocus) { - LocalizedNode node = LegacyDataStore.getInstance(getProject()).getTranslations().getNode(getKey()); + Translation translation = InstanceManager.get(getProject()).store().getData().getTranslation(getKey()); - if(node != null) { - new EditDialog(getProject(), new LegacyKeyedTranslation(getKey(), node.getValue())).showAndHandle(); + if(translation != null) { + new EditDialog(getProject(), new KeyedTranslation(getKey(), translation)).showAndHandle(); } else { new AddDialog(getProject(), getKey()).showAndHandle(); } diff --git a/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java b/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java index 4debdc3..a6b0542 100644 --- a/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java +++ b/src/main/java/de/marhali/easyi18n/editor/generic/GenericKeyReferenceContributor.java @@ -4,6 +4,7 @@ import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.*; import com.intellij.util.ProcessingContext; +import de.marhali.easyi18n.InstanceManager; import de.marhali.easyi18n.editor.KeyReference; import de.marhali.easyi18n.service.SettingsService; @@ -37,7 +38,7 @@ public class GenericKeyReferenceContributor extends PsiReferenceContributor { return PsiReference.EMPTY_ARRAY; } - if(LegacyDataStore.getInstance(element.getProject()).getTranslations().getNode(value) == null) { + if(InstanceManager.get(element.getProject()).store().getData().getTranslation(value) == null) { if(!KeyReference.isReferencable(value)) { // Creation policy return PsiReference.EMPTY_ARRAY; } diff --git a/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java b/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java index 1ae339e..77bfd20 100644 --- a/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java +++ b/src/main/java/de/marhali/easyi18n/editor/kotlin/KotlinKeyReferenceContributor.java @@ -5,6 +5,7 @@ import com.intellij.psi.*; import com.intellij.util.ProcessingContext; +import de.marhali.easyi18n.InstanceManager; import de.marhali.easyi18n.editor.KeyReference; import de.marhali.easyi18n.service.SettingsService; @@ -44,7 +45,7 @@ public class KotlinKeyReferenceContributor extends PsiReferenceContributor { return PsiReference.EMPTY_ARRAY; } - if(LegacyDataStore.getInstance(element.getProject()).getTranslations().getNode(value) == null) { + if(InstanceManager.get(element.getProject()).store().getData().getNode(value) == null) { return PsiReference.EMPTY_ARRAY; } From b16330f7fd8cd742707c962bf165092b75f8f7c3 Mon Sep 17 00:00:00 2001 From: marhali <me@marhali.de> Date: Sat, 6 Nov 2021 23:16:45 +0100 Subject: [PATCH 27/49] fix yml mapper and provide unit tests --- .../marhali/easyi18n/io/yaml/YamlMapper.java | 28 ++-- .../easyi18n/mapper/YamlMapperTest.java | 158 ++++++++++++++++++ 2 files changed, 173 insertions(+), 13 deletions(-) create mode 100644 src/test/java/de/marhali/easyi18n/mapper/YamlMapperTest.java diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java b/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java index 82618ca..e448300 100644 --- a/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java @@ -7,6 +7,7 @@ import de.marhali.easyi18n.util.StringUtil; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.math.NumberUtils; +import thito.nodeflow.config.ListSection; import thito.nodeflow.config.MapSection; import thito.nodeflow.config.Section; @@ -20,22 +21,23 @@ public class YamlMapper { public static void read(String locale, Section section, TranslationNode node) { for(String key : section.getKeys()) { + Object value = section.getInScope(key).get(); + TranslationNode childNode = node.getOrCreateChildren(key); - if(section.getMap(key).isPresent()) { + if(value instanceof MapSection) { // Nested element - run recursively - read(locale, section.getMap(key).get(), childNode); + System.out.println("run recurse"); + read(locale, (MapSection) value, childNode); } else { Translation translation = childNode.getValue(); - if(section.getList(key).isPresent() || section.getString(key).isPresent()) { - String content = section.isList(key) && section.getList(key).isPresent() - ? YamlArrayMapper.read(section.getList(key).get()) - : StringUtil.escapeControls(section.getString(key).get(), true); + String content = value instanceof ListSection + ? YamlArrayMapper.read((ListSection) value) + : StringUtil.escapeControls(String.valueOf(value), true); - translation.put(locale, content); - childNode.setValue(translation); - } + translation.put(locale, content); + childNode.setValue(translation); } } } @@ -50,7 +52,7 @@ public class YamlMapper { MapSection childSection = new MapSection(); write(locale, childSection, childNode); if(childSection.size() > 0) { - section.set(key, childSection); + section.setInScope(key, childSection); } } else { Translation translation = childNode.getValue(); @@ -58,11 +60,11 @@ public class YamlMapper { if(content != null) { if(YamlArrayMapper.isArray(content)) { - section.set(key, YamlArrayMapper.write(content)); + section.setInScope(key, YamlArrayMapper.write(content)); } else if(NumberUtils.isNumber(content)) { - section.set(key, NumberUtils.createNumber(content)); + section.setInScope(key, NumberUtils.createNumber(content)); } else { - section.set(key, StringEscapeUtils.unescapeJava(content)); + section.setInScope(key, StringEscapeUtils.unescapeJava(content)); } } } diff --git a/src/test/java/de/marhali/easyi18n/mapper/YamlMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/YamlMapperTest.java new file mode 100644 index 0000000..77d1bcd --- /dev/null +++ b/src/test/java/de/marhali/easyi18n/mapper/YamlMapperTest.java @@ -0,0 +1,158 @@ +package de.marhali.easyi18n.mapper; + +import de.marhali.easyi18n.io.yaml.YamlArrayMapper; +import de.marhali.easyi18n.io.yaml.YamlMapper; +import de.marhali.easyi18n.model.TranslationData; +import org.apache.commons.lang.StringEscapeUtils; + +import org.junit.Assert; + +import thito.nodeflow.config.MapSection; +import thito.nodeflow.config.Section; + +import java.util.Arrays; +import java.util.LinkedHashSet; +import java.util.Set; + +/** + * Unit tests for {@link de.marhali.easyi18n.io.yaml.YamlMapper} + * @author marhali + */ +public class YamlMapperTest extends AbstractMapperTest { + + @Override + public void testNonSorting() { + Section input = new MapSection(); + input.set("zulu", "test"); + input.set("alpha", "test"); + input.set("bravo", "test"); + + TranslationData data = new TranslationData(false, true); + YamlMapper.read("en", input, data.getRootNode()); + + Section output = new MapSection(); + YamlMapper.write("en", output, data.getRootNode()); + + Set<String> expect = new LinkedHashSet<>(Arrays.asList("zulu", "alpha", "bravo")); + Assert.assertEquals(expect, output.getKeys()); + } + + @Override + public void testSorting() { + Section input = new MapSection(); + input.set("zulu", "test"); + input.set("alpha", "test"); + input.set("bravo", "test"); + + TranslationData data = new TranslationData(true, true); + YamlMapper.read("en", input, data.getRootNode()); + + Section output = new MapSection(); + YamlMapper.write("en", output, data.getRootNode()); + + Set<String> expect = new LinkedHashSet<>(Arrays.asList("alpha", "bravo", "zulu")); + Assert.assertEquals(expect, output.getKeys()); + } + + @Override + public void testArrays() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("simple", create(arraySimple)); + data.setTranslation("escaped", create(arrayEscaped)); + + Section output = new MapSection(); + YamlMapper.write("en", output, data.getRootNode()); + + Assert.assertTrue(output.isList("simple")); + Assert.assertEquals(arraySimple, YamlArrayMapper.read(output.getList("simple").get())); + Assert.assertTrue(output.isList("escaped")); + Assert.assertEquals(arrayEscaped, StringEscapeUtils.unescapeJava(YamlArrayMapper.read(output.getList("escaped").get()))); + + TranslationData input = new TranslationData(true, true); + YamlMapper.read("en", output, input.getRootNode()); + + Assert.assertTrue(YamlArrayMapper.isArray(input.getTranslation("simple").get("en"))); + Assert.assertTrue(YamlArrayMapper.isArray(input.getTranslation("escaped").get("en"))); + } + + @Override + public void testSpecialCharacters() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("chars", create(specialCharacters)); + + Section output = new MapSection(); + YamlMapper.write("en", output, data.getRootNode()); + + Assert.assertEquals(specialCharacters, output.getString("chars").get()); + + TranslationData input = new TranslationData(true, true); + YamlMapper.read("en", output, input.getRootNode()); + + Assert.assertEquals(specialCharacters, StringEscapeUtils.unescapeJava(input.getTranslation("chars").get("en"))); + } + + @Override + public void testNestedKeys() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("nested.key.section", create("test")); + + Section output = new MapSection(); + YamlMapper.write("en", output, data.getRootNode()); + + Assert.assertEquals("test", output.getString("nested.key.section").get()); + + TranslationData input = new TranslationData(true, true); + YamlMapper.read("en", output, input.getRootNode()); + + Assert.assertEquals("test", input.getTranslation("nested.key.section").get("en")); + } + + @Override + public void testNonNestedKeys() { + TranslationData data = new TranslationData(true, false); + data.setTranslation("long.key.with.many.sections", create("test")); + + Section output = new MapSection(); + YamlMapper.write("en", output, data.getRootNode()); + + Assert.assertTrue(output.getKeys().contains("long.key.with.many.sections")); + + TranslationData input = new TranslationData(true, false); + YamlMapper.read("en", output, input.getRootNode()); + + Assert.assertEquals("test", input.getTranslation("long.key.with.many.sections").get("en")); + } + + @Override + public void testLeadingSpace() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("space", create(leadingSpace)); + + Section output = new MapSection(); + YamlMapper.write("en", output, data.getRootNode()); + + Assert.assertEquals(leadingSpace, output.getString("space").get()); + + TranslationData input = new TranslationData(true, true); + YamlMapper.read("en", output, input.getRootNode()); + + Assert.assertEquals(leadingSpace, input.getTranslation("space").get("en")); + } + + @Override + public void testNumbers() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("numbered", create("15000")); + + Section output = new MapSection(); + YamlMapper.write("en", output, data.getRootNode()); + + Assert.assertEquals(15000, output.getInteger("numbered").get().intValue()); + + Section input = new MapSection(); + input.set("numbered", 143.23); + YamlMapper.read("en", input, data.getRootNode()); + + Assert.assertEquals("143.23", data.getTranslation("numbered").get("en")); + } +} \ No newline at end of file From 1afdac90063dc7c211693c95ef6aed04c934ec2c Mon Sep 17 00:00:00 2001 From: marhali <me@marhali.de> Date: Sat, 6 Nov 2021 23:17:33 +0100 Subject: [PATCH 28/49] also test read for array values --- .../java/de/marhali/easyi18n/mapper/JsonMapperTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java index 37ae662..656244d 100644 --- a/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java +++ b/src/test/java/de/marhali/easyi18n/mapper/JsonMapperTest.java @@ -68,6 +68,12 @@ public class JsonMapperTest extends AbstractMapperTest { Assert.assertEquals(arraySimple, JsonArrayMapper.read(output.get("simple").getAsJsonArray())); Assert.assertTrue(output.get("escaped").isJsonArray()); Assert.assertEquals(arrayEscaped, StringEscapeUtils.unescapeJava(JsonArrayMapper.read(output.get("escaped").getAsJsonArray()))); + + TranslationData input = new TranslationData(true, true); + JsonMapper.read("en", output, input.getRootNode()); + + Assert.assertTrue(JsonArrayMapper.isArray(input.getTranslation("simple").get("en"))); + Assert.assertTrue(JsonArrayMapper.isArray(input.getTranslation("escaped").get("en"))); } @Override From cdd7188769f29aa708441f00bbacae7e5c22eb89 Mon Sep 17 00:00:00 2001 From: marhali <me@marhali.de> Date: Sat, 6 Nov 2021 23:18:35 +0100 Subject: [PATCH 29/49] remove legacy components --- .../de/marhali/easyi18n/io/TranslatorIO.java | 34 ----- .../io/implementation/JsonTranslatorIO.java | 96 ------------- .../ModularizedJsonTranslatorIO.java | 117 ---------------- .../PropertiesTranslatorIO.java | 132 ------------------ .../io/implementation/YamlTranslatorIO.java | 125 ----------------- .../model/table/TableModelTranslator.java | 117 ---------------- .../model/tree/TreeModelTranslator.java | 129 ----------------- .../de/marhali/easyi18n/util/MapUtil.java | 27 ---- .../easyi18n/util/SortedProperties.java | 32 ----- 9 files changed, 809 deletions(-) delete mode 100644 src/main/java/de/marhali/easyi18n/io/TranslatorIO.java delete mode 100644 src/main/java/de/marhali/easyi18n/io/implementation/JsonTranslatorIO.java delete mode 100644 src/main/java/de/marhali/easyi18n/io/implementation/ModularizedJsonTranslatorIO.java delete mode 100644 src/main/java/de/marhali/easyi18n/io/implementation/PropertiesTranslatorIO.java delete mode 100644 src/main/java/de/marhali/easyi18n/io/implementation/YamlTranslatorIO.java delete mode 100644 src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java delete mode 100644 src/main/java/de/marhali/easyi18n/model/tree/TreeModelTranslator.java delete mode 100644 src/main/java/de/marhali/easyi18n/util/MapUtil.java delete mode 100644 src/main/java/de/marhali/easyi18n/util/SortedProperties.java diff --git a/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java deleted file mode 100644 index aee3088..0000000 --- a/src/main/java/de/marhali/easyi18n/io/TranslatorIO.java +++ /dev/null @@ -1,34 +0,0 @@ -package de.marhali.easyi18n.io; - -import com.intellij.openapi.project.Project; - -import org.jetbrains.annotations.NotNull; - -import java.util.function.Consumer; - -/** - * Interface to retrieve and save localized messages. - * Can be implemented by various standards. Such as JSON, Properties-Bundle and so on. - * @author marhali - */ -@Deprecated -public interface TranslatorIO { - - /** - * Reads localized messages from the persistence layer. - * @param project Opened intellij project - * @param directoryPath The full path for the directory which holds all locale files - * @param callback Contains loaded translations. Will be called after io operation. Content might be null on failure. - */ - void read(@NotNull Project project, @NotNull String directoryPath, @NotNull Consumer<Translations> callback); - - /** - * Writes the provided messages (translations) to the persistence layer. - * @param project Opened intellij project - * @param translations Translations instance to save - * @param directoryPath The full path for the directory which holds all locale files - * @param callback Will be called after io operation. Can be used to determine if action was successful(true) or not - */ - void save(@NotNull Project project, @NotNull Translations translations, - @NotNull String directoryPath, @NotNull Consumer<Boolean> callback); -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/implementation/JsonTranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/implementation/JsonTranslatorIO.java deleted file mode 100644 index 9bc18e3..0000000 --- a/src/main/java/de/marhali/easyi18n/io/implementation/JsonTranslatorIO.java +++ /dev/null @@ -1,96 +0,0 @@ -package de.marhali.easyi18n.io.implementation; - -import com.google.gson.*; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; - -import de.marhali.easyi18n.io.TranslatorIO; - -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.*; -import java.util.function.Consumer; - -/** - * Implementation for JSON translation files. - * @author marhali - */ -public class JsonTranslatorIO implements TranslatorIO { - - private static final String FILE_EXTENSION = "json"; - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create(); - - @Override - public void read(@NotNull Project project, @NotNull String directoryPath, @NotNull Consumer<Translations> callback) { - ApplicationManager.getApplication().saveAll(); // Save opened files (required if new locales were added) - - ApplicationManager.getApplication().runReadAction(() -> { - VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(directoryPath)); - - if(directory == null || directory.getChildren() == null) { - throw new IllegalArgumentException("Specified folder is invalid (" + directoryPath + ")"); - } - - VirtualFile[] files = directory.getChildren(); - - List<String> locales = new ArrayList<>(); - LocalizedNode nodes = new LocalizedNode(LocalizedNode.ROOT_KEY, new ArrayList<>()); - - try { - for(VirtualFile file : files) { - - if(!IOUtil.isFileRelevant(project, file)) { // File does not matches pattern - continue; - } - - locales.add(file.getNameWithoutExtension()); - - JsonObject tree = GSON.fromJson(new InputStreamReader(file.getInputStream(), - file.getCharset()), JsonObject.class); - - JsonUtil.readTree(file.getNameWithoutExtension(), tree, nodes); - } - - callback.accept(new Translations(locales, nodes)); - - } catch(IOException e) { - e.printStackTrace(); - callback.accept(null); - } - }); - } - - @Override - public void save(@NotNull Project project, @NotNull Translations translations, - @NotNull String directoryPath, @NotNull Consumer<Boolean> callback) { - ApplicationManager.getApplication().runWriteAction(() -> { - try { - for(String locale : translations.getLocales()) { - JsonObject content = new JsonObject(); - JsonUtil.writeTree(locale, content, translations.getNodes()); - - String fullPath = directoryPath + "/" + locale + "." + FILE_EXTENSION; - File file = new File(fullPath); - boolean created = file.createNewFile(); - - VirtualFile vf = created ? LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file) - : LocalFileSystem.getInstance().findFileByIoFile(file); - - vf.setBinaryContent(GSON.toJson(content).getBytes(vf.getCharset())); - } - - // Successfully saved - callback.accept(true); - - } catch(IOException e) { - e.printStackTrace(); - callback.accept(false); - } - }); - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/implementation/ModularizedJsonTranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/implementation/ModularizedJsonTranslatorIO.java deleted file mode 100644 index c49cd97..0000000 --- a/src/main/java/de/marhali/easyi18n/io/implementation/ModularizedJsonTranslatorIO.java +++ /dev/null @@ -1,117 +0,0 @@ -package de.marhali.easyi18n.io.implementation; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; - -import de.marhali.easyi18n.io.TranslatorIO; - -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - -/** - * IO operations for splitted / modularized json files. Each locale can have multiple translation files. - * @author marhali - */ -public class ModularizedJsonTranslatorIO implements TranslatorIO { - - private static final String FILE_EXTENSION = "json"; - - @Override - public void read(@NotNull Project project, @NotNull String directoryPath, @NotNull Consumer<Translations> callback) { - ApplicationManager.getApplication().saveAll(); // Save opened files (required if new locales were added) - - ApplicationManager.getApplication().runReadAction(() -> { - VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(directoryPath)); - - if(directory == null || directory.getChildren() == null) { - throw new IllegalArgumentException("Specified folder is invalid (" + directoryPath + ")"); - } - - VirtualFile[] localeDirectories = directory.getChildren(); - - List<String> locales = new ArrayList<>(); - LocalizedNode nodes = new LocalizedNode(LocalizedNode.ROOT_KEY, new ArrayList<>()); - - try { - for(VirtualFile localeDir : localeDirectories) { - String locale = localeDir.getName(); - locales.add(locale); - - // Read all json modules - for(VirtualFile module : localeDir.getChildren()) { - - if(!IOUtil.isFileRelevant(project, module)) { // File does not matches pattern - continue; - } - - JsonObject tree = JsonParser.parseReader(new InputStreamReader(module.getInputStream(), - module.getCharset())).getAsJsonObject(); - - String moduleName = module.getNameWithoutExtension(); - LocalizedNode moduleNode = nodes.getChildren(moduleName); - - if(moduleNode == null) { // Create module / sub node - moduleNode = new LocalizedNode(moduleName, new ArrayList<>()); - nodes.addChildren(moduleNode); - } - - JsonUtil.readTree(locale, tree, moduleNode); - } - } - - callback.accept(new Translations(locales, nodes)); - - } catch(IOException e) { - e.printStackTrace(); - callback.accept(null); - } - }); - } - - @Override - public void save(@NotNull Project project, @NotNull Translations translations, - @NotNull String directoryPath, @NotNull Consumer<Boolean> callback) { - - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - - ApplicationManager.getApplication().runWriteAction(() -> { - try { - for(String locale : translations.getLocales()) { - // Use top level children as modules - for (LocalizedNode module : translations.getNodes().getChildren()) { - JsonObject content = new JsonObject(); - JsonUtil.writeTree(locale, content, module); - - String fullPath = directoryPath + "/" + locale + "/" + module.getKey() + "." + FILE_EXTENSION; - File file = new File(fullPath); - boolean created = file.createNewFile(); - - VirtualFile vf = created ? LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file) - : LocalFileSystem.getInstance().findFileByIoFile(file); - - vf.setBinaryContent(gson.toJson(content).getBytes(vf.getCharset())); - } - } - - // Successfully saved - callback.accept(true); - - } catch(IOException e) { - e.printStackTrace(); - callback.accept(false); - } - }); - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/implementation/PropertiesTranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/implementation/PropertiesTranslatorIO.java deleted file mode 100644 index ec25a04..0000000 --- a/src/main/java/de/marhali/easyi18n/io/implementation/PropertiesTranslatorIO.java +++ /dev/null @@ -1,132 +0,0 @@ -package de.marhali.easyi18n.io.implementation; - -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; - -import de.marhali.easyi18n.io.TranslatorIO; -import de.marhali.easyi18n.util.SortedProperties; -import de.marhali.easyi18n.util.StringUtil; - -import org.apache.commons.lang.StringEscapeUtils; -import org.jetbrains.annotations.NotNull; - -import java.io.*; -import java.util.*; -import java.util.function.Consumer; - -/** - * Implementation for properties translation files. - * @author marhali - */ -public class PropertiesTranslatorIO implements TranslatorIO { - - public static final String FILE_EXTENSION = "properties"; - - @Override - public void read(@NotNull Project project, @NotNull String directoryPath, @NotNull Consumer<Translations> callback) { - ApplicationManager.getApplication().saveAll(); // Save opened files (required if new locales were added) - - ApplicationManager.getApplication().runReadAction(() -> { - VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(directoryPath)); - - if(directory == null || directory.getChildren() == null) { - throw new IllegalArgumentException("Specified folder is invalid (" + directoryPath + ")"); - } - - VirtualFile[] files = directory.getChildren(); - - List<String> locales = new ArrayList<>(); - LocalizedNode nodes = new LocalizedNode(LocalizedNode.ROOT_KEY, new ArrayList<>()); - - try { - for (VirtualFile file : files) { - - if(!IOUtil.isFileRelevant(project, file)) { // File does not matches pattern - continue; - } - - locales.add(file.getNameWithoutExtension()); - SortedProperties properties = new SortedProperties(); - properties.load(new InputStreamReader(file.getInputStream(), file.getCharset())); - readProperties(file.getNameWithoutExtension(), properties, nodes); - } - - callback.accept(new Translations(locales, nodes)); - - } catch(IOException e) { - e.printStackTrace(); - callback.accept(null); - } - }); - } - - @Override - public void save(@NotNull Project project, @NotNull Translations translations, - @NotNull String directoryPath, @NotNull Consumer<Boolean> callback) { - - ApplicationManager.getApplication().runWriteAction(() -> { - try { - for(String locale : translations.getLocales()) { - SortedProperties properties = new SortedProperties(); - writeProperties(locale, properties, translations.getNodes(), ""); - - String fullPath = directoryPath + "/" + locale + "." + FILE_EXTENSION; - VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(new File(fullPath)); - - StringWriter content = new StringWriter(); - properties.store(content, "I18n " + locale + " keys"); - - file.setBinaryContent(content.toString().getBytes(file.getCharset())); - } - - // Successfully saved - callback.accept(true); - - } catch(IOException e) { - e.printStackTrace(); - callback.accept(false); - } - }); - } - - private void writeProperties(String locale, Properties props, LocalizedNode node, String parentPath) { - if(node.isLeaf() && !node.getKey().equals(LocalizedNode.ROOT_KEY)) { - if(node.getValue().get(locale) != null) { // Translation is defined - track it - String value = StringEscapeUtils.unescapeJava(node.getValue().get(locale)); - props.setProperty(parentPath, value); - } - - } else { - for(LocalizedNode children : node.getChildren()) { - writeProperties(locale, props, children, - parentPath + (parentPath.isEmpty() ? "" : ".") + children.getKey()); - } - } - } - - private void readProperties(String locale, Properties props, LocalizedNode parent) { - props.forEach((key, value) -> { - List<String> sections = TranslationsUtil.getSections(String.valueOf(key)); - - LocalizedNode node = parent; - - for (String section : sections) { - LocalizedNode subNode = node.getChildren(section); - - if(subNode == null) { - subNode = new LocalizedNode(section, new ArrayList<>()); - node.addChildren(subNode); - } - - node = subNode; - } - - Map<String, String> messages = node.getValue(); - String escapedValue = StringUtil.escapeControls(String.valueOf(value), true); - messages.put(locale, escapedValue); - node.setValue(messages); - }); - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/implementation/YamlTranslatorIO.java b/src/main/java/de/marhali/easyi18n/io/implementation/YamlTranslatorIO.java deleted file mode 100644 index 4ed8e97..0000000 --- a/src/main/java/de/marhali/easyi18n/io/implementation/YamlTranslatorIO.java +++ /dev/null @@ -1,125 +0,0 @@ -package de.marhali.easyi18n.io.implementation; - -import com.intellij.openapi.application.*; -import com.intellij.openapi.project.*; -import com.intellij.openapi.vfs.*; - -import de.marhali.easyi18n.io.*; -import de.marhali.easyi18n.model.*; -import de.marhali.easyi18n.util.*; -import de.marhali.easyi18n.util.array.YamlArrayUtil; - -import org.jetbrains.annotations.*; - -import thito.nodeflow.config.*; - -import java.io.*; -import java.nio.charset.*; -import java.util.*; -import java.util.function.*; - -public class YamlTranslatorIO implements TranslatorIO { - @Override - public void read(@NotNull Project project, @NotNull String directoryPath, @NotNull Consumer<Translations> callback) { - ApplicationManager.getApplication().saveAll(); // Save opened files (required if new locales were added) - - ApplicationManager.getApplication().runReadAction(() -> { - VirtualFile directory = LocalFileSystem.getInstance().findFileByIoFile(new File(directoryPath)); - - if(directory == null || directory.getChildren() == null) { - throw new IllegalArgumentException("Specified folder is invalid (" + directoryPath + ")"); - } - - VirtualFile[] files = directory.getChildren(); - - List<String> locales = new ArrayList<>(); - LocalizedNode nodes = new LocalizedNode(LocalizedNode.ROOT_KEY, new ArrayList<>()); - - try { - for(VirtualFile file : files) { - - if(!IOUtil.isFileRelevant(project, file)) { // File does not matches pattern - continue; - } - - locales.add(file.getNameWithoutExtension()); - - try (Reader reader = new InputStreamReader(file.getInputStream(), StandardCharsets.UTF_8)) { - Section section = Section.parseToMap(reader); - load(file.getNameWithoutExtension(), nodes, section); - } - } - - callback.accept(new Translations(locales, nodes)); - - } catch(IOException e) { - e.printStackTrace(); - callback.accept(null); - } - }); - } - - private void load(String locale, LocalizedNode node, Section section) { - if (section instanceof MapSection) { - for (String key : section.getKeys()) { - LocalizedNode child = node.getChildren(key); - if (child == null) { - node.addChildren(child = new LocalizedNode(key, new ArrayList<>())); - } - LocalizedNode finalChild = child; - MapSection map = section.getMap(key).orElse(null); - if (map != null) { - load(locale, finalChild, map); - } else { - - if(section.isList(key) && section.getList(key).isPresent()) { - child.getValue().put(locale, YamlArrayUtil.read(section.getList(key).get())); - } else { - String value = section.getString(key).orElse(null); - if (value != null) { - child.getValue().put(locale, value); - } - } - } - } - } - } - - private void save(LocalizedNode node, String locale, Section section, String path) { - if (node.isLeaf() && !node.getKey().equals(LocalizedNode.ROOT_KEY)) { - String value = node.getValue().get(locale); - if (value != null) { - section.set(path, YamlArrayUtil.isArray(value) ? YamlArrayUtil.write(value) : value); - } - } else { - for (LocalizedNode child : node.getChildren()) { - save(child, locale, section, path == null ? child.getKey() : path + "." + child.getKey()); - } - } - } - - @Override - public void save(@NotNull Project project, @NotNull Translations translations, @NotNull String directoryPath, @NotNull Consumer<Boolean> callback) { - ApplicationManager.getApplication().runWriteAction(() -> { - try { - for(String locale : translations.getLocales()) { - Section section = new MapSection(); - - save(translations.getNodes(), locale, section, null); - - String fullPath = directoryPath + "/" + locale + ".yml"; - VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(new File(fullPath)); - - file.setBinaryContent(Section.toString(section).getBytes(file.getCharset())); - } - - // Successfully saved - callback.accept(true); - - } catch(IOException e) { - e.printStackTrace(); - callback.accept(false); - } - }); - } -} diff --git a/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java b/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java deleted file mode 100644 index 8f76acb..0000000 --- a/src/main/java/de/marhali/easyi18n/model/table/TableModelTranslator.java +++ /dev/null @@ -1,117 +0,0 @@ -package de.marhali.easyi18n.model.table; - -import org.jetbrains.annotations.Nls; - -import javax.swing.event.TableModelListener; -import javax.swing.table.TableModel; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; - -/** - * Table model to represents localized messages. - * @author marhali - */ -public class TableModelTranslator implements TableModel { - - private final Translations translations; - private final List<String> locales; - private final List<String> fullKeys; - - private final Consumer<LegacyTranslationUpdate> updater; - - /** - * @param translations Translations instance - * @param searchQuery Search / filter param - * @param updater Consumer which can be called on cell change / update - */ - public TableModelTranslator(Translations translations, String searchQuery, Consumer<LegacyTranslationUpdate> updater) { - this.translations = translations; - this.locales = translations.getLocales(); - this.updater = updater; - - List<String> fullKeys = translations.getFullKeys(); - - if(searchQuery != null && !searchQuery.isEmpty()) { // Filter keys by searchQuery - fullKeys.removeIf(key -> !key.startsWith(searchQuery)); - } - - this.fullKeys = fullKeys; - } - - @Override - public int getRowCount() { - return fullKeys.size(); - } - - @Override - public int getColumnCount() { - return locales.size() + 1; // Number of locales plus 1 for the Key's column - } - - @Nls - @Override - public String getColumnName(int columnIndex) { - if(columnIndex == 0) { - return "<html><b>Key</b></html>"; - } - - return "<html><b>" + locales.get(columnIndex - 1) + "</b></html>"; - } - - @Override - public Class<?> getColumnClass(int columnIndex) { - return String.class; - } - - @Override - public boolean isCellEditable(int rowIndex, int columnIndex) { - return rowIndex > 0; // Everything should be editable except the headline - } - - @Override - public Object getValueAt(int rowIndex, int columnIndex) { - if(columnIndex == 0) { // Keys - return fullKeys.get(rowIndex); - } - - String key = fullKeys.get(rowIndex); - String locale = locales.get(columnIndex - 1); - LocalizedNode node = translations.getNode(key); - - return node == null ? null : node.getValue().get(locale); - } - - @Override - public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - String key = String.valueOf(getValueAt(rowIndex, 0)); - LocalizedNode node = translations.getNode(key); - - if(node == null) { // Unknown cell - return; - } - - String newKey = columnIndex == 0 ? String.valueOf(aValue) : key; - Map<String, String> messages = node.getValue(); - - // Locale message update - if(columnIndex > 0) { - if(aValue == null || ((String) aValue).isEmpty()) { - messages.remove(locales.get(columnIndex - 1)); - } else { - messages.put(locales.get(columnIndex - 1), String.valueOf(aValue)); - } - } - - LegacyTranslationUpdate update = new LegacyTranslationUpdate(new LegacyKeyedTranslation(key, messages), - new LegacyKeyedTranslation(newKey, messages)); - - updater.accept(update); - } - - @Override - public void addTableModelListener(TableModelListener l) {} - - @Override - public void removeTableModelListener(TableModelListener l) {} -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/model/tree/TreeModelTranslator.java b/src/main/java/de/marhali/easyi18n/model/tree/TreeModelTranslator.java deleted file mode 100644 index 7c7bc4a..0000000 --- a/src/main/java/de/marhali/easyi18n/model/tree/TreeModelTranslator.java +++ /dev/null @@ -1,129 +0,0 @@ -package de.marhali.easyi18n.model.tree; - -import com.intellij.ide.projectView.PresentationData; -import com.intellij.openapi.project.Project; -import com.intellij.ui.JBColor; - -import de.marhali.easyi18n.service.SettingsService; -import de.marhali.easyi18n.util.UiUtil; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import javax.swing.tree.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * I18n key tree preparation. - * @author marhali - */ -public class TreeModelTranslator extends DefaultTreeModel { - - private final @NotNull Project project; - private final @NotNull Translations translations; - private final @Nullable String searchQuery; - - - public TreeModelTranslator( - @NotNull Project project, @NotNull Translations translations, @Nullable String searchQuery) { - super(null); - - this.project = project; - this.translations = translations; - this.searchQuery = searchQuery; - - setRoot(generateNodes()); - } - - private DefaultMutableTreeNode generateNodes() { - DefaultMutableTreeNode root = new DefaultMutableTreeNode(LocalizedNode.ROOT_KEY); - - if(translations.getNodes().isLeaf()) { // Empty tree - return root; - } - - List<String> searchSections = searchQuery == null ? - Collections.emptyList() : TranslationsUtil.getSections(searchQuery); - - for(LocalizedNode children : translations.getNodes().getChildren()) { - generateSubNodes(root, children, new ArrayList<>(searchSections)); - } - - return root; - } - - private void generateSubNodes(DefaultMutableTreeNode parent, - LocalizedNode localizedNode, List<String> searchSections) { - - String searchKey = searchSections.isEmpty() ? null : searchSections.remove(0); - - if(searchKey != null && !localizedNode.getKey().startsWith(searchKey)) { // Filter node - return; - } - - if(localizedNode.isLeaf()) { - String previewLocale = SettingsService.getInstance(project).getState().getPreviewLocale(); - - String title = localizedNode.getKey(); - String sub = "(" + previewLocale + ": " + localizedNode.getValue().get(previewLocale) + ")"; - String tooltip = UiUtil.generateHtmlTooltip(localizedNode.getValue()); - - PresentationData data = new PresentationData(title, sub, null, null); - data.setTooltip(tooltip); - - if(localizedNode.getValue().size() != translations.getLocales().size()) { - data.setForcedTextForeground(JBColor.RED); - } - - parent.add(new DefaultMutableTreeNode(data)); - - } else { - DefaultMutableTreeNode sub = new DefaultMutableTreeNode(localizedNode.getKey()); - parent.add(sub); - - for(LocalizedNode children : localizedNode.getChildren()) { - generateSubNodes(sub, children, new ArrayList<>(searchSections)); - } - } - } - - public TreePath findTreePath(@NotNull String fullPath) { - List<String> sections = TranslationsUtil.getSections(fullPath); - Object[] nodes = new Object[sections.size() + 1]; - - int pos = 0; - TreeNode currentNode = (TreeNode) this.getRoot(); - nodes[pos] = currentNode; - - for(String section : sections) { - pos++; - currentNode = findNode(currentNode, section); - nodes[pos] = currentNode; - } - - return new TreePath(nodes); - } - - public @Nullable DefaultMutableTreeNode findNode(@NotNull TreeNode parent, @NotNull String key) { - for(int i = 0; i < parent.getChildCount(); i++) { - TreeNode child = parent.getChildAt(i); - - if(child instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode mutableChild = (DefaultMutableTreeNode) child; - String childKey = mutableChild.getUserObject().toString(); - - if(mutableChild.getUserObject() instanceof PresentationData) { - childKey = ((PresentationData) mutableChild.getUserObject()).getPresentableText(); - } - - if(childKey != null && childKey.equals(key)) { - return mutableChild; - } - } - } - - throw new NullPointerException("Cannot find node by key: " + key); - } -} diff --git a/src/main/java/de/marhali/easyi18n/util/MapUtil.java b/src/main/java/de/marhali/easyi18n/util/MapUtil.java deleted file mode 100644 index d6b12ad..0000000 --- a/src/main/java/de/marhali/easyi18n/util/MapUtil.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.marhali.easyi18n.util; - -import java.util.List; -import java.util.TreeMap; - -/** - * Map utilities. - * @author marhali - */ -@Deprecated -public class MapUtil { - - /** - * Converts the provided list into a tree map. - * @param list List of nodes - * @return TreeMap based on node key and node object - */ - public static TreeMap<String, LocalizedNode> convertToTreeMap(List<LocalizedNode> list) { - TreeMap<String, LocalizedNode> map = new TreeMap<>(); - - for(LocalizedNode item : list) { - map.put(item.getKey(), item); - } - - return map; - } -} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/util/SortedProperties.java b/src/main/java/de/marhali/easyi18n/util/SortedProperties.java deleted file mode 100644 index 8a5c321..0000000 --- a/src/main/java/de/marhali/easyi18n/util/SortedProperties.java +++ /dev/null @@ -1,32 +0,0 @@ -package de.marhali.easyi18n.util; - -import java.util.*; - -/** - * Applies sorting to {@link Properties} files. - * @author marhali - */ -@Deprecated -public class SortedProperties extends Properties { - - @Override - public Set<Object> keySet() { - return Collections.unmodifiableSet(new TreeSet<>(super.keySet())); - } - - @Override - public Set<Map.Entry<Object, Object>> entrySet() { - TreeMap<Object, Object> sorted = new TreeMap<>(); - - for(Object key : super.keySet()) { - sorted.put(key, get(key)); - } - - return sorted.entrySet(); - } - - @Override - public synchronized Enumeration<Object> keys() { - return Collections.enumeration(new TreeSet<>(super.keySet())); - } -} \ No newline at end of file From a01b817d3b0023c3e71f501084254b8d663e0ff8 Mon Sep 17 00:00:00 2001 From: marhali <me@marhali.de> Date: Sat, 6 Nov 2021 23:19:37 +0100 Subject: [PATCH 30/49] add support for array values --- .../io/properties/PropertiesArrayMapper.java | 23 +++++++++++++++ .../io/properties/PropertiesMapper.java | 28 ++++++++++++------- 2 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java new file mode 100644 index 0000000..d5ae196 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java @@ -0,0 +1,23 @@ +package de.marhali.easyi18n.io.properties; + +import de.marhali.easyi18n.io.ArrayMapper; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Map for 'properties' array values. + * @author marhali + */ +public class PropertiesArrayMapper extends ArrayMapper { + public static String read(String[] list) { + return read(Arrays.stream(list).iterator(), Object::toString); + } + + public static String[] write(String concat) { + List<String> list = new ArrayList<>(); + write(concat, list::add); + return (String[]) list.toArray(); + } +} \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java index 472416e..b8671ae 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java @@ -2,9 +2,10 @@ package de.marhali.easyi18n.io.properties; import de.marhali.easyi18n.model.Translation; import de.marhali.easyi18n.model.TranslationData; +import de.marhali.easyi18n.model.TranslationNode; import de.marhali.easyi18n.util.StringUtil; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.math.NumberUtils; import java.util.Map; @@ -14,20 +15,20 @@ import java.util.Map; */ public class PropertiesMapper { - // TODO: support array values - public static void read(String locale, SortableProperties properties, TranslationData data) { for(Map.Entry<Object, Object> entry : properties.entrySet()) { String key = String.valueOf(entry.getKey()); - String content = StringUtil.escapeControls(String.valueOf(entry.getValue()), true); + Object value = entry.getValue(); - Translation translation = data.getTranslation(key); + TranslationNode childNode = data.getRootNode().getOrCreateChildren(key); + Translation translation = childNode.getValue(); - if(translation == null) { - translation = new Translation(); - } + String content = value instanceof String[] + ? PropertiesArrayMapper.read((String[]) value) + : StringUtil.escapeControls(String.valueOf(value), true); translation.put(locale, content); + childNode.setValue(translation); } } @@ -36,8 +37,15 @@ public class PropertiesMapper { Translation translation = data.getTranslation(key); if(translation != null && translation.containsKey(locale)) { - String content = StringEscapeUtils.unescapeJava(translation.get(locale)); - properties.put(key, content); + String content = translation.get(locale); + + if(PropertiesArrayMapper.isArray(content)) { + properties.put(key, PropertiesArrayMapper.write(content)); + } else if(NumberUtils.isNumber(content)) { + properties.put(key, NumberUtils.createNumber(content)); + } else { + properties.put(key, content); + } } } } From 4e7bd34b60c0d4ad90854147b881745b757e78ec Mon Sep 17 00:00:00 2001 From: marhali <me@marhali.de> Date: Sun, 7 Nov 2021 13:06:06 +0100 Subject: [PATCH 31/49] fix properties mapper and provide unit tests --- .../io/properties/PropertiesArrayMapper.java | 2 +- .../io/properties/PropertiesMapper.java | 9 +- .../io/properties/SortableProperties.java | 12 +- .../easyi18n/mapper/PropertiesMapperTest.java | 156 ++++++++++++++++++ 4 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java index d5ae196..71741ba 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesArrayMapper.java @@ -18,6 +18,6 @@ public class PropertiesArrayMapper extends ArrayMapper { public static String[] write(String concat) { List<String> list = new ArrayList<>(); write(concat, list::add); - return (String[]) list.toArray(); + return list.toArray(new String[0]); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java index b8671ae..ba6aa6a 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesMapper.java @@ -20,15 +20,18 @@ public class PropertiesMapper { String key = String.valueOf(entry.getKey()); Object value = entry.getValue(); - TranslationNode childNode = data.getRootNode().getOrCreateChildren(key); - Translation translation = childNode.getValue(); + Translation translation = data.getTranslation(key); + + if(translation == null) { + translation = new Translation(); + } String content = value instanceof String[] ? PropertiesArrayMapper.read((String[]) value) : StringUtil.escapeControls(String.valueOf(value), true); translation.put(locale, content); - childNode.setValue(translation); + data.setTranslation(key, translation); } } diff --git a/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java b/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java index c2d08ef..3b51db0 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java +++ b/src/main/java/de/marhali/easyi18n/io/properties/SortableProperties.java @@ -18,9 +18,14 @@ public class SortableProperties extends Properties { return this.properties; } + @Override + public Object get(Object key) { + return this.properties.get(key); + } + @Override public Set<Object> keySet() { - return Collections.unmodifiableSet(new TreeSet<>(super.keySet())); + return Collections.unmodifiableSet(this.properties.keySet()); } @Override @@ -32,4 +37,9 @@ public class SortableProperties extends Properties { public synchronized Object put(Object key, Object value) { return this.properties.put(key, value); } + + @Override + public String toString() { + return this.properties.toString(); + } } \ No newline at end of file diff --git a/src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java b/src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java new file mode 100644 index 0000000..e883b3e --- /dev/null +++ b/src/test/java/de/marhali/easyi18n/mapper/PropertiesMapperTest.java @@ -0,0 +1,156 @@ +package de.marhali.easyi18n.mapper; + +import de.marhali.easyi18n.io.properties.PropertiesArrayMapper; +import de.marhali.easyi18n.io.properties.PropertiesMapper; +import de.marhali.easyi18n.io.properties.SortableProperties; +import de.marhali.easyi18n.model.TranslationData; + +import org.apache.commons.lang.StringEscapeUtils; +import org.junit.Assert; + +import java.util.*; + +/** + * Unit tests for {@link de.marhali.easyi18n.io.properties.PropertiesMapper} + * @author marhali + */ +public class PropertiesMapperTest extends AbstractMapperTest { + + @Override + public void testNonSorting() { + SortableProperties input = new SortableProperties(false); + input.setProperty("zulu", "test"); + input.setProperty("alpha", "test"); + input.setProperty("bravo", "test"); + + TranslationData data = new TranslationData(false, true); + PropertiesMapper.read("en", input, data); + + SortableProperties output = new SortableProperties(false); + PropertiesMapper.write("en", output, data); + + List<String> expect = Arrays.asList("zulu", "alpha", "bravo"); + Assert.assertEquals(expect, new ArrayList<>(output.keySet())); + } + + @Override + public void testSorting() { + SortableProperties input = new SortableProperties(true); + input.setProperty("zulu", "test"); + input.setProperty("alpha", "test"); + input.setProperty("bravo", "test"); + + TranslationData data = new TranslationData(true, true); + PropertiesMapper.read("en", input, data); + + SortableProperties output = new SortableProperties(true); + PropertiesMapper.write("en", output, data); + + List<String> expect = Arrays.asList("alpha", "bravo", "zulu"); + Assert.assertEquals(expect, new ArrayList<>(output.keySet())); + } + + @Override + public void testArrays() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("simple", create(arraySimple)); + data.setTranslation("escaped", create(arrayEscaped)); + + SortableProperties output = new SortableProperties(true); + PropertiesMapper.write("en", output, data); + + Assert.assertTrue(output.get("simple") instanceof String[]); + Assert.assertEquals(arraySimple, PropertiesArrayMapper.read((String[]) output.get("simple"))); + Assert.assertTrue(output.get("escaped") instanceof String[]); + Assert.assertEquals(arrayEscaped, StringEscapeUtils.unescapeJava(PropertiesArrayMapper.read((String[]) output.get("escaped")))); + + TranslationData input = new TranslationData(true, true); + PropertiesMapper.read("en", output, input); + + Assert.assertTrue(PropertiesArrayMapper.isArray(input.getTranslation("simple").get("en"))); + Assert.assertTrue(PropertiesArrayMapper.isArray(input.getTranslation("escaped").get("en"))); + } + + @Override + public void testSpecialCharacters() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("chars", create(specialCharacters)); + + SortableProperties output = new SortableProperties(true); + PropertiesMapper.write("en", output, data); + + Assert.assertEquals(specialCharacters, output.get("chars")); + + TranslationData input = new TranslationData(true, true); + PropertiesMapper.read("en", output, input); + + Assert.assertEquals(specialCharacters, StringEscapeUtils.unescapeJava(input.getTranslation("chars").get("en"))); + } + + @Override + public void testNestedKeys() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("nested.key.sections", create("test")); + + SortableProperties output = new SortableProperties(true); + PropertiesMapper.write("en", output, data); + + Assert.assertEquals("test", output.get("nested.key.sections")); + + TranslationData input = new TranslationData(true, true); + PropertiesMapper.read("en", output, input); + + Assert.assertTrue(input.getRootNode().getChildren().containsKey("nested")); + Assert.assertEquals("test", input.getTranslation("nested.key.sections").get("en")); + } + + @Override + public void testNonNestedKeys() { + TranslationData data = new TranslationData(true, false); + data.setTranslation("long.key.with.many.sections", create("test")); + + SortableProperties output = new SortableProperties(true); + PropertiesMapper.write("en", output, data); + + Assert.assertNotNull(output.get("long.key.with.many.sections")); + + TranslationData input = new TranslationData(true, false); + PropertiesMapper.read("en", output, input); + + Assert.assertEquals("test", input.getRootNode().getChildren() + .get("long.key.with.many.sections").getValue().get("en")); + } + + @Override + public void testLeadingSpace() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("space", create(leadingSpace)); + + SortableProperties output = new SortableProperties(true); + PropertiesMapper.write("en", output, data); + + Assert.assertEquals(leadingSpace, output.get("space")); + + TranslationData input = new TranslationData(true, true); + PropertiesMapper.read("en", output, input); + + Assert.assertEquals(leadingSpace, input.getTranslation("space").get("en")); + } + + @Override + public void testNumbers() { + TranslationData data = new TranslationData(true, true); + data.setTranslation("numbered", create("15000")); + + SortableProperties output = new SortableProperties(true); + PropertiesMapper.write("en", output, data); + + Assert.assertEquals(15000, output.get("numbered")); + + SortableProperties input = new SortableProperties(true); + input.put("numbered", 143.23); + PropertiesMapper.read("en", input, data); + + Assert.assertEquals("143.23", data.getTranslation("numbered").get("en")); + } +} \ No newline at end of file From bbfe792e9f3eec48c3d30e970672b67d2a48a12b Mon Sep 17 00:00:00 2001 From: marhali <me@marhali.de> Date: Sun, 7 Nov 2021 15:05:45 +0100 Subject: [PATCH 32/49] begin search method refactoring --- src/main/java/de/marhali/easyi18n/tabs/TableView.java | 9 +++++++-- .../marhali/easyi18n/tabs/mapper/TableModelMapper.java | 10 ++++++++-- src/main/resources/messages.properties | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/tabs/TableView.java b/src/main/java/de/marhali/easyi18n/tabs/TableView.java index c7f2e3b..8437d05 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TableView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TableView.java @@ -29,6 +29,8 @@ public class TableView implements BusListener { private final Project project; + private TableModelMapper currentMapper; + private JPanel rootPanel; private JPanel containerPanel; @@ -73,7 +75,7 @@ public class TableView implements BusListener { @Override public void onUpdateData(@NotNull TranslationData data) { - table.setModel(new TableModelMapper(data, update -> + table.setModel(this.currentMapper = new TableModelMapper(data, update -> InstanceManager.get(project).processUpdate(update))); } @@ -87,7 +89,7 @@ public class TableView implements BusListener { } } - if (row > -1) { // Matched @scrollTo + if (row > -1) { // Matched @key table.scrollRectToVisible( new Rectangle(0, (row * table.getRowHeight()) + table.getHeight(), 0, 0)); } @@ -96,6 +98,9 @@ public class TableView implements BusListener { @Override public void onSearchQuery(@Nullable String query) { // TODO: handle search functionality + if(this.currentMapper != null) { + this.currentMapper.onSearchQuery(query); + } } public JPanel getRootPanel() { diff --git a/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java b/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java index 513b14b..29aa273 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java +++ b/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java @@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.function.Consumer; @@ -19,7 +20,7 @@ import java.util.function.Consumer; * Mapping {@link TranslationData} to {@link TableModel}. * @author marhali */ -public class TableModelMapper implements TableModel { +public class TableModelMapper implements TableModel, SearchQueryListener { private final @NotNull TranslationData data; private final @NotNull List<String> locales; @@ -27,7 +28,7 @@ public class TableModelMapper implements TableModel { private final @NotNull Consumer<TranslationUpdate> updater; - public TableModelMapper(@NotNull TranslationData data, Consumer<TranslationUpdate> updater) { + public TableModelMapper(@NotNull TranslationData data, @NotNull Consumer<TranslationUpdate> updater) { this.data = data; this.locales = new ArrayList<>(data.getLocales()); this.fullKeys = new ArrayList<>(data.getFullKeys()); @@ -35,6 +36,11 @@ public class TableModelMapper implements TableModel { this.updater = updater; } + @Override + public void onSearchQuery(@Nullable String query) { + this.fullKeys = new ArrayList<>(); + } + @Override public int getRowCount() { return this.fullKeys.size(); diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 70d5f45..7292936 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -7,7 +7,7 @@ action.add=Add Translation action.edit=Edit Translation action.reload=Reload From Disk action.settings=Settings -action.search=Search Key... +action.search=Search... action.delete=Delete translation.key=Key translation.locales=Locales From 1b1705a66162d65ee4f5f18c4a49b4dc596d97ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Tue, 9 Nov 2021 19:33:59 +0100 Subject: [PATCH 33/49] remove legacy array utilities --- .../easyi18n/util/array/ArrayUtil.java | 59 ------------------- .../easyi18n/util/array/JsonArrayUtil.java | 21 ------- .../easyi18n/util/array/YamlArrayUtil.java | 21 ------- 3 files changed, 101 deletions(-) delete mode 100644 src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java delete mode 100644 src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java delete mode 100644 src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java diff --git a/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java deleted file mode 100644 index c13e57c..0000000 --- a/src/main/java/de/marhali/easyi18n/util/array/ArrayUtil.java +++ /dev/null @@ -1,59 +0,0 @@ -package de.marhali.easyi18n.util.array; - -import de.marhali.easyi18n.util.StringUtil; -import org.apache.commons.lang.StringEscapeUtils; - -import java.text.MessageFormat; -import java.util.Iterator; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.regex.Pattern; - -/** - * Utility methods for simple array support. - * @author marhali - */ -@Deprecated -public abstract class ArrayUtil { - - static final String PREFIX = "!arr["; - static final String SUFFIX = "]"; - static final char DELIMITER = ';'; - - static final String SPLITERATOR_REGEX = - MessageFormat.format("(?<!\\\\){0}", Pattern.quote(String.valueOf(DELIMITER))); - - static <T> String read(Iterator<T> elements, Function<T, String> stringFactory) { - StringBuilder builder = new StringBuilder(PREFIX); - - int i = 0; - while(elements.hasNext()) { - if(i > 0) { - builder.append(DELIMITER); - } - - String value = stringFactory.apply(elements.next()); - - builder.append(StringUtil.escapeControls( - value.replace(String.valueOf(DELIMITER), "\\" + DELIMITER), true)); - - i++; - } - - builder.append(SUFFIX); - return builder.toString(); - } - - static void write(String concat, Consumer<String> writeElement) { - concat = concat.substring(PREFIX.length(), concat.length() - SUFFIX.length()); - - for(String element : concat.split(SPLITERATOR_REGEX)) { - element = element.replace("\\" + DELIMITER, String.valueOf(DELIMITER)); - writeElement.accept(StringEscapeUtils.unescapeJava(element)); - } - } - - public static boolean isArray(String concat) { - return concat != null && concat.startsWith(PREFIX) && concat.endsWith(SUFFIX); - } -} diff --git a/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java deleted file mode 100644 index 8905c1f..0000000 --- a/src/main/java/de/marhali/easyi18n/util/array/JsonArrayUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.marhali.easyi18n.util.array; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; - -/** - * Utility methods to read and write json arrays. - * @author marhali - */ -@Deprecated -public class JsonArrayUtil extends ArrayUtil { - public static String read(JsonArray array) { - return read(array.iterator(), JsonElement::getAsString); - } - - public static JsonArray write(String concat) { - JsonArray array = new JsonArray(); - write(concat, array::add); - return array; - } -} diff --git a/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java b/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java deleted file mode 100644 index 6c4cac1..0000000 --- a/src/main/java/de/marhali/easyi18n/util/array/YamlArrayUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.marhali.easyi18n.util.array; - -import thito.nodeflow.config.ListSection; - -/** - * Utility methods to read and write yaml lists. - * @author marhali - */ -@Deprecated -public class YamlArrayUtil extends ArrayUtil { - - public static String read(ListSection list) { - return read(list.iterator(), Object::toString); - } - - public static ListSection write(String concat) { - ListSection list = new ListSection(); - write(concat, list::add); - return list; - } -} \ No newline at end of file From a34ae7e02fad91f18d13a26390153ca9258d5007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Tue, 9 Nov 2021 19:35:37 +0100 Subject: [PATCH 34/49] introduce full-text-search inside i18n tool window --- .../de/marhali/easyi18n/tabs/TableView.java | 2 +- .../de/marhali/easyi18n/tabs/TreeView.java | 16 ++++-- .../tabs/mapper/TableModelMapper.java | 29 ++++++++-- .../easyi18n/tabs/mapper/TreeModelMapper.java | 55 +++++++++++++++++-- 4 files changed, 84 insertions(+), 18 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/tabs/TableView.java b/src/main/java/de/marhali/easyi18n/tabs/TableView.java index 8437d05..340d3a5 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TableView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TableView.java @@ -97,9 +97,9 @@ public class TableView implements BusListener { @Override public void onSearchQuery(@Nullable String query) { - // TODO: handle search functionality if(this.currentMapper != null) { this.currentMapper.onSearchQuery(query); + this.table.updateUI(); } } diff --git a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java index 726526b..55bce06 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java @@ -41,14 +41,14 @@ public class TreeView implements BusListener { private final Project project; + private TreeModelMapper currentMapper; + private JPanel rootPanel; private JPanel toolBarPanel; private JPanel containerPanel; private Tree tree; - private TreeModelMapper mapper; - public TreeView(Project project) { this.project = project; @@ -81,19 +81,23 @@ public class TreeView implements BusListener { @Override public void onUpdateData(@NotNull TranslationData data) { - tree.setModel(this.mapper = new TreeModelMapper(data, SettingsService.getInstance(project).getState(), null)); + tree.setModel(this.currentMapper = new TreeModelMapper(data, SettingsService.getInstance(project).getState())); } @Override public void onFocusKey(@Nullable String key) { - if(key != null && mapper != null) { - this.tree.scrollPathToVisible(mapper.findTreePath(key)); + if(key != null && currentMapper != null) { + this.tree.scrollPathToVisible(currentMapper.findTreePath(key)); } } @Override public void onSearchQuery(@Nullable String query) { - // TODO: handle search functionality + if(this.currentMapper != null) { + this.currentMapper.onSearchQuery(query); + this.expandAll().run(); + this.tree.updateUI(); + } } private void handlePopup(MouseEvent e) { diff --git a/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java b/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java index 29aa273..5a79f8e 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java +++ b/src/main/java/de/marhali/easyi18n/tabs/mapper/TableModelMapper.java @@ -1,10 +1,8 @@ package de.marhali.easyi18n.tabs.mapper; import de.marhali.easyi18n.model.*; - -import de.marhali.easyi18n.model.bus.BusListener; import de.marhali.easyi18n.model.bus.SearchQueryListener; -import de.marhali.easyi18n.model.bus.UpdateDataListener; + import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -12,7 +10,6 @@ import org.jetbrains.annotations.Nullable; import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.function.Consumer; @@ -24,7 +21,7 @@ public class TableModelMapper implements TableModel, SearchQueryListener { private final @NotNull TranslationData data; private final @NotNull List<String> locales; - private final @NotNull List<String> fullKeys; + private @NotNull List<String> fullKeys; private final @NotNull Consumer<TranslationUpdate> updater; @@ -38,7 +35,27 @@ public class TableModelMapper implements TableModel, SearchQueryListener { @Override public void onSearchQuery(@Nullable String query) { - this.fullKeys = new ArrayList<>(); + if(query == null) { // Reset + this.fullKeys = new ArrayList<>(this.data.getFullKeys()); + return; + } + + query = query.toLowerCase(); + List<String> matches = new ArrayList<>(); + + for(String key : this.data.getFullKeys()) { + if(key.toLowerCase().contains(query)) { + matches.add(key); + } else { + for(String content : this.data.getTranslation(key).values()) { + if(content.toLowerCase().contains(query)) { + matches.add(key); + } + } + } + } + + this.fullKeys = matches; } @Override diff --git a/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java b/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java index 1c08dac..d1e4670 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java +++ b/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java @@ -6,6 +6,7 @@ import com.intellij.ui.JBColor; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationNode; +import de.marhali.easyi18n.model.bus.SearchQueryListener; import de.marhali.easyi18n.util.PathUtil; import de.marhali.easyi18n.util.UiUtil; @@ -20,31 +21,46 @@ import java.util.Map; * Mapping {@link TranslationData} to {@link TreeModel}. * @author marhali */ -public class TreeModelMapper extends DefaultTreeModel { +public class TreeModelMapper extends DefaultTreeModel implements SearchQueryListener { private final TranslationData data; private final SettingsState state; - public TreeModelMapper(TranslationData data, SettingsState state, String searchQuery) { + public TreeModelMapper(TranslationData data, SettingsState state) { super(null); this.data = data; this.state = state; DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(); - this.generateNodes(rootNode, this.data.getRootNode()); + this.generateNodes(rootNode, this.data.getRootNode(), null); super.setRoot(rootNode); } - private void generateNodes(DefaultMutableTreeNode parent, TranslationNode translationNode) { + @Override + public void onSearchQuery(@Nullable String query) { + DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(); + this.generateNodes(rootNode, this.data.getRootNode(), query); + super.setRoot(rootNode); + } + + private void generateNodes(@NotNull DefaultMutableTreeNode parent, + @NotNull TranslationNode translationNode, @Nullable String searchQuery) { for(Map.Entry<String, TranslationNode> entry : translationNode.getChildren().entrySet()) { String key = entry.getKey(); TranslationNode childTranslationNode = entry.getValue(); + if(searchQuery != null) { + searchQuery = searchQuery.toLowerCase(); + if(!this.isApplicable(key, childTranslationNode, searchQuery)) { + continue; + } + } + if(!childTranslationNode.isLeaf()) { // Nested node - run recursively DefaultMutableTreeNode childNode = new DefaultMutableTreeNode(key); - this.generateNodes(childNode, childTranslationNode); + this.generateNodes(childNode, childTranslationNode, searchQuery); parent.add(childNode); } else { String previewLocale = this.state.getPreviewLocale(); @@ -63,6 +79,35 @@ public class TreeModelMapper extends DefaultTreeModel { } } + /** + * Checks if the provided tree (@node) is applicable for the search string. + * A full-text-search is applied and section keys and every value will be evaluated. + * @param key Section key + * @param node Node which has @key as key + * @param searchQuery Search query to search for + * @return True if this node or ANY child is relevant for the search context + */ + private boolean isApplicable(@NotNull String key, @NotNull TranslationNode node, @NotNull String searchQuery) { + if(key.toLowerCase().contains(searchQuery)) { + return true; + } + + if(!node.isLeaf()) { + for(Map.Entry<String, TranslationNode> entry : node.getChildren().entrySet()) { + if(this.isApplicable(entry.getKey(), entry.getValue(), searchQuery)) { + return true; + } + } + } else { + for(String content : node.getValue().values()) { + if(content.toLowerCase().contains(searchQuery)) { + return true; + } + } + } + + return false; + } public @NotNull TreePath findTreePath(@NotNull String fullPath) { List<String> sections = new PathUtil(this.state.isNestedKeys()).split(fullPath); From 10b2698c06975c75ae0fbe474697b5cd3f5b4d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Tue, 9 Nov 2021 19:49:28 +0100 Subject: [PATCH 35/49] fix add-action in combination with tree-view node select --- src/main/java/de/marhali/easyi18n/action/AddAction.java | 3 ++- src/main/java/de/marhali/easyi18n/util/TreeUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/action/AddAction.java b/src/main/java/de/marhali/easyi18n/action/AddAction.java index 20f9dba..f2c2455 100644 --- a/src/main/java/de/marhali/easyi18n/action/AddAction.java +++ b/src/main/java/de/marhali/easyi18n/action/AddAction.java @@ -6,6 +6,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import de.marhali.easyi18n.service.WindowManager; import de.marhali.easyi18n.dialog.AddDialog; +import de.marhali.easyi18n.util.PathUtil; import de.marhali.easyi18n.util.TreeUtil; import org.jetbrains.annotations.NotNull; @@ -42,7 +43,7 @@ public class AddAction extends AnAction { TreePath path = manager.getTreeView().getTree().getSelectionPath(); if(path != null) { - return TreeUtil.getFullPath(path) + "."; + return TreeUtil.getFullPath(path) + PathUtil.DELIMITER; } } else { // Table View diff --git a/src/main/java/de/marhali/easyi18n/util/TreeUtil.java b/src/main/java/de/marhali/easyi18n/util/TreeUtil.java index 72a2744..03e3821 100644 --- a/src/main/java/de/marhali/easyi18n/util/TreeUtil.java +++ b/src/main/java/de/marhali/easyi18n/util/TreeUtil.java @@ -25,12 +25,12 @@ public class TreeUtil { String section = value instanceof PresentationData ? ((PresentationData) value).getPresentableText() : String.valueOf(value); - if(section == null) { // Skip empty sections + if(value == null) { // Skip empty sections continue; } if(builder.length() != 0) { - builder.append("."); + builder.append(PathUtil.DELIMITER); } builder.append(section); From f0d83f0d12276ca1215326c2de68b7efcd863f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Tue, 9 Nov 2021 20:19:20 +0100 Subject: [PATCH 36/49] apply nullable annotation to fix delete operation --- .../java/de/marhali/easyi18n/model/KeyedTranslation.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java b/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java index 0e31269..97a415a 100644 --- a/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java +++ b/src/main/java/de/marhali/easyi18n/model/KeyedTranslation.java @@ -1,6 +1,7 @@ package de.marhali.easyi18n.model; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * I18n translation with associated key path (full-key). @@ -9,9 +10,9 @@ import org.jetbrains.annotations.NotNull; public class KeyedTranslation { private @NotNull String key; - private @NotNull Translation translation; + private @Nullable Translation translation; - public KeyedTranslation(@NotNull String key, @NotNull Translation translation) { + public KeyedTranslation(@NotNull String key, @Nullable Translation translation) { this.key = key; this.translation = translation; } @@ -24,7 +25,7 @@ public class KeyedTranslation { this.key = key; } - public @NotNull Translation getTranslation() { + public @Nullable Translation getTranslation() { return translation; } From 47fde381686a958512001ee189cc943ea80eeeb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Tue, 9 Nov 2021 21:21:55 +0100 Subject: [PATCH 37/49] focus parent of deleted key path --- .../de/marhali/easyi18n/InstanceManager.java | 4 +++- .../de/marhali/easyi18n/tabs/TreeView.java | 7 ++++++- .../easyi18n/tabs/mapper/TreeModelMapper.java | 18 +++++++++++------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/InstanceManager.java b/src/main/java/de/marhali/easyi18n/InstanceManager.java index 41ec935..129f1be 100644 --- a/src/main/java/de/marhali/easyi18n/InstanceManager.java +++ b/src/main/java/de/marhali/easyi18n/InstanceManager.java @@ -65,8 +65,10 @@ public class InstanceManager { if(success) { this.bus.propagate().onUpdateData(this.store.getData()); - if(!update.isDeletion()) { // TODO: maybe focus parent if key was deleted + if(!update.isDeletion()) { this.bus.propagate().onFocusKey(update.getChange().getKey()); + } else { + this.bus.propagate().onFocusKey(update.getOrigin().getKey()); } } }); diff --git a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java index 55bce06..aeda7c1 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java @@ -87,7 +87,12 @@ public class TreeView implements BusListener { @Override public void onFocusKey(@Nullable String key) { if(key != null && currentMapper != null) { - this.tree.scrollPathToVisible(currentMapper.findTreePath(key)); + TreePath path = currentMapper.findTreePath(key); + this.tree.scrollPathToVisible(path); + + if(this.tree.isCollapsed(path)) { + this.tree.expandPath(path); + } } } diff --git a/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java b/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java index d1e4670..c841799 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java +++ b/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java @@ -14,6 +14,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.tree.*; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -111,19 +112,22 @@ public class TreeModelMapper extends DefaultTreeModel implements SearchQueryList public @NotNull TreePath findTreePath(@NotNull String fullPath) { List<String> sections = new PathUtil(this.state.isNestedKeys()).split(fullPath); - Object[] nodes = new Object[sections.size() + 1]; + List<Object> nodes = new ArrayList<>(); - int pos = 0; TreeNode currentNode = (TreeNode) this.getRoot(); - nodes[pos] = currentNode; + nodes.add(currentNode); for(String section : sections) { - pos++; currentNode = this.findNode(currentNode, section); - nodes[pos] = currentNode; + + if(currentNode == null) { + break; + } + + nodes.add(currentNode); } - return new TreePath(nodes); + return new TreePath(nodes.toArray()); } public @Nullable DefaultMutableTreeNode findNode(@NotNull TreeNode parent, @NotNull String key) { @@ -144,6 +148,6 @@ public class TreeModelMapper extends DefaultTreeModel implements SearchQueryList } } - throw new NullPointerException("Cannot find node by key: " + key); + return null; } } \ No newline at end of file From 130b5ab897b873fa7f0460bfb572f98b630801ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Tue, 9 Nov 2021 23:00:34 +0100 Subject: [PATCH 38/49] optimize full-text-search --- .../easyi18n/tabs/mapper/TreeModelMapper.java | 74 ++++++++----------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java b/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java index c841799..621bb10 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java +++ b/src/main/java/de/marhali/easyi18n/tabs/mapper/TreeModelMapper.java @@ -4,6 +4,7 @@ import com.intellij.ide.projectView.PresentationData; import com.intellij.ui.JBColor; import de.marhali.easyi18n.model.SettingsState; +import de.marhali.easyi18n.model.Translation; import de.marhali.easyi18n.model.TranslationData; import de.marhali.easyi18n.model.TranslationNode; import de.marhali.easyi18n.model.bus.SearchQueryListener; @@ -34,34 +35,53 @@ public class TreeModelMapper extends DefaultTreeModel implements SearchQueryList this.state = state; DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(); - this.generateNodes(rootNode, this.data.getRootNode(), null); + this.generateNodes(rootNode, this.data.getRootNode()); super.setRoot(rootNode); } @Override public void onSearchQuery(@Nullable String query) { DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(); - this.generateNodes(rootNode, this.data.getRootNode(), query); + TranslationData shadow = new TranslationData(this.state.isSortKeys(), this.state.isNestedKeys()); + + if(query == null) { + this.generateNodes(rootNode, this.data.getRootNode()); + super.setRoot(rootNode); + return; + } + + query = query.toLowerCase(); + + for(String currentKey : this.data.getFullKeys()) { + Translation translation = this.data.getTranslation(currentKey); + String loweredKey = currentKey.toLowerCase(); + + if(query.contains(loweredKey) || loweredKey.contains(query)) { + shadow.setTranslation(currentKey, translation); + continue; + } + + for(String currentContent : translation.values()) { + if(currentContent.toLowerCase().contains(query)) { + shadow.setTranslation(currentKey, translation); + break; + } + } + } + + this.generateNodes(rootNode, shadow.getRootNode()); super.setRoot(rootNode); } - private void generateNodes(@NotNull DefaultMutableTreeNode parent, - @NotNull TranslationNode translationNode, @Nullable String searchQuery) { + private void generateNodes(@NotNull DefaultMutableTreeNode parent, @NotNull TranslationNode translationNode) { for(Map.Entry<String, TranslationNode> entry : translationNode.getChildren().entrySet()) { String key = entry.getKey(); TranslationNode childTranslationNode = entry.getValue(); - if(searchQuery != null) { - searchQuery = searchQuery.toLowerCase(); - if(!this.isApplicable(key, childTranslationNode, searchQuery)) { - continue; - } - } - if(!childTranslationNode.isLeaf()) { // Nested node - run recursively DefaultMutableTreeNode childNode = new DefaultMutableTreeNode(key); - this.generateNodes(childNode, childTranslationNode, searchQuery); + this.generateNodes(childNode, childTranslationNode); parent.add(childNode); } else { String previewLocale = this.state.getPreviewLocale(); @@ -80,36 +100,6 @@ public class TreeModelMapper extends DefaultTreeModel implements SearchQueryList } } - /** - * Checks if the provided tree (@node) is applicable for the search string. - * A full-text-search is applied and section keys and every value will be evaluated. - * @param key Section key - * @param node Node which has @key as key - * @param searchQuery Search query to search for - * @return True if this node or ANY child is relevant for the search context - */ - private boolean isApplicable(@NotNull String key, @NotNull TranslationNode node, @NotNull String searchQuery) { - if(key.toLowerCase().contains(searchQuery)) { - return true; - } - - if(!node.isLeaf()) { - for(Map.Entry<String, TranslationNode> entry : node.getChildren().entrySet()) { - if(this.isApplicable(entry.getKey(), entry.getValue(), searchQuery)) { - return true; - } - } - } else { - for(String content : node.getValue().values()) { - if(content.toLowerCase().contains(searchQuery)) { - return true; - } - } - } - - return false; - } - public @NotNull TreePath findTreePath(@NotNull String fullPath) { List<String> sections = new PathUtil(this.state.isNestedKeys()).split(fullPath); List<Object> nodes = new ArrayList<>(); From 891d6bde700ad5818e555b8c5416771439e2c3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Wed, 10 Nov 2021 09:25:42 +0100 Subject: [PATCH 39/49] propagate changes via event bus --- src/main/java/de/marhali/easyi18n/action/ReloadAction.java | 5 ++++- src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/action/ReloadAction.java b/src/main/java/de/marhali/easyi18n/action/ReloadAction.java index 3e24e04..323ba44 100644 --- a/src/main/java/de/marhali/easyi18n/action/ReloadAction.java +++ b/src/main/java/de/marhali/easyi18n/action/ReloadAction.java @@ -23,6 +23,9 @@ public class ReloadAction extends AnAction { @Override public void actionPerformed(@NotNull AnActionEvent e) { - InstanceManager.get(e.getProject()).store().loadFromPersistenceLayer((success) -> {}); + InstanceManager manager = InstanceManager.get(e.getProject()); + manager.store().loadFromPersistenceLayer((success) -> { + manager.bus().propagate().onUpdateData(manager.store().getData()); + }); } } \ No newline at end of file diff --git a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java index e0dd7eb..e4e4c3c 100644 --- a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java +++ b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java @@ -50,7 +50,10 @@ public class SettingsDialog { state.setCodeAssistance(codeAssistanceCheckbox.isSelected()); // Reload instance - InstanceManager.get(project).store().loadFromPersistenceLayer((success) -> {}); + InstanceManager manager = InstanceManager.get(project); + manager.store().loadFromPersistenceLayer((success) -> { + manager.bus().propagate().onUpdateData(manager.store().getData()); + }); } } From 28d7592c20c1f96737a96f87191ac6d18140a903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Wed, 10 Nov 2021 10:40:12 +0100 Subject: [PATCH 40/49] remove console log --- src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java b/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java index e448300..364ab33 100644 --- a/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java +++ b/src/main/java/de/marhali/easyi18n/io/yaml/YamlMapper.java @@ -27,7 +27,6 @@ public class YamlMapper { if(value instanceof MapSection) { // Nested element - run recursively - System.out.println("run recurse"); read(locale, (MapSection) value, childNode); } else { Translation translation = childNode.getValue(); From 70747bf90ae551863c4129884b96784438b30206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Wed, 10 Nov 2021 10:48:47 +0100 Subject: [PATCH 41/49] use correct charset --- .../de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java | 2 +- src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java index a0063f8..0d3c9d4 100644 --- a/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/properties/PropertiesIOStrategy.java @@ -70,7 +70,7 @@ public class PropertiesIOStrategy implements IOStrategy { data.addLocale(locale); SortableProperties properties = new SortableProperties(state.isSortKeys()); - properties.load(new InputStreamReader(file.getInputStream())); + properties.load(new InputStreamReader(file.getInputStream(), file.getCharset())); PropertiesMapper.read(locale, properties, data); } diff --git a/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java index f5e7557..fbb0ced 100644 --- a/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/yaml/YamlIOStrategy.java @@ -76,7 +76,7 @@ public class YamlIOStrategy implements IOStrategy { String locale = file.getNameWithoutExtension(); data.addLocale(locale); - try(Reader reader = new InputStreamReader(file.getInputStream())) { + try(Reader reader = new InputStreamReader(file.getInputStream(), file.getCharset())) { Section section = Section.parseToMap(reader); YamlMapper.read(locale, section, data.getRootNode()); } From d0aff2f81660a93e138b50dfd429710fd4e5e3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Wed, 10 Nov 2021 14:15:10 +0100 Subject: [PATCH 42/49] do not override data by locale iteration --- .../easyi18n/io/json/ModularizedJsonIOStrategy.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java b/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java index 391b73a..7e4d877 100644 --- a/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java +++ b/src/main/java/de/marhali/easyi18n/io/json/ModularizedJsonIOStrategy.java @@ -88,16 +88,18 @@ public class ModularizedJsonIOStrategy implements IOStrategy { continue; } - TranslationNode moduleNode = new TranslationNode(state.isSortKeys() - ? new TreeMap<>() - : new LinkedHashMap<>()); + String moduleName = module.getNameWithoutExtension(); + + TranslationNode moduleNode = data.getNode(moduleName) != null + ? data.getNode(moduleName) + : new TranslationNode(state.isSortKeys() ? new TreeMap<>() : new LinkedHashMap<>()); JsonObject tree = GSON.fromJson(new InputStreamReader(module.getInputStream(), module.getCharset()), JsonObject.class); JsonMapper.read(locale, tree, moduleNode); - data.getRootNode().setChildren(module.getNameWithoutExtension(), moduleNode); + data.getRootNode().setChildren(moduleName, moduleNode); } } From 4aac4161dbbc254cfd0573b4aa90e05478a89dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Wed, 10 Nov 2021 20:05:16 +0100 Subject: [PATCH 43/49] reload instance after i18n file change --- .../java/de/marhali/easyi18n/DataStore.java | 14 +++- .../easyi18n/service/FileChangeListener.java | 66 +++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 src/main/java/de/marhali/easyi18n/service/FileChangeListener.java diff --git a/src/main/java/de/marhali/easyi18n/DataStore.java b/src/main/java/de/marhali/easyi18n/DataStore.java index d48444e..d8fcd83 100644 --- a/src/main/java/de/marhali/easyi18n/DataStore.java +++ b/src/main/java/de/marhali/easyi18n/DataStore.java @@ -1,6 +1,8 @@ package de.marhali.easyi18n; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.vfs.*; import de.marhali.easyi18n.io.IOStrategy; import de.marhali.easyi18n.io.json.JsonIOStrategy; @@ -9,6 +11,7 @@ import de.marhali.easyi18n.io.properties.PropertiesIOStrategy; import de.marhali.easyi18n.io.yaml.YamlIOStrategy; import de.marhali.easyi18n.model.SettingsState; import de.marhali.easyi18n.model.TranslationData; +import de.marhali.easyi18n.service.FileChangeListener; import de.marhali.easyi18n.service.SettingsService; import org.jetbrains.annotations.NotNull; @@ -31,13 +34,18 @@ public class DataStore { new PropertiesIOStrategy() )); - private final Project project; + private final @NotNull Project project; + private final @NotNull FileChangeListener changeListener; private @NotNull TranslationData data; - protected DataStore(Project project) { + protected DataStore(@NotNull Project project) { this.project = project; this.data = new TranslationData(true, true); // Initialize with hard-coded configuration + this.changeListener = new FileChangeListener(project); + + VirtualFileManager.getInstance().addAsyncFileListener( + this.changeListener, Disposer.newDisposable("EasyI18n")); } public @NotNull TranslationData getData() { @@ -58,6 +66,8 @@ public class DataStore { return; } + this.changeListener.updateLocalesPath(localesPath); + IOStrategy strategy = this.determineStrategy(state, localesPath); strategy.read(this.project, localesPath, state, (data) -> { diff --git a/src/main/java/de/marhali/easyi18n/service/FileChangeListener.java b/src/main/java/de/marhali/easyi18n/service/FileChangeListener.java new file mode 100644 index 0000000..9591a98 --- /dev/null +++ b/src/main/java/de/marhali/easyi18n/service/FileChangeListener.java @@ -0,0 +1,66 @@ +package de.marhali.easyi18n.service; + +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.AsyncFileListener; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.vfs.newvfs.events.VFileEvent; + +import de.marhali.easyi18n.InstanceManager; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.util.List; + +/** + * Listens for file changes inside configured @localesPath. See {@link AsyncFileListener}. + * Will trigger the reload function of the i18n instance if a relevant file was changed. + * @author marhali + */ +public class FileChangeListener implements AsyncFileListener { + + private static final Logger logger = Logger.getInstance(FileChangeListener.class); + + private final @NotNull Project project; + private @Nullable String localesPath; + + public FileChangeListener(@NotNull Project project) { + this.project = project; + this.localesPath = null; // Wait for any update before listening to file changes + } + + public void updateLocalesPath(@Nullable String localesPath) { + if(localesPath != null && !localesPath.isEmpty()) { + VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(new File(localesPath)); + + if(file != null && file.isDirectory()) { + this.localesPath = file.getPath(); + return; + } + } + + this.localesPath = null; + } + + @Override + public ChangeApplier prepareChange(@NotNull List<? extends @NotNull VFileEvent> events) { + return new ChangeApplier() { + @Override + public void afterVfsChange() { + if(localesPath != null) { + events.forEach((e) -> { + if(e.getPath().contains(localesPath)) { // Perform reload + logger.debug("Detected file change. Reloading instance..."); + InstanceManager manager = InstanceManager.get(project); + manager.store().loadFromPersistenceLayer((success) -> { + manager.bus().propagate().onUpdateData(manager.store().getData()); + }); + } + }); + } + } + }; + } +} \ No newline at end of file From 5ae301324647f289a859ce6e6d4b23a7bdb55497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Wed, 10 Nov 2021 20:10:49 +0100 Subject: [PATCH 44/49] fix import --- .../java/de/marhali/easyi18n/service/FileChangeListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/marhali/easyi18n/service/FileChangeListener.java b/src/main/java/de/marhali/easyi18n/service/FileChangeListener.java index 9591a98..00ed6e2 100644 --- a/src/main/java/de/marhali/easyi18n/service/FileChangeListener.java +++ b/src/main/java/de/marhali/easyi18n/service/FileChangeListener.java @@ -8,6 +8,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.newvfs.events.VFileEvent; import de.marhali.easyi18n.InstanceManager; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; From 9137caba59e68188025830190ab1739be6afcd00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Wed, 10 Nov 2021 20:53:56 +0100 Subject: [PATCH 45/49] update changelog and prepare next release --- CHANGELOG.md | 11 +++++++++++ gradle.properties | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f6d85c..6d1c289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ # easy-i18n Changelog ## [Unreleased] +### Added +- The search function now supports full-text-search +- Automatically reload translation data on file system change +- Sorting of translation keys can now be disabled via configuration +- Key section nesting can be disabled via configuration +- Numbers will be stored as number type whenever possible + +### Changed +- Better focus keys in tree-view after edit +- Optimized internal data structure (io, cache, events) + ## [1.5.1] ### Fixed - Exception on key annotation if path-prefix is undefined diff --git a/gradle.properties b/gradle.properties index c31f92e..c3bfd2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ pluginGroup = de.marhali.easyi18n pluginName = easy-i18n -pluginVersion = 1.5.1 +pluginVersion = 1.6.0 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. From dfccf1f994735695c21a3da92455b4338edd873a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Thu, 11 Nov 2021 16:01:58 +0100 Subject: [PATCH 46/49] suppress warnings --- src/main/java/de/marhali/easyi18n/model/TranslationNode.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/marhali/easyi18n/model/TranslationNode.java b/src/main/java/de/marhali/easyi18n/model/TranslationNode.java index 0ed69a0..dc91f3b 100644 --- a/src/main/java/de/marhali/easyi18n/model/TranslationNode.java +++ b/src/main/java/de/marhali/easyi18n/model/TranslationNode.java @@ -76,6 +76,7 @@ public class TranslationNode { this.children.put(key, node); } + @SuppressWarnings("unchecked") public @NotNull TranslationNode setChildren(@NotNull String key) { try { TranslationNode node = new TranslationNode(this.children.getClass().getDeclaredConstructor().newInstance()); From 0a4dce76d4d1e1319944b6bf82a362b8b89084b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Thu, 11 Nov 2021 16:34:34 +0100 Subject: [PATCH 47/49] update config and files to latest jetbrains plugin template version --- .github/dependabot.yml | 8 + .github/workflows/build.yml | 265 ++++++++--------------- .github/workflows/release.yml | 91 ++++---- .github/workflows/run-ui-tests.yml | 60 +++++ .gitignore | 3 +- .run/Run IDE for UI Tests.run.xml | 22 ++ .run/Run IDE with Plugin.run.xml | 44 ++-- .run/Run Plugin Tests.run.xml | 44 ++-- .run/Run Plugin Verification.run.xml | 48 ++-- .run/Run Qodana.run.xml | 26 +++ CHANGELOG.md | 3 + build.gradle.kts | 94 ++++---- gradle.properties | 23 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- qodana.yml | 6 + src/main/resources/META-INF/plugin.xml | 1 + 18 files changed, 399 insertions(+), 343 deletions(-) create mode 100644 .github/workflows/run-ui-tests.yml create mode 100644 .run/Run IDE for UI Tests.run.xml create mode 100644 .run/Run Qodana.run.xml create mode 100644 qodana.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 70d86ad..f6b0d11 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,7 +3,15 @@ version: 2 updates: + # Maintain dependencies for Gradle dependencies - package-ecosystem: "gradle" directory: "/" + target-branch: "next" schedule: interval: "daily" + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "next" + schedule: + interval: "daily" \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9ada39..47d5a19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,111 +1,53 @@ # GitHub Actions Workflow created for testing and preparing the plugin release in following steps: # - validate Gradle Wrapper, -# - run test and verifyPlugin tasks, -# - run buildPlugin task and prepare artifact for the further tests, -# - run IntelliJ Plugin Verifier, +# - run 'test' and 'verifyPlugin' tasks, +# - run Qodana inspections, +# - run 'buildPlugin' task and prepare artifact for the further tests, +# - run 'runPluginVerifier' task, # - create a draft release. # # Workflow is triggered on push and pull_request events. # -# Docs: -# - GitHub Actions: https://help.github.com/en/actions -# - IntelliJ Plugin Verifier GitHub Action: https://github.com/ChrisCarini/intellij-platform-plugin-verifier-action +# GitHub Actions reference: https://help.github.com/en/actions # ## JBIJPPTPL name: Build -on: [push, pull_request] +on: + # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests) + push: + branches: [main] + # Trigger the workflow on any pull request + pull_request: + jobs: # Run Gradle Wrapper Validation Action to verify the wrapper's checksum - gradleValidation: - name: Gradle Wrapper + # Run verifyPlugin, IntelliJ Plugin Verifier, and test Gradle tasks + # Build plugin and provide the artifact for the next workflow jobs + build: + name: Build runs-on: ubuntu-latest + outputs: + version: ${{ steps.properties.outputs.version }} + changelog: ${{ steps.properties.outputs.changelog }} steps: # Check out current repository - name: Fetch Sources - uses: actions/checkout@v2 + uses: actions/checkout@v2.4.0 # Validate wrapper - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v1.0.3 + uses: gradle/wrapper-validation-action@v1.0.4 - # Run verifyPlugin and test Gradle tasks - test: - name: Test - needs: gradleValidation - runs-on: ubuntu-latest - steps: - - # Setup Java 1.8 environment for the next steps + # Setup Java 11 environment for the next steps - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: zulu java-version: 11 - - # Check out current repository - - name: Fetch Sources - uses: actions/checkout@v2 - - # Cache Gradle dependencies - - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} - - # Cache Gradle Wrapper - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - # Run detekt, ktlint and tests - - name: Run Linters and Test - run: ./gradlew check - - # Run verifyPlugin Gradle task - - name: Verify Plugin - run: ./gradlew verifyPlugin - - # Build plugin with buildPlugin Gradle task and provide the artifact for the next workflow jobs - # Requires test job to be passed - build: - name: Build - needs: test - runs-on: ubuntu-latest - outputs: - name: ${{ steps.properties.outputs.name }} - version: ${{ steps.properties.outputs.version }} - changelog: ${{ steps.properties.outputs.changelog }} - artifact: ${{ steps.properties.outputs.artifact }} - steps: - - # Setup Java 1.8 environment for the next steps - - name: Setup Java - uses: actions/setup-java@v1 - with: - java-version: 11 - - # Check out current repository - - name: Fetch Sources - uses: actions/checkout@v2 - - # Cache Gradle Dependencies - - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} - - # Cache Gradle Wrapper - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} + cache: gradle # Set environment variables - name: Export Properties @@ -119,128 +61,99 @@ jobs: CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" - ARTIFACT="${NAME}-${VERSION}.zip" - echo "::set-output name=version::$VERSION" echo "::set-output name=name::$NAME" echo "::set-output name=changelog::$CHANGELOG" - echo "::set-output name=artifact::$ARTIFACT" - - # Build artifact using buildPlugin Gradle task - - name: Build Plugin - run: ./gradlew buildPlugin - - # Upload plugin artifact to make it available in the next jobs - - name: Upload artifact - uses: actions/upload-artifact@v1 - with: - name: plugin-artifact - path: ./build/distributions/${{ steps.properties.outputs.artifact }} - - # Verify built plugin using IntelliJ Plugin Verifier tool - # Requires build job to be passed - verify: - name: Verify - needs: build - runs-on: ubuntu-latest - steps: - - # Setup Java 1.8 environment for the next steps - - name: Setup Java - uses: actions/setup-java@v1 - with: - java-version: 11 - - # Check out current repository - - name: Fetch Sources - uses: actions/checkout@v2 - - # Cache Gradle Dependencies - - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} - - # Cache Gradle Wrapper - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - # Set environment variables - - name: Export Properties - id: properties - shell: bash - run: | - PROPERTIES="$(./gradlew properties --console=plain -q)" - IDE_VERSIONS="$(echo "$PROPERTIES" | grep "^pluginVerifierIdeVersions:" | base64)" - - echo "::set-output name=ideVersions::$IDE_VERSIONS" echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier" + ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier + # Run tests + - name: Run Tests + run: ./gradlew test + + # Collect Tests Result of failed tests + - name: Collect Tests Result + if: ${{ failure() }} + uses: actions/upload-artifact@v2 + with: + name: tests-result + path: ${{ github.workspace }}/build/reports/tests # Cache Plugin Verifier IDEs - name: Setup Plugin Verifier IDEs Cache - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 with: path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides - key: ${{ runner.os }}-plugin-verifier-${{ steps.properties.outputs.ideVersions }} + key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }} - # Run IntelliJ Plugin Verifier action using GitHub Action - - name: Verify Plugin + # Run Verify Plugin task and IntelliJ Plugin Verifier tool + - name: Run Plugin Verification tasks run: ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }} + # Collect Plugin Verifier Result + - name: Collect Plugin Verifier Result + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: pluginVerifier-result + path: ${{ github.workspace }}/build/reports/pluginVerifier + + # Run Qodana inspections + - name: Qodana - Code Inspection + uses: JetBrains/qodana-action@v2.1-eap + + # Collect Qodana Result + - name: Collect Qodana Result + uses: actions/upload-artifact@v2 + with: + name: qodana-result + path: ${{ github.workspace }}/qodana + + # Prepare plugin archive content for creating artifact + - name: Prepare Plugin Artifact + id: artifact + shell: bash + run: | + cd ${{ github.workspace }}/build/distributions + FILENAME=`ls *.zip` + unzip "$FILENAME" -d content + echo "::set-output name=filename::$FILENAME" + # Store already-built plugin as an artifact for downloading + - name: Upload artifact + uses: actions/upload-artifact@v2.2.4 + with: + name: ${{ steps.artifact.outputs.filename }} + path: ./build/distributions/content/*/* + # Prepare a draft release for GitHub Releases page for the manual verification # If accepted and published, release workflow would be triggered releaseDraft: name: Release Draft if: github.event_name != 'pull_request' - needs: [build, verify] + needs: build runs-on: ubuntu-latest steps: # Check out current repository - name: Fetch Sources - uses: actions/checkout@v2 + uses: actions/checkout@v2.4.0 # Remove old release drafts by using the curl request for the available releases with draft flag - name: Remove Old Release Drafts env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - curl -H "Authorization: Bearer $GITHUB_TOKEN" https://api.github.com/repos/$GITHUB_REPOSITORY/releases \ - | tr '\r\n' ' ' \ - | jq '.[] | select(.draft == true) | .id' \ - | xargs -I '{}' \ - curl -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" https://api.github.com/repos/$GITHUB_REPOSITORY/releases/{} - + gh api repos/{owner}/{repo}/releases \ + --jq '.[] | select(.draft == true) | .id' \ + | xargs -I '{}' gh api -X DELETE repos/{owner}/{repo}/releases/{} # Create new release draft - which is not publicly visible and requires manual acceptance - name: Create Release Draft - id: createDraft - uses: actions/create-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: v${{ needs.build.outputs.version }} - release_name: v${{ needs.build.outputs.version }} - body: ${{ needs.build.outputs.changelog }} - draft: true - - # Download plugin artifact provided by the previous job - - name: Download Artifact - uses: actions/download-artifact@v2 - with: - name: plugin-artifact - - # Upload artifact as a release asset - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.createDraft.outputs.upload_url }} - asset_path: ./${{ needs.build.outputs.artifact }} - asset_name: ${{ needs.build.outputs.artifact }} - asset_content_type: application/zip + run: | + gh release create v${{ needs.build.outputs.version }} \ + --draft \ + --title "v${{ needs.build.outputs.version }}" \ + --notes "$(cat << 'EOM' + ${{ needs.build.outputs.changelog }} + EOM + )" \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7afcbe..fff3941 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,57 +14,66 @@ jobs: runs-on: ubuntu-latest steps: - # Setup Java 1.8 environment for the next steps - - name: Setup Java - uses: actions/setup-java@v1 - with: - java-version: 11 - # Check out current repository - name: Fetch Sources - uses: actions/checkout@v2 + uses: actions/checkout@v2.4.0 with: ref: ${{ github.event.release.tag_name }} + # Setup Java 11 environment for the next steps + - name: Setup Java + uses: actions/setup-java@v2 + with: + distribution: zulu + java-version: 11 + cache: gradle + + # Set environment variables + - name: Export Properties + id: properties + shell: bash + run: | + CHANGELOG="$(cat << 'EOM' | sed -e 's/^[[:space:]]*$//g' -e '/./,$!d' + ${{ github.event.release.body }} + EOM + )" + + echo "::set-output name=changelog::$CHANGELOG" + # Update Unreleased section with the current release note + - name: Patch Changelog + if: ${{ steps.properties.outputs.changelog != '' }} + run: | + ./gradlew patchChangelog --release-note "$(cat << 'EOM' + ${{ steps.properties.outputs.changelog }} + EOM + )" # Publish the plugin to the Marketplace - name: Publish Plugin env: PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} run: ./gradlew publishPlugin - # Patch changelog, commit and push to the current repository - changelog: - name: Update Changelog - needs: release - runs-on: ubuntu-latest - steps: + # Upload artifact as a release asset + - name: Upload Release Asset + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: gh release upload ${{ github.event.release.tag_name }} ./build/distributions/* - # Setup Java 1.8 environment for the next steps - - name: Setup Java - uses: actions/setup-java@v1 - with: - java-version: 11 - - # Check out current repository - - name: Fetch Sources - uses: actions/checkout@v2 - with: - ref: ${{ github.event.release.tag_name }} - - # Update Unreleased section with the current version - - name: Patch Changelog - run: ./gradlew patchChangelog - - # Commit patched Changelog - - name: Commit files + # Create pull request + - name: Create Pull Request + if: ${{ steps.properties.outputs.changelog != '' }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - git commit -m "Update changelog" -a - - # Push changes - - name: Push changes - uses: ad-m/github-push-action@master - with: - branch: main - github_token: ${{ secrets.GITHUB_TOKEN }} + VERSION="${{ github.event.release.tag_name }}" + BRANCH="changelog-update-$VERSION" + git config user.email "action@github.com" + git config user.name "GitHub Action" + git checkout -b $BRANCH + git commit -am "Changelog update - $VERSION" + git push --set-upstream origin $BRANCH + gh pr create \ + --title "Changelog update - \`$VERSION\`" \ + --body "Current pull request contains patched \`CHANGELOG.md\` file for the \`$VERSION\` version." \ + --base main \ + --head $BRANCH \ No newline at end of file diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml new file mode 100644 index 0000000..1027273 --- /dev/null +++ b/.github/workflows/run-ui-tests.yml @@ -0,0 +1,60 @@ +# GitHub Actions Workflow for launching UI tests on Linux, Windows, and Mac in the following steps: +# - prepare and launch IDE with your plugin and robot-server plugin, which is needed to interact with UI +# - wait for IDE to start +# - run UI tests with separate Gradle task +# +# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ Platform +# +# Workflow is triggered manually. + +name: Run UI Tests +on: + workflow_dispatch + +jobs: + + testUI: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-latest + runIde: | + export DISPLAY=:99.0 + Xvfb -ac :99 -screen 0 1920x1080x16 & + gradle runIdeForUiTests & + - os: windows-latest + runIde: start gradlew.bat runIdeForUiTests + - os: macos-latest + runIde: ./gradlew runIdeForUiTests & + + steps: + + # Check out current repository + - name: Fetch Sources + uses: actions/checkout@v2.4.0 + + # Setup Java 11 environment for the next steps + - name: Setup Java + uses: actions/setup-java@v2 + with: + distribution: zulu + java-version: 11 + cache: gradle + + # Run IDEA prepared for UI testing + - name: Run IDE + run: ${{ matrix.runIde }} + + # Wait for IDEA to be started + - name: Health Check + uses: jtalk/url-health-check-action@v2 + with: + url: http://127.0.0.1:8082 + max-attempts: 15 + retry-delay: 30s + + # Run tests + - name: Tests + run: ./gradlew test \ No newline at end of file diff --git a/.gitignore b/.gitignore index e0d53d8..61032ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .gradle .idea -build +.qodana +build \ No newline at end of file diff --git a/.run/Run IDE for UI Tests.run.xml b/.run/Run IDE for UI Tests.run.xml new file mode 100644 index 0000000..5b76189 --- /dev/null +++ b/.run/Run IDE for UI Tests.run.xml @@ -0,0 +1,22 @@ +<component name="ProjectRunConfigurationManager"> + <configuration default="false" name="Run IDE for UI Tests" type="GradleRunConfiguration" factoryName="Gradle"> + <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" /> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" value="runIdeForUiTests" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list /> + </option> + <option name="vmOptions" /> + </ExternalSystemSettings> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> + <method v="2" /> + </configuration> +</component> \ No newline at end of file diff --git a/.run/Run IDE with Plugin.run.xml b/.run/Run IDE with Plugin.run.xml index d15ff68..f42721a 100644 --- a/.run/Run IDE with Plugin.run.xml +++ b/.run/Run IDE with Plugin.run.xml @@ -1,24 +1,24 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle"> - <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" /> - <ExternalSystemSettings> - <option name="executionName" /> - <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="externalSystemIdString" value="GRADLE" /> - <option name="scriptParameters" value="" /> - <option name="taskDescriptions"> - <list /> - </option> - <option name="taskNames"> - <list> - <option value="runIde" /> - </list> - </option> - <option name="vmOptions" value="" /> - </ExternalSystemSettings> - <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> - <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> - <DebugAllEnabled>false</DebugAllEnabled> - <method v="2" /> - </configuration> + <configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle"> + <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" /> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" value="" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list> + <option value="runIde" /> + </list> + </option> + <option name="vmOptions" value="" /> + </ExternalSystemSettings> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> + <method v="2" /> + </configuration> </component> \ No newline at end of file diff --git a/.run/Run Plugin Tests.run.xml b/.run/Run Plugin Tests.run.xml index 03d0287..5e7d02e 100644 --- a/.run/Run Plugin Tests.run.xml +++ b/.run/Run Plugin Tests.run.xml @@ -1,24 +1,24 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle"> - <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" /> - <ExternalSystemSettings> - <option name="executionName" /> - <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="externalSystemIdString" value="GRADLE" /> - <option name="scriptParameters" value="" /> - <option name="taskDescriptions"> - <list /> - </option> - <option name="taskNames"> - <list> - <option value="check" /> - </list> - </option> - <option name="vmOptions" value="" /> - </ExternalSystemSettings> - <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> - <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> - <DebugAllEnabled>false</DebugAllEnabled> - <method v="2" /> - </configuration> + <configuration default="false" name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle"> + <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" /> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" value="" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list> + <option value="test" /> + </list> + </option> + <option name="vmOptions" value="" /> + </ExternalSystemSettings> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> + <method v="2" /> + </configuration> </component> \ No newline at end of file diff --git a/.run/Run Plugin Verification.run.xml b/.run/Run Plugin Verification.run.xml index 3a8d688..1c1be17 100644 --- a/.run/Run Plugin Verification.run.xml +++ b/.run/Run Plugin Verification.run.xml @@ -1,26 +1,26 @@ <component name="ProjectRunConfigurationManager"> - <configuration default="false" name="Run Verifications" type="GradleRunConfiguration" factoryName="Gradle"> - <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" /> - <ExternalSystemSettings> - <option name="executionName" /> - <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="externalSystemIdString" value="GRADLE" /> - <option name="scriptParameters" value="" /> - <option name="taskDescriptions"> - <list /> - </option> - <option name="taskNames"> - <list> - <option value="runPluginVerifier" /> - </list> - </option> - <option name="vmOptions" value="" /> - </ExternalSystemSettings> - <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> - <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> - <DebugAllEnabled>false</DebugAllEnabled> - <method v="2"> - <option name="Gradle.BeforeRunTask" enabled="true" tasks="clean" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" /> - </method> - </configuration> + <configuration default="false" name="Run Verifications" type="GradleRunConfiguration" factoryName="Gradle"> + <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" /> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" value="" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list> + <option value="runPluginVerifier" /> + </list> + </option> + <option name="vmOptions" value="" /> + </ExternalSystemSettings> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> + <method v="2"> + <option name="Gradle.BeforeRunTask" enabled="true" tasks="clean" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" /> + </method> + </configuration> </component> \ No newline at end of file diff --git a/.run/Run Qodana.run.xml b/.run/Run Qodana.run.xml new file mode 100644 index 0000000..17b041a --- /dev/null +++ b/.run/Run Qodana.run.xml @@ -0,0 +1,26 @@ +<component name="ProjectRunConfigurationManager"> + <configuration default="false" name="Run Qodana" type="GradleRunConfiguration" factoryName="Gradle"> + <ExternalSystemSettings> + <option name="env"> + <map> + <entry key="QODANA_SHOW_REPORT" value="true" /> + </map> + </option> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" value="cleanInspections runInspections" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list /> + </option> + <option name="vmOptions" /> + </ExternalSystemSettings> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> + <method v="2" /> + </configuration> +</component> \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d1c289..d0d2f2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,13 @@ - Sorting of translation keys can now be disabled via configuration - Key section nesting can be disabled via configuration - Numbers will be stored as number type whenever possible +- Code signing of plugin source ### Changed - Better focus keys in tree-view after edit - Optimized internal data structure (io, cache, events) +- Adjusted compatibility matrix to 2020.3 - 2021.3 +- Updated dependencies ## [1.5.1] ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index e817fcc..800cf61 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.changelog.markdownToHTML import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -8,15 +7,13 @@ plugins { // Java support id("java") // Kotlin support - id("org.jetbrains.kotlin.jvm") version "1.5.10" - // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.0" - // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin - id("org.jetbrains.changelog") version "1.1.2" - // detekt linter - read more: https://detekt.github.io/detekt/gradle.html - id("io.gitlab.arturbosch.detekt") version "1.17.1" - // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle - id("org.jlleitschuh.gradle.ktlint") version "10.0.0" + id("org.jetbrains.kotlin.jvm") version "1.5.31" + // Gradle IntelliJ Plugin + id("org.jetbrains.intellij") version "1.2.1" + // Gradle Changelog Plugin + id("org.jetbrains.changelog") version "1.3.1" + // Gradle Qodana Plugin + id("org.jetbrains.qodana") version "0.1.13" } group = properties("pluginGroup") @@ -26,55 +23,45 @@ version = properties("pluginVersion") repositories { mavenCentral() } -dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1") -} -// Configure gradle-intellij-plugin plugin. -// Read more: https://github.com/JetBrains/gradle-intellij-plugin +// Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin intellij { pluginName.set(properties("pluginName")) version.set(properties("platformVersion")) type.set(properties("platformType")) - downloadSources.set(properties("platformDownloadSources").toBoolean()) - updateSinceUntilBuild.set(true) // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty)) } -// Configure gradle-changelog-plugin plugin. -// Read more: https://github.com/JetBrains/gradle-changelog-plugin +// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin changelog { - version = properties("pluginVersion") - groups = emptyList() + version.set(properties("pluginVersion")) + groups.set(emptyList()) } -// Configure detekt plugin. -// Read more: https://detekt.github.io/detekt/kotlindsl.html -detekt { - config = files("./detekt-config.yml") - buildUponDefaultConfig = true - - reports { - html.enabled = false - xml.enabled = false - txt.enabled = false - } +// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin +qodana { + cachePath.set(projectDir.resolve(".qodana").canonicalPath) + reportPath.set(projectDir.resolve("build/reports/inspections").canonicalPath) + saveReport.set(true) + showReport.set(System.getenv("QODANA_SHOW_REPORT")?.toBoolean() ?: false) } tasks { - // Set the compatibility versions to 1.8 - withType<JavaCompile> { - sourceCompatibility = "1.8" - targetCompatibility = "1.8" - } - withType<KotlinCompile> { - kotlinOptions.jvmTarget = "1.8" + // Set the JVM compatibility versions + properties("javaVersion").let { + withType<JavaCompile> { + sourceCompatibility = it + targetCompatibility = it + } + withType<KotlinCompile> { + kotlinOptions.jvmTarget = it + } } - withType<Detekt> { - jvmTarget = "1.8" + wrapper { + gradleVersion = properties("gradleVersion") } patchPluginXml { @@ -84,7 +71,7 @@ tasks { // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest pluginDescription.set( - File(projectDir, "README.md").readText().lines().run { + projectDir.resolve("README.md").readText().lines().run { val start = "<!-- Plugin description -->" val end = "<!-- Plugin description end -->" @@ -96,11 +83,26 @@ tasks { ) // Get the latest available change notes from the changelog file - changeNotes.set(provider { changelog.getLatest().toHTML() }) + changeNotes.set(provider { + changelog.run { + getOrNull(properties("pluginVersion")) ?: getLatest() + }.toHTML() + }) } - runPluginVerifier { - ideVersions.set(properties("pluginVerifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty)) + // Configure UI tests plugin + // Read more: https://github.com/JetBrains/intellij-ui-test-robot + runIdeForUiTests { + systemProperty("robot-server.port", "8082") + systemProperty("ide.mac.message.dialogs.as.sheets", "false") + systemProperty("jb.privacy.policy.text", "<!--999.999-->") + systemProperty("jb.consents.confirmation.enabled", "false") + } + + signPlugin { + certificateChain.set(System.getenv("CERTIFICATE_CHAIN")) + privateKey.set(System.getenv("PRIVATE_KEY")) + password.set(System.getenv("PRIVATE_KEY_PASSWORD")) } publishPlugin { @@ -111,4 +113,4 @@ tasks { // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel channels.set(listOf(properties("pluginVersion").split('-').getOrElse(1) { "default" }.split('.').first())) } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c3bfd2b..5ddf786 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,24 +3,29 @@ pluginGroup = de.marhali.easyi18n pluginName = easy-i18n +# SemVer format -> https://semver.org pluginVersion = 1.6.0 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 202 -pluginUntilBuild = 212.* - -# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl -# See https://jb.gg/intellij-platform-builds-list for available build versions -pluginVerifierIdeVersions = 2020.2.4, 2020.3.4, 2021.2 +pluginSinceBuild = 203 +pluginUntilBuild = 213.* +# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties platformType = IC -platformVersion = 2021.2 -platformDownloadSources = true +platformVersion = 2020.3.4 + # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = org.jetbrains.kotlin +# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3 +javaVersion = 11 + +# Gradle Releases -> https://github.com/gradle/gradle/releases +gradleVersion = 7.3 + # Opt-out flag for bundling Kotlin standard library. -# See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details. +# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details. +# suppress inspection "UnusedProperty" kotlin.stdlib.default.dependency = false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 zcmY&<19zBR)MXm8v2EM7ZQHi-#I|kQZfv7Tn#Q)%81v4zX3d)U4d<S{&&C~|14~>4 zYYc!v@NU%|U;_sM`2z(4BAilWijmR>4U^KdN)D8%@2KLcqkTDW<b;`{sz_0x=?HD$ zfRd}z!dlzv65-&;kfVv!%#n8?Y%uh6t_yvK3%vZ!=sQhW#x&$16>%^3U(Wg>{qkAF z&RcYr;D1I5aD(N-PnqoEeBN~JyXiT(+@b`4Pv`;KmkBXYN48@0;iXuq6!ytn`vGp$ z6X4DQHMx^WlOek^bde&~cvEO@K$oJ}i`T`N;M|lX0mhmEH<Qh2bO23s<c<b?kJSx> zuRpo!rS~#&rg}ajBdma$$}+vEhz?JAFUW|iZEcL%amAg_pzqul-B7Itq6Y_BGmOCC zX*Bw3rFz3R)DXpCVBkI!SoOHt<r_Zw4g3Jlhii6BC+0g(i?Vec^cYS1yA*tD`4TKj zOApa7lBa#WaS!-2<I(+955H!14q3}J>Ystv*e-May|+?b80ZRh$MZ$FerlC`)ZKt} zTd0Arf9N2dimjs>mg5&@sfTP<FMra4imH+_IBlL4Nc_~AL#%VJCxe3)stbd02AEM| z&D0&Tn5H7hbWpsy=sT;pxOd15(iWc{al!mn&C#+i%f3lDS<jx_mG|11KCBpX%ouSo z@?~hUsz{+<!8=d398xo&@l@S~*jz8h-YM#AGsF0WGkRz@$<m!>sRXKXI;0L~&t+GH zkB<>wxI9D+k5VHHcB7Rku{Z>i3$&hgd9Mt_hS_GaGg0#2EHzyV=j=u5xSyV~F0*qs zW{k9}lFZ?H%@4hII_!bzao!S(J^^ZZVmG_;^qXkpJb7OyR*sPL<g~w=Zk9z5S1jDI z71nU2i<Es|#qXTuJIRx-HjX+gJ*LMd1jHM#UfOkw#&q`-<mI*srz-Ay05DEYB_)#v zvk_+YZbpT72OHLyzK&`<6&<^A=1Fr^E7_0s%OXF6r^I$M)pZ_3F4o5d`%I9#uyBlZ zX1C9_iSi<5viI;Yrq>>))Jx{K4xtO2xTr@St!@CJ=y3q2wY5F`77Tqwz8!&Q{f7Dp zifvzV<QA3qQ_icfAX<_Uh_AWeD00fmmOez9t>V1!Dj*dxG%BsQyRP6${X+Tc$+XOG zzvq5xcC#&-iXlp$)L=9t{oD~bT~v^ZxQG;FRz|HcZj|^L#_(<kbHS<d%uD<k^y4GS z_@nGkSrluLeGBfOtQ55e=_#qB)a=_z-;eBz1(Z7to$`|!g;(i3z=gq~yvKKK5sNc# zl$gJ2XIR<<L*cw&uktYWH>VNG)k{=_6|6Bs-tRNCn-XuaZ^*^hpZ@qw<A`W4NXV_{ zECxbg>i`m|BxcF6IWc?_bhtK_cDZRTw#*bZ2`1@1HcB<A>`mLUmo_>@2R&nj7&CiH zF&laHkG~7#U>c}rn#H)q^|sk+lc!?6wg0xy`VPn!{4P=u@cs%-V{VisOxVqAR{XX+ zw}R;{Ux@6A_QPka=48|tph^^ZFjSHS1BV3xfrbY84^=?&gX=bmz(7C({=*oy|BEp+ zYgj;<`j)GzINJA>{HeSHC)<cjl~xrBv-Ad;_(!35VQHb!n{j_(E9gc}-sAqiZ7)~T zGr>bvp6ucoE`c+6#2KzY9)TClmtEB1^^Mk)(mXWYvup02e%Ghm9qyjz#fO3bNGBX} zFiB>dvc1+If!><mtjfI+&uNcAL5R+)16aVAdoC-IdLWfR^loo9quT)qg_~Y<A<|%J z{4}JG)2I+AA+2M<X=n8Tj%Y@|gL;a0cu?_0nya~Ds$JH`tyme!ug%h)y+8F-aj3Vs zM_OOr;e%?DW<F8GdQP&*MHN=uF5OQ@*^d|_+48he#kR1%(q8FHxG~1)pjWd#*S~<- zsO)|Q{2i9C8z1<O>I10;qZk`?6pEd*(?bI&G*3YLt;MWw&!?=Mf7%^Op?qnyXWur- zwX|S^P>jF?{m9c&mmK-epCRg#WB+-VDe!2d2~YVoi%7_q(dyC{(}zB${!ElKB2D}P z7QNFM!*O^?FrPMGZ}wQ0TrQAVqZy!weLhu_Zq&`rlD39r*9&2sJHE(JT0EY5<}~x@ z1>P0!L2IFDqAB!($H9s2fI`&J_c+5QT|b#%99HA3@zUWOuYh(~7q7!Pf_U3u!ij5R zjFzeZta^~RvAmd_TY+RU@e}wQaB_PNZI26zmtzT4iGJg9U(Wrgrl>J%Z3MKHOWV(? zj>~Ph$<~8Q_sI+)$DOP^9FE6WhO09EZJ?1W|KidtEjzBX3RCLUwmj9qH1CM=^}MaK z59kGxRRfH(n|0*lkE?`Rpn6d^u5J6wPfi0WF(rucTv(I;`aW)3;nY=J=igkjsn?ED ztH&ji>}TW8)o!Jg@9Z}=i2-;o4#xUksQHu}XT~yRny|kg-$Pqeq!^78xAz2mYP9+4 z9gwAot<F`HDf<=vVlS~}$IUDtF0klA`^#pB|G?>i2ICvUWxE&RZ~}E)#M8*zy1iwz zHqN%q;u+f6Ti|SzI<FRGwCIa?0!fO9WN;kBsxILjw5}w5BK>Lm0s-)=4)>eb5o-0K zbMW8ecB4p^6OuIX@u`f{>Yn~m9PINEl#+t*jqalwxIx=TeGB9(b6jA}9VOHnE$9sC zH`;epyH!k-3kNk2XWXW!K`L_G!%xOqk0ljPCMjK&VweAxEaZ=<DzSWjCiKD^*;5J$ zl4gOX?qd<vHF|&G>=cT#;!<B?QV)Sxf^HT@cL_2la1`-IR6ZJ;P$+RaV<afLePi-( z`iA)b_c_5yafTWN1f-H8r4X4C7}bXH(p^at7}wcudBoe0*%y<B25sgtkcNi&V-$%G zMSGX5<q?c3;?<OIPu@&cT0xgeo?7m!1=~tj=2jG1wy=Q0Jt$O25951g=k|2gnn%q# z)8}Dz@%7wCsofkVeUfvN<9Fx(obP+xb&~&3;CkI=_&w{&h_XoYrA)m7ECODqf@l4F zr=J~G0aXj%UK8SkUZ>7)X&C|X{dY^IY(e4D#!tx^vV3NZqK~--JW~wtXJ8X19ad<I zm9QB;RzH152H*y3tMn*3EvxkEox&n8T*@N+`8Grw?(i08(CyTVvrdYB<~KAN?m-af z48ifc{b0Ob(DjSYG@#1{T-ASiogxS*?mdh?gD%n`&#ElaJuKw(ZVs>Xim<W6u2t)u z6s_ppklZx{7yd_UKBw+|N=In~2BVl!;x!QFZ9|x}y<?)9OHecoqZy3Ivt=}#Q4OL} zHX1K1MQ2CF*2uHy#a$|F7h=ma*&JbOw43$!kcjqs7DeysG@f1n)sS!+XLYaik%I6Q zipAB_g8OF4y#?ZDYDeW}jgwU3o7%OecZ~=o`u6c&jknOzmB`r7um)wXimA2gUfH7y zwN>?PdN(|@o(OdgH3AiHts~?#QkolO?*=U_buYC&tQ3sc(O5HGHN~=6wB@dgIAVT$ z_O<cn@nUEGUT$oFPywe(&63O<$H?qH$ZdDGyOrByWM-n!VN96r=4Si%R!g1l+UnD` zQey?KU7qiwzmKU}0s?3Fj2Rin=8W1ZMnah!zlFm}iM17m<$e2;<DZ4?9$K``?YR+Q zC}no$*}t0`uIi4yRIN32V9oeLrVI6T6+Jz_>JWJ^&*40Pw&%y^t8-Wn4@l9gOl`uU z{Uda_uk9!Iix?KBu9CYwW9Rs=yt_lE11A+k$+)pkY5pXp<hVQ+lx!L-&x;bs6sTWy z5-jLZ!#e0u)=!m;6eq(oP?P9YA*Tr@kg*nGSid%#)&Itd;r2X&XUd2s?PWTYrzq|2 z53Ns^<9hG_We_Zz8R90$En!t{KH(+#ajodOS-JLijl^nkBeB<yrw*j+6*uuXLyLF9 z{N3t`5+i>ocxIEJe|pTxwFgB%Kpr&tH;PzgOQ&m|<oUQ1dylfIc7Y5Z3j1x;-E4}) zlPALqD3U1psXL!B;q*ehz{Llf;>(#Otm?@H^r`v)9yiR8v&Uy>d#TNdRfyN4Jk;`g zp+jr5@L2A7TS4=G-#O<`A9o;{En5!I8lVUG?!PMsv~{E_yP%QqqTxxG%8%KxZ{uwS zOT+EA5`*moN8wwV`Z=wp<3?~f#frmID^K?t7YL<m6VWFb>`G^(X43g<oal-E1{f_! zMM~2F^%K|Fu~`x<<&sTAc`V5n;Rw6{XkE{;s3-|c+NIU#Skt3b199qOwzF!22Tqf* zE16<4@?5ePsR(z@^xu8!CWvB;_CSM&hm~uwsrVnilwfgKIQSi1c+dzpZ8QColu7eB zT&F_jgPa+roCfk+v!rsEdW#ZFy2((cA!saskfsl5@-js1&&gA?clYAmax@Nf1=?Q4 zy-!%e31-Pm3`OUe=&CWnia;bDEY^Qu5IhxOnKWJv>Wbo!6(q*u%HxWh$$^2EOq`Hj zp=-fS#Av+s9r-M)wGIggQ)b<@-BR`R8l1G@2+KODmn<_$Tzb7k35?e8;!V0G>`(!~ zY~qZz!6*&|TupOcnvsQYPbcMiJ!J{<AUkIQ?T$#YvpqqHZZT}0w>RyfezB^;fceBk znpA1XS)~KcC%0^_;ihibczSxwBuy;^ksH7lwfq7*GU;TLt*WmUEV<B*)702m>Qxt{ zKSfJf;lk$0XO8~4<V91^$-vD;;s6SSgg|GI(=zrZRux(KOs}+`xmO>8Xn2d<xw$ML z-Nox99yuWO;%tc<D!o9)3662vJevDRmH3`X>nh8tMC9WHu`%DZj&a`2!tNB`5%;Md zBs|#T0Ktf?vkWQ)Y+q!At1qgL`C|nbzvgc(+28Q|4N6Geq)Il<kZ3mGp>%+I<Y$q} zk%HyZpWUh@6{prl<|AyV2rx<i=^VB%K0@I+<ln!^usw3Em(Miio93@zcZ%-v{4&N2 zcYE0Tpd>5c@t02{9^=QJ?=h2BTe`~BEu=_u3xX2&?^zwcQWL+)7dI>JK0g8_`W1n~ zMaEP97X>Ok#=G*nkPmY`VoP8_{~+Rp7DtdSyWxI~?TZHxJ&=6KffcO2Qx1?j7=LZA z?GQt`oD9QpXw+s7`t+eeLO$cpQpl9(6h3_l9a6OUpbwBasCeCw^UB6we!&h9Ik<t| zD0oMP!MWpM*U(u`s*F9Hx|}0|3{SpW3>@1zvJ`j4i=tvG9X8o34+N|y(ay~ho$f=l z514~mP>Z>#6+UxM<6@4z*|hFJ?KnkQBs_9{H(-v!_#Vm6Z4<deXWj{kD3-?t{z(at z5F960+Lt}Rd_`N{v%m1^3E9$wcvIbH!uR*j0b^-{f_3#Jis!WwN*J7@HbvqL8Zdjq z$T6F?1c?FFl=g%g8UXxRntAEHa6ofPAW?d>(xV5WgWMd3mB9A(>@XE292#k(HdI7P zJkQ2)`bQXTKlr}{VrhSF5rK9TsjtGs0Rs&nUMcH@$ZX_`Hh$Uje*)(Wd&oLW($hZQ z_tPt`{O@f8hZ<}?aQc6~|9iHt>=!%We3=F9yIfiqhXqp=QUVa!@UY@IF5^dr5H8$R zIh{=%S{$BHG+>~a=vQ={!B9B=<-ID=nyjfA0V8->gN{jRL>Qc4Rc<86;~aY+R!~Vs zV7MI~gVzGIY`B*Tt@rZk#Lg}H8sL39OE31wr_Bm%mn}8n773R&N)8B;l+-eOD@N$l zh&~Wz`m1qavVdxwtZLACS(U{rAa0;}KzPq9r76xL?c{&G<UJ=R?LuB}PDO7HVNF<3 zfCse)dXXnk@duX_x6gxT#znrXeb8;xk?)n8E`2<|0F?)>aG5hX_NK!?)iq`t7q*F# zFoKI{h{*8lb>&sOeHXoAiqm*vV6?C~5U%tXR8^XQ9Y|(XQvcz*>a?%HQ(Vy<2UhNf zVmGeOO#v159KV@1g`m%gJ<w@$Jfr|I+t<O1vhU+3{qM1CnOgkF@lDWIFY2P&R7=ZP z8`(YDAz*YyvmlEiqc#;+fy8?1CW()FxYZFSGN+f<<VQg&@m?XNaI27R(!Y^I-zolX zPCRK)8i0Y7fjRSFQh*v<puB(gBc(MsA|^8jB6IY9u-_<pCipoS@#KuXUh!bv66|sJ z@P<R+ErTIV%VE03mMc&bKh;NS(uYg30Kyk-WT%%e1g)=e#1+)!2MFss5qM=tVqWUJ zq~^bP4dz-ZXl-uw@HZ;Ee0<FPo#JTdn9|^s3;-k4yD8(Rg7Q1B5V}fp8dvCBvO-&& zP<En#@06*@fduhJn_yI@#Nj@hur=#<#27q0QXHv-e#oMi3}5Z28GP}@{CSkcPJVX9 zEhbEH)dxGPDRBmMS)0sW$HHzTu}xfXfFz%}&ac@@z(W!98m-Gh_Aiq9YRq+bsQ@3% z4j>)XGPLa`a|?9HSzSSX{j;)xg>G(Ncc7+C>AyAWYa(k}5B3mtzg4tsA<Sh;28pD1 zIFs~Z><MDBdusACPh#gSuba$Zxq9XQ9zHgTm9jJRWBl;6MmD|7#OCb+r-NVhSxD`l zpz{#9n=TYzv1i>=C^Wfezb1&LlyrBE1~kNfeiubLls{C)!<%#m@f}v^o+7<<peV!m z=VC0_KSpi7FpU+=-~zA*iYIY`A$OK=V*+<-;yaWEHTS+fpQ9nF0e2pd-&@Jw1WOD3 z8GVsYvW1sKoZNTx4OK_oZ>VZ6!FZ;JeiAG@5vw7Li{flC8q1%jD_WP2ApBI{fQ}kN zhvhmdZ0bb5(qK@VS5-)G+@GK(tuF6eJuuV5>)Odgmt?i_`tB69DWpC~e8gqh!>jr_ zL1~<WJ)Q75x^h;pF?{k_oIs!CDg4%}(~+#drio{%*&0bN?<+bgXDB){8A}v4#SS*< zI#7-8DmoH|MGeJJ^ryCu?tbd$K%t}510M-_>L0xw@C<fO#AAX{JzQ=;ULY)<=J5}B z9Z`iyf-Y%TuNp~D5)2(pu9Ft(%eU-|wt$z2&#v?|6IUFZ08w=fc1d*h-vc#mRUp@o zJ>bMSTmQflpRyjif*Y*O-IVQ_OFhUw-zh<q;LT5p+$IR7zEGtb#X(0BaIHkAvMxDl z&9|x2$0;2BOM24Yox5>PrXXW>6X}+73IoMsu2?uuK3lT>;W<df@J_cgG_U&D8b<+U z3qBv6Z5ieNpqShbUSE@10^#D8JvDB<Cxnnc7^ASjodT6b&UsxZ-kMZhrAlLO-#Mi5 zrhImmEN-CGFF$Vg@GnIasHba~Uf74v>#38#qG5tDl66A7Y{mYh=jK8Se!+f=N7%nv zYSHr6a~Nxd`jqov9VgII{%EpC_jFCEc>>SND0;}*Ja8Kv;G)MK7?T~h((c&FEBcQq zvUU1hW2^TX(dDCeU@~a1LF-(+#lz3997A@pipD53&Dr@III2tlw>=!iGabjXzbyUJ z4Hi~M1KCT-5!NR#I%!2Q*A>mqI{dpmUa_mW)%SDs{Iw1LG}0y=wbj@0ba-`q=0!`5 zr(9q1p{#;Rv2CY!L#uTbs(UHVR5+hB@m*zEf4jNu3(Kj$WwW|v?YL*F_0x)GtQC~! zzrnZRmBmwt+i@uXnk05>uR5&1Ddsx1*WwMrIbPD3yU*2By`71pk@gt{|H0D<#B7&8 z2dVmXp*;B)SWY)U1VSNs4ds!yBAj;P=xtatUx^7_gC5tHsF#vvdV;NmKwmNa1GNWZ zi_Jn-B4GnJ%xcYWD5h$*z^haku#_Irh818x^KB)3-;ufjf)D0TE#6>|zFf@~pU;Rs zNw+}c9S+6aPzxkEA6R%s*xhJ37wmgc)-{Zd1&mD5QT}4BQvczWr-Xim>(P^)52`@R z9<jpXM|@nDonMBF{3f<~Ch;-n8pq}dJ3Jn7z+9MKkVKZ6GC|_U4LQ}uqT7Qzdw&FT z5rS%8>+Z}44203T5}`AM_G^Snp<_KKc!OrA(5h7{MT^$ZeDsSr(R@^kI?O;}QF)OU zQ9-`t^ys=6DzgLcWt0U{Q(<zOjFK;@HBO@&MI050VARn}8^41fX2E~H8v7oK7t#cH zT3cr37+EIOoR3$Tf{>F<SaIxIq6Ub`pA9KKWBtPeF7PVo!TPrUGQ;L27vT$GZ|f!6 zJ3t-%EM4F&3lV=3B&-O?3LtyEID6hjqP^*ia)+pq9l7DVnt4FWB~meyMR+>Bs22=r zKD%fLQ^5ZF24c-Z)J{xv?x$&4VhO^mswyb4QTIofCvzq+27*WlYm;h@;Bq%i;{hZA zM97mHI6pP}XFo|^pRTuWQzQs3B-8kY@<y697Pif_+Ask(KR3DV%AUDhMyUIANX3Dk zwg)}aPAa<Qw({y>ajLV!Fb?OYAO3jFv*W-_;AX<NdmAQ7#KC=m{U8w@o~;*9u@fe3 zI-q=kJGTIh6>d;G!CbpZt04iW`Ie^_+cQZGY_Zd@P<*J9EdRsc>c=edf$K|;voXRJ zk*aC@@=MKwR120(%I_HX`3pJ+8GMeO>%30t?~uXT0O-Tu-S{JA;zHoSyXs?Z;fy58 zi>sFtI7hoxNAdOt#3#AWFDW)4EPr4kDYq^`s%JkuO7^efX+u#-qZ56aoRM!tC^P6O zP(cFuBnQGjhX(^LJ(^rVe4-_Vk*3PkBCj!?SsULdmVr0cGJM^=?8b0^DuOFq>0*yA zk1g|C7n%pMS0A8@Aintd$fvRbH?SNdRaFrfoAJ=NoX)G5Gr}3-$^IGF+eI&t{I-GT zp=1fj)2|*ur1Td)+s&w%p#E6tDXX3YYOC{HGHLiCvv?!%%3DO$B$>A}aC;8D0Ef#b z{7NNqC8j+%1n95zq8|hFY`afAB4E)w_&7?oqG0IPJZv)lr{MT}>9p?}Y`=n+^CZ6E zKkjIXPub5!82(B-O2xQojW^P(#Q*;ETpEr^+Wa=qDJ9_k=Wm@fZB6?b(u?LUzX(}+ zE6Oyapd<Pnn%^T*29yI$_#2T8ky75p(qWs)ooqKI2gN`dZpK3Y<kOCF-bmb>G$HC& z&;oa*ALoyIxVvB2cm_N&h&{3ZTuU|aBrJlGOLtZc3<wB41_%hv|2W21e=t+(=n#Nn zm*Oar0&(6b5;<nAAtYiLGCv|A6tP{9nAYT<*AAoG1mp_)ZWYNA(fAdZl+LgUxhajH zBMP2AH!EkqQueuCEuY=Gn~D5i1=u<sj%R7VeIK^r69n!S%t35NNg(Fcnjq#?iuTuC zyyEflYj(Y9WXQU}=QW)&f-zt2L<9i?G8jgUJCxqv39bRXa)Z<AYSLpgy&?>KDx)<{ z27@)~GtQF@%6B@w3emrGe?Cv_{iC@a#YO8~OyGRIvp@%RRKC?fclXMP*6GzB<W-|f z1HB&QMc+Ib?@<fAbwIxv{Jg*T<>FO<w|z4X_0d^ajD|Sz3Z?D`jadD{q(TEoFqiL> z5U4QK?~>AR>?KF@I;|(rx(rKxdT9-k-anYS+#S#e1SzKPslK!Z&r8iomPsWG#>`Ld zJ<#+8GFHE!^wsXt(s=CGfVz5K+FHYP5T0E*?0A-z*lNBf)${Y`>Gwc@?j5{Q|6;Bl zkHG1%r$r&O!N^><8AEL+=y(P$7E6hd=>BZ4ZZ9ukJ2*~HR4KGvUR~MUOe$d>E5UK3 z*~O2LK4AnED}4t1Fs$JgvPa*O+WeCji_cn1@Tv7XQ6l@($F1K%{E$!naeX)`bfCG> z8iD<%_M6aeD?a-(Qqu61&fzQqC(E8ksa%CulMnPvR35d{<`VsmaH<C2uc@|>yzF+B zF6a@1<cQrSK@^T2Jz<j^!(U`lVrtN6^K1{@&|Y%V?lh(s<qUgEfNklI&6tUgpAb*a z_+C-rQUGf}bnsy~!Ygj~JcS);J7o!ttkA^>$CT0xGVjofcct4SyxA40uQ`b#9kI)& z?B67-12X-$v#Im4CVUGZHXvPWwuspJ610ITG*A4xMoRVXJl5xbk;OL(;}=+$9?H`b z>u2~yd~gFZ*V}-Q0K6E@p}mtsri&%Zep?ZrPJmv`Qo1>94Lo||Yl)nqwHXEbe)!g( zo`w|LU@H14VvmBjjkl~=(?b{w^G$~q_G(HL`>|aQR%}A64mv0xGHa`S8!*Wb*eB}` zZh)&rkjLK!Rqar)UH)fM<&h&@v*YyOr!Xk2OOMV%$S2mCRdJxKO1RL7xP_Assw)bb z9$sQ30bapFfYTS`i1PihJZYA#0AWNmp>x(;C!?}kZG7Aq?zp!B+gGyJ^FrXQ0E<>2 zCjqZ(wDs-$#pVYP3NGA=en<@_uz!FjFvn1&w1_Igvqs_sL>ExMbcGx4X5f%`Wrri@ z{&vDs)V!rd=pS<gKlbfhp}ufon^L`I$St3=B`fTo6?X~-5*!da$WSC=wN0h_b|&|p zL8tjMJDRM>?G(ri<ha&~1a}iabvy_b$vscbC%Y*}zodb|0`?CGVC9w*d$a$bIvm)g zxfr>cfwPSg(w<8P_6=Qj`qBC7_XNE}1_5>+GBjpURPmvTNE7)~r)Y>ZZecMS7Ro2` z0}nC_GYo3O7j|Wux?6-LFZs%1IV0H`f`l9or-8y0=5VGzjPqO2cd$RRHJIY06Cnh- ztg@Pn1OeY=W`1Mv3`Ti6!@QIT{qcC*&vptnX4Pt1O|dWv8u2s|(CkV`)vBjAC_U5` zCw1f&c4o;LbBSp0=*q<rKWROphY%8*dT*+-xv<)}6rSe7#pa+C2sRvc#pf}_5pS#> z3Y^horBAnR)u=3t?!}e}14%K>^562K!)Vy6r~v({5{t#iRh8WIL|U9H6H97qX09xp zjb0IJ^9Lqxop<-P*VA0By@In*5dq8Pr3bTPu|ArID*4tWM7w+mjit0PgmwLV4&2PW z3MnIzbdR`3tPqtUICEuAH^MR$K_u8~-U2=N1)R=l>zhygus44>6V^6nJFbW-`^)f} zI&h$FK<SfuVxz$9jz$%JfEvVgm?oA_vk80Mb*vtU&mY6DKMPelC~6k4d~PHleiT=i z9i`)yHZ|VLG@A>)Mo*x?2`0npTD~jRd}5G~-h8=w<geTkn^ei*h^P_#kt4Dk-Ig(P zw7emsMnh4haOAFEvCI*}Q6rgiCIEj<0mLdYm1>L#Y-G+a^C?d>OzsVl7BFAaM==(H zR;ARWa^C3J)`p~_&FRsxt|@e+M&!84`eq)@aO9yBj8iifJv0xVW4F&N-(#E=k`AwJ z3EFXWcpsRlB%l<ouYWjr+SUt7L1F}F&JAqs2YnGI@EauMTs3Lx>_0Vdu`0G(11F7( zsl~*@XP{jS@?M#<a*IJCG;!^-k0mpcYSL3TA`mO-osDqvZe)rvFyj`CZ>ec~%Pr~h z2`M*lIQaolzWN&;hkR2*<=!ORL(>YUMxOzj(60rQfr#wTrkLO!t{h<Ixt`{;>~qg% zv$R}0IqVIg1v|YRu9w7RN&Uh7z$ijV=3U_M(sa`ZF=SIg$uY|=NdC-@%HtkUSEqJv zg|c}mKTCM=Z8Y<XhcneSe|&PEGL?KEjv?$97<=EoEY%e)Y^wY7E2xeqEUPM20hy+h zOBop<mL$3-WOlS|^wIV?j-e=QOSa4yQ;&3&vJ^e`I9~INys-f+JG)*Muyc444Xj{c zOq>msFQu7k{VrXtL^!Cts-eb@*v0B3M#3A7JE*)MeW1cfFqz~^S6OXFOIP&iL;Vpy z4dWKsw_1Wn%Y;eW1YOfeP_r1s4*p1C(iDG_hrr~-I%kA>ErxnMWRYu{IcG{sAW;*t z9T|i4bI*g)FXPpKM@~!@a7LDVVGqF}C@mePD$ai|I>73B+9!Ks7W$pw;$W1B%-rb; zJ*-q&ljb=&41dJ^*A0)7>Wa@khGZ;q1fL(2qW=|38j43mTl_;`PEEw07VKY%71l6p z@F|jp88XEnm1p~<5c*cVXvKlj0{THF=n3sU7g>Ki&(ErR;!KSmfH=?49R5(|c_*xw z4$jhCJ1gWT6-g5EV)Ahg?Nw=}`iCyQ6@0DqUb%AZEM^C#?B-@Hmw?LhJ^^VU>&phJ zlB!n5&>I>@sndh~v$2I2Ue23F?0!0}+9H~jg7E`?CS_ERu75^jSwm%!FTAegT`6s7 z^$|%sj2?8wtPQR>@D3sA0-<U}>M-g-vL@47YCnxdvd|1mPymvk!j5W1jHnVB<xFe8 zIcRoD<goMv8Qu{5p3F6>&F-0R5e-vs`@u8a5GKdv`LF7uCfKncI4+??Z4iG@AxuX7 z6+@nP^TZ5HX#<H$*7$uZ^GJ)1l2_$4(ITNpbx11}-7Un19g4X?I6t&yby7^z8u_JG z`AC$r&O%j3{*}u^#Roz?ZomEGRIFtrtzs00Z+Nf!0r=n1VG8UzPD-gMYD*Z0J`6&L zrB#|AC<q8P<bMa={~UKhf1y&~g@^z<xK%_nv}iSIi1qs-80FZc5i6BP&}HzO@{J-o zI{J0{72ps7Gh2!++v_Y$aLUWV<6RoTK080Fh4;pFyM?s}`1*Q*Fv3rOA4$qE<`y;< z4~JsWUr|mx$PNNub+==}Qcuv-yK4?0!BQC|{mR!>*z(!y+-KJ3+Ku0M90BTY{SC^{ z&y2#RZPjfX_PE<<>XwGp;g4&wcXsQ0T&XTi(^f+}4qSFH1%^GYi+!rJo~t#ChTeAX zmR0w(iODzQOL+b&{1OqTh*psAb;wT*drr^LKdN?c?HJ*gJl+%kEH&48&S{s28P=%p z7*?(xFW_RYxJxxILS!kdLIJYu@p#mnQ(?moGD1)AxQd66X6b*KN?o&e`u9#N4wu8% z^Gw#G!@|>c740RXziOR=tdbkqf(v~wS_N^CS^1hN-N4{Dww1lvSWcBTX*&9}Cz|s@ z*{O@jZ4RVHq19(HC9xSBZI0M)E;daza+Q*zayrX~N5H4xJ33BD4gn5Ka^Hj{995z4 zzm#Eo?ntC$q1a?)dD$qaC_M{NW!5R!vVZ(XQqS67xR3KP?rA1^+s3M$60WRTVHeTH z6BJO$_jVx0<q=4oQ4^4&LjvZ?IFywiS^=+kIsr#`i;VVi*)oB%BBriVjqoaV2E?pE z@XMJ$e#;GIWlvg=J_03_gz4T2CA}FlK-d#*_Y;iHV=RMMPp?H!FNNqW-KS|}te|O% zX=X|Fk9k;c=4O1}iwo|p(I{gB7b!nXILr~V^6wx73`=LnKrWu#mjK^!-u;_MJqiVy zI}_iQp3zGd=f-(%^bDpdj{*U0@S?aksQ)+FMid4y$fG+bLIVL2r3V2a`af?IA!S_z z4w$_CLqZInLy9sX^Cv^7Ng5gjJ_scpQs*DJx3q-C!z^yfg19bvM*HgOQnbEZU0QoF zdK$RAc-@Ll$Et(J%3uFw2SZF<oj1YfSviVH(Se<D#?ANbUnlv#>EGPXy}XK_&x597 zt(o6ArN8vZX0?~(lFGHRtHP{gO0y^$iU6Xt2e&v&ugLxfsl;GD)nf~3R^ACqSFLQ< zV7`cXgry((wDMJB55a6<Cvg5*V@E&gp_hK?RXM9Cmb<zqULQcPsE{hc9a$%h#e|?8 zp9vcb$%gzMm_BsxVxuk9=8liQs|H!K>D4J;13$z6pupC{-F+wpToW%k1qKjUS^$Mo zN3@}T!ZdpiV7<a`6mgu8))0n;&aR0X#=P(j$>rkNvqP3KbpEn|9aB;@V;gMS1iSb@ zwyD7!5mfj)q+4jE1dq3H`sEKgrVqk|y8{_vmn8bMOi873!rmnu5S=1=-DFx+Oj)Hi zx?~ToiJqOrvSou?RVALltvMADodC7BOg7pOyc4m&6yd(qIuV5?dYUpYzpTe!BuWKi zpTg(JHBYzO&X1e{5o|ZVU-X5e?<}mh=|eMY{ldm>V3NsOGwyxO2h)l#)rH@BI*TN; z`yW<tZkAtgD1K4rH^*7E7L8y2DKR)GUqND5p=KRL(^>26bMSp=k6C4Ja{xB}s`dNp zE+41IwEwo>7*PA|7v-F#jLN>h#a`Er9_86!fwPl{6yWR|fh?c%qc44uP~Ocm2V*(* zICMpS*&aJjxutxKC0Tm8+FBz;3;R^=ajXQUB*nTN*Lb;mruQ<L?J}Py63aFL_JrF3 zuKjS?Xwj{ufizn|oPl*svKX+?myF1gv1i#2Pp%t_6Frc|49o-M$q1U(SoF1?czk~K zQB+{`_(7#~5HDJ@$p0t9X4Bnjw_4k=Gtm&qcw$d~4o6S;S}fQ;i|ux0)${W9g+C7d zoMy9g)h9D&t#es1s#qQ_(oec>HUE<&=I7pZ@F-O*VMkJbI#FOrBM8`QEL5Uy=q5e2 z_BwVH%c0^uIWO0*_qD;0jlPoA@sI7BPwOr-mrp7y`|EF)j;$GYdOtEPFRAKyUuUZS z(N4)*6R*ux8s@pMdC*TP?Hx`Zh{{Ser;clg&}CXriXZCr2A!wIoh;j=_eq3_%n7V} za?{KhXg2cXPpKHc90t6=`>s@QF-DNcTJRvLTS)E2FTb+og(wTV7?$kI?QZYgVBn)& zdpJf@tZ{j>B;<<gei3eS+J#ghUE;%Jmd7Pk8%UGHJG8~c^XJ5t4rPt~H~LSUt)e@q z%yI(@ouv9NKR5?@vcOt632S~0Yt3FWCmv2gPT|mGKc-q%RRCXu?Cj;w26j{76<LJf zaS8h@vUzynu#YGS<gh$GHq+;%-9o4&y&kK|Wm^q<pRv}g+zU;U%KoOgxhXnt*?y!Q z{V^AU0u#?=E3�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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..e750102 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..744e882 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/qodana.yml b/qodana.yml new file mode 100644 index 0000000..8b73731 --- /dev/null +++ b/qodana.yml @@ -0,0 +1,6 @@ +# Qodana configuration: +# https://www.jetbrains.com/help/qodana/qodana-yaml.html + +version: 1.0 +profile: + name: qodana.recommended \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 1ad856a..9d1fd69 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,3 +1,4 @@ +<!-- Plugin Configuration File. Read more: https://plugins.jetbrains.com/docs/intellij/plugin-configuration-file.html --> <idea-plugin url="https://github.com/marhali/easy-i18n"> <id>de.marhali.easyi18n</id> <name>Easy I18n</name> From 432a9efdef04bacc2fd04753e19923a756fb8e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Thu, 11 Nov 2021 16:38:42 +0100 Subject: [PATCH 48/49] remove detect config --- detekt-config.yml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 detekt-config.yml diff --git a/detekt-config.yml b/detekt-config.yml deleted file mode 100644 index f9b8d75..0000000 --- a/detekt-config.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Default detekt configuration: -# https://github.com/detekt/detekt/blob/master/detekt-core/src/main/resources/default-detekt-config.yml - -formatting: - Indentation: - continuationIndentSize: 8 - ParameterListWrapping: - indentSize: 8 From 351fce1667f54ce90fb0c810128a555b14ccace5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= <me@marhali.de> Date: Thu, 11 Nov 2021 17:30:15 +0100 Subject: [PATCH 49/49] replace screenshots and optimize README --- CHANGELOG.md | 2 +- README.md | 45 +++++++++++++++++++----------- example/images/Completion.PNG | Bin 46959 -> 0 bytes example/images/TableView.PNG | Bin 9194 -> 0 bytes example/images/TreeView.PNG | Bin 9385 -> 0 bytes example/images/key-annotation.PNG | Bin 0 -> 12519 bytes example/images/key-completion.PNG | Bin 0 -> 20051 bytes example/images/key-edit.PNG | Bin 0 -> 5315 bytes example/images/settings.PNG | Bin 0 -> 10771 bytes example/images/table-view.PNG | Bin 0 -> 20493 bytes example/images/tree-view.PNG | Bin 0 -> 11490 bytes 11 files changed, 29 insertions(+), 18 deletions(-) delete mode 100644 example/images/Completion.PNG delete mode 100644 example/images/TableView.PNG delete mode 100644 example/images/TreeView.PNG create mode 100644 example/images/key-annotation.PNG create mode 100644 example/images/key-completion.PNG create mode 100644 example/images/key-edit.PNG create mode 100644 example/images/settings.PNG create mode 100644 example/images/table-view.PNG create mode 100644 example/images/tree-view.PNG diff --git a/CHANGELOG.md b/CHANGELOG.md index d0d2f2a..059334c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ - Better focus keys in tree-view after edit - Optimized internal data structure (io, cache, events) - Adjusted compatibility matrix to 2020.3 - 2021.3 -- Updated dependencies +- Updated dependencies and improved README file ## [1.5.1] ### Fixed diff --git a/README.md b/README.md index 5dd8911..d4676bb 100644 --- a/README.md +++ b/README.md @@ -6,29 +6,40 @@ [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/marhalide) <!-- Plugin description --> -This is an easy plugin to manage internationalization for JSON or Resource-Bundle(Properties) based locale files. -Most common use case is for translating Webapps or simple Java Applications. Translating large scale projects was never that easy with your favourite IDE! +This is a plugin for easier management of translation files of projects that need to be translated into different languages. Translating large projects has never been so easy with your favorite IDE! ## Use Cases -- Webapps: For example [Vue](https://vuejs.org/) with [vue-i18n](https://kazupon.github.io/vue-i18n/) or any other JSON translation file based technology -- Java based Resource-Bundle +- Webapps: [Vue](https://vuejs.org/) with [vue-i18n](https://kazupon.github.io/vue-i18n/), [React](https://reactjs.org/) or any other json based technology +- Java projects based on Resource-Bundle's +- Projects that uses yaml, json or properties as locale file base for internationalization ## Features -- UI Tool Window with Table- and Tree-View representation +- UI Tool Window which supports tree- or table-view - Easily Add / Edit / Delete translations -- Filter / Search function to hide irrelevant keys -- Key completion and annotation inside editor -- Configurable locales directory & preferred locale for ui presentation -- Supports modularized (splitted) json files -- Translation keys with missing definition for any locale will be displayed red -- Quick edit any translation by right-click (IntelliJ Popup Action) -- Quick delete any translation via <kbd>DEL</kbd>-Key +- Filter function with full-text-search support +- Editor Assistance: Key completion, annotation and referencing +- Key sorting and nesting can be configured +- Configurable locales directory & preferred locale for ui presentation +- Missing language translations will be indicated red +- Quick actions: <kbd>right-click</kbd> or <kbd>DEL</kbd> to edit or delete a translation +- Automatically reloads translation data if any locale file was changed <!-- Plugin description end --> ## Screenshots -![Tree View](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/TreeView.PNG "Tree View") -![Table View](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/TableView.PNG "Table View") -![Key Completion](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/Completion.PNG "Key Completion") +![Tree View](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/tree-view.PNG) +![TableView](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/table-view.PNG) +![KeyCompletion](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/key-completion.PNG) +![KeyAnnotation](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/key-annotation.PNG) +![KeyEdit](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/key-edit.PNG) +![Settings](https://raw.githubusercontent.com/marhali/easy-i18n/main/example/images/settings.PNG) + +## Supported IO Strategies (locale files) +- Json: <kbd>json</kbd> files inside locales directory +- Namespaced Json: Multiple <kbd>json</kbd> files per locale directory +- Yaml: <kbd>yml</kbd> or <kbd>yaml</kbd> files inside locales directory +- Properties: <kbd>properties</kbd> files inside locales directory + +If there are any files in the locales folder that should not be processed, they can be ignored with the <kbd>Translation file pattern</kbd> option. ## Installation - Using IDE built-in plugin system: @@ -45,8 +56,8 @@ Most common use case is for translating Webapps or simple Java Applications. Tra - Install plugin. See **Installation** section - Create a directory which will hold the locale files - Create a file for each required locale (e.g de.json, en.json) Note: Each json file must at least define an empty section (e.g. **{}**) -- Click on the **Settings** Action inside the Easy I18n Tool Window -- Select the created directory (optional: define the preferred locale to view) and press Ok +- Click on the **Settings** Action inside the EasyI18n Tool Window +- Select the created directory (optional: define the preferred locale to view) and press **Ok** - Translations can now be created / edited or deleted Examples for the configuration can be found in the [/example](https://github.com/marhali/easy-i18n/tree/main/example) folder. diff --git a/example/images/Completion.PNG b/example/images/Completion.PNG deleted file mode 100644 index 239fd68f33a413ddb37b369cf0b988e409e9fc45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46959 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 diff --git a/example/images/TableView.PNG b/example/images/TableView.PNG deleted file mode 100644 index 878dfce28d6d71f613e39e16090748c063daf13b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9194 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 MaI!-jzjph70XAu5rT_o{ diff --git a/example/images/TreeView.PNG b/example/images/TreeView.PNG deleted file mode 100644 index f0a72475ff5d78daaabde747ce18c1575fcf93d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9385 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 Y5YKMeTMiK{!LI<-dzwnc3Qu1B2hRaD@&Et; diff --git a/example/images/key-annotation.PNG b/example/images/key-annotation.PNG new file mode 100644 index 0000000000000000000000000000000000000000..df0ca9aeef6345d27e0e7cf85cd71a458c969435 GIT binary patch literal 12519 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 KRVtKTzyDuxE)(+r literal 0 HcmV?d00001 diff --git a/example/images/key-completion.PNG b/example/images/key-completion.PNG new file mode 100644 index 0000000000000000000000000000000000000000..3b1bd01441edcf9b3c5c5bce69c582b77b8d9b85 GIT binary patch literal 20051 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 H3D5c$gH&{v literal 0 HcmV?d00001 diff --git a/example/images/key-edit.PNG b/example/images/key-edit.PNG new file mode 100644 index 0000000000000000000000000000000000000000..d6ab6ef8e8f8b4cf8de6e2e690bdc43574cf2f22 GIT binary patch literal 5315 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 literal 0 HcmV?d00001 diff --git a/example/images/settings.PNG b/example/images/settings.PNG new file mode 100644 index 0000000000000000000000000000000000000000..29cf385abb7b920f404085747f14fc18ccd29840 GIT binary patch literal 10771 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%0DyK$?#K~FU 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 literal 0 HcmV?d00001 diff --git a/example/images/table-view.PNG b/example/images/table-view.PNG new file mode 100644 index 0000000000000000000000000000000000000000..fc02213d5435bab00e92217b41b151270d1db6d4 GIT binary patch literal 20493 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 literal 0 HcmV?d00001 diff --git a/example/images/tree-view.PNG b/example/images/tree-view.PNG new file mode 100644 index 0000000000000000000000000000000000000000..7bf34da963eb1e9ca2d605441fd992c326aa1367 GIT binary patch literal 11490 zcma)iXFwBOyX~M+B1o}<V!)^<HmXtuBq&&D3P>j)y@VcmGg4IAiy%ReCcYpoASHAV zP>~Ko2qXj$j6gy{4J`ytc)$C-=iYPAIp6nVo@A1lJ$q*Fz1DixGcWaYG<mpAa{&Or zbN}9*#{j_5!rrvO2id>)cMLsbe{gs|)`S6=-ZOLT9gu^Xwi*C@O5onMKEU2T<Z;i$ z8vuCQ_BM`o_m8#!aLw=j9W?`gOB#ulbU`y@#*?Kc2%l}Q9TW^UEvbYJOXk`oWbkkr z6Q0?9>HVtgKWybI@H1NfJJ<6(b!(kyJ>%*&Pg$5pGeaXAyz+dPyDjW7exkdx(A_RX zrhdz_PHEzme`H;GdAV@jCDo+SM#H{a%=wBF03aIpdjcL-vJc3<6LA*EHvTt)J(zBx zR4V>$nld+-9~V=RYuR{rleJw_=U0LVT9|Lgjfio#Fa6@2aO}j>#+f9S@?x9UzSFW} zNdMgif>LOGp!7}vW6^&TANJP1QFh0{J<G_=qKq4V_%p66Vv?eC1cC~}H$76`9`*n6 zl2vmocFTAeX+C(3DG!?|>H3fa|0*I}B)dxZMd5L>L1RvZ7gb0>Q?Gc3;dbX~l#iC< z5%F%L`1S<zsmTRPG(zhCK2pXTOmQk*MEeVVja*)*XVut2p3o)yPS}Umhqj+UZ(>=W zW|2KoJK3s+&NP>|Q`BQA663o8GH<9#PGQ=ss~AIJ47|oNFnN%O{?xeB_PJOjF7?Uf z@#eA#8DwL{T5wv{M7a0(pDqU{DTlYT^!%nsicQmHd3jUPE}$9WEEbVcpi@lr>{xXo zEp_a`I4_stg;6vIgGNTubRx3AD<EX`d6rzMKE$WoLIIA1WNPg=mJuwXHw5*m+tiM} z(jA4(EYICr`ZL!`{m5w?HHtC`pg-Fj+dk19DS!NcM7!tmiUuGeUSpE3cq57s>J9=T zHVq9A2G>f|>uaAR@yZ#FyH593KsLW29Ec^Q1C1SyLvff`>~PDLLh8b)+)PHr^`C#W z8=1YJ2P<PJac^>)D!yG52-t{GWT2}ibX7pph&K4*l2l%Nz==GX89cw&_oY|0xOrcm z481zTwR+P;iy{lz{E$hRMY0S#Ex1{kb8vMNG*=6$$)3F~T%lqd27dfa-gEeY95O{q zF(syMdXO;|Se@m@c>+Bb(pesR@&ju_PzeIB>?tR&k;H}IKXsEie<r-pnWe6Dx-MXt zzZ9d9<-tp#O2``VMwdkYzArQH+ni?=Vk~O*u94jbQonR;#}rNe#3eU33v1k1Q9o27 z8FFHU*%6%$hGe*?YDE^ri(58P_<ig!`tGIH4qSa=?)ba3FU(G?5T1&y;$^uc`S%Sm zes$gXX<pp7I<_1SmjR6054YI;fExpVRZ{T{5D7kf^-LlMQ1;?YgjMQ3?g>yO1pqv7 zPgEdWz~{VkAP(T`U*U=($bCB@>@Et~2w36yQIaNjZos!krcZ_GYIvn+CECG40vNe@ zH=4Z=UHi79RkxlV0B*kos{yw^{g0s>>OcL)s7S!F&Ki^CW#V2U<m|rNLwOo(qTH}~ zz&k{;QWyX#zDG^gs|J^DO|~Tjs)=<y7N;UNi`i{{HtdYD0xLlxo{Tp9wVSr}Hk-Hc zd2YHl=VaqRP2kpQfsAnDT&GXX%~D+vBi(OJ^d!ydIz}wA0LuZS+V>0C!1zO#=SpX| zZucB+`pu|04OhX$uU+br6J0z?)zQTH-zubQTjmpn$pBz{Ff#j($slHi-wf~VLm2zY zl*27<;T_<Gsmf+dwQD7W003w0Jiy|u36$;c2>0D5jKy-1U{-cg;GnuB4m++204a=! zY%Tc3d<6#8lc`{JX-pcL>S(qg0svisurgs>?ObQqBV^*KLzc1P=>^)S4s6k6{yxGK z=J7&)mfew?Fn&Pq+FmG*JH$rk;W&N}a6IN;1cN6b`{^$24!F&Z#9FsgYikLG^)n7Q znt*_6C~0^+#;=h1(0Tm|<lQ@?^@N$QlNZBD>R`-E?$;GcxGEOzKu000-?TYyZOz@F zy3d#T4!9P@Z+`650Zia=7+9y;&%gY~fP6Tu+z|RvB>lK>)zFytszIJKt8P&X2Gz~y zW3=bWMOPv98$*Xwsw}Ii`8sVo!VU{T&T+T5k530MCR?6Uwzoehdh}@*KcCt7@+OA= z9cCp{`gQE{E<$v2SEZFBoD+o!+uhI^OmUO*i>;My4K!-ENLUl33m5wGG1d_E9X7HA zFY-%oKk`-K#Qh_}#1p7xz~Y20raKbnPkD~4=a|{A7j4?CLvm|WtzPI=4`t~u*pUWu zyE^L3!4Eh~6{qBjFLGRhG)btsD+UMzL(e)KZW&TpX7r`=duG8;BO(KTOW6~^Ojqnn z4IAxxhQb!V43>5#hVS!OK&>5;9%{j?0Q9glu9m=6+^NKZNiI9-Ef?YMN{31%UvsOG ziA&E;Vm*;T&=D-r<Ps5|BUCy_JK)(~q<Q&S1gvx=J|%yEq0jVST+HcDp4+-&tAr4> zOlN9ULc7%DWg(VNEKad*p06L05_*=R?583C%626?prn^y>&4_t+F1yaYmryxgKN1y zUFB2DUFikIV$koYGy7Z7)Y~3p7p|7u8n2G(Wz6;GS*Uh;Q@z@6k<TD&&1TkYO84t! zmav}2f^uTPAwX4bo6cg#@jNMQ#bCu7M^FrvXx(UEO_8Sa!jf_MDWv1?xdb2PhdPTC zLPSoIw%YR4S=1qweC=rG$C~j{u0$;}%H%`g3cd$S#kDSy;%I0m5~LSj!qh6uAPi;o zSv(Oquc~<X{2e2B$fjMeLZLV%F&jSfT+4lsPf-apZS!{RtKbnuX4$;bif^YI!DqG@ zI-AlHvN7q=<!}jS0qJ$_^rQ&bw8}1dz2`9zm{nXtqv)9%138X)Fz@zxtV`dg(QoqW zWeba^0j%!@!7o33PCOngGJScTU*t|(p76A!MWp{7ULa!f=yw6n*2<zP6_3H^2jXDA zVy+Krl(s0s`XPL|w*fAwJg0KcmDZtR!|Drxgdf^!y^9Buk!+>$1*^ga$5a6*7!W)8 zFM{L92c`Piusaxd7fH8R=+1s1ide`$M%;bOAmSGcL{wFo7I&lE>Ydg%v?9;0w}8UG z9zi8;IPn=>KY?<C=-vUsBVDz@Tl_(dh2#Eh^$bz?&NjMeB6=C`Zs@M9;St2d7bPrI zB6rE(x_)D&Tzvi%={TmkHna9A)b$TO9RaOx_oVB!&$zvuq~fl!#}z2kGE+V}f4w=l zXp7Z?T;G+Sjfw?@e6N%Xp-1*!n7mLE9KgJ@Z*TrrKvPF9jwhJvG`dlFn(yBPvR&%c z^%C~s#3Yg*p3TEneaU&R`RrLlDnx@;E?V8wk7NY~i-Uofk!Sp?`q`cqON{4A;(}q! za?tk%=!l3D8TJrA=tVqi;efZf00veF&*u8+FC;Fi&F0<XjI{EzC9CJ{>K>VwEPU=v za6k>qGQ2nF!o$=t11IBr>RrU*+q1wm+aj1=1F|S{r?N@#Se`mrrlqV{<JA&2WrLWr zlssEG*B=1uzpjgQS@-;b%_quYe-d*5$>tL77DHmnz=<r*eV?bmYHb%uQWx*i1>3~< zfs^XseZZ@`|7NH{LTmgK3o}(hOyeX(jG{}GF`2OvMbUETFlw3M*v)Sf%nGJsp2y&P z5&uMt&*|ESaVl$Pn_4!?y90w;C#c9z#Ey;t4CNi*no`2m(#Vo4idm|ulg}u9zCzUH z>oFv$`ef>ay!ox1iOgvKgH=3bTqAK+FaG-BmQBr2_3DJI3!kn<OuAyOfDY)+0-a?y zp@JIEq)%MQyj5q2-qhnRmC!)%(O1*vm{DOg8o^p`LJ~$pZw1PH%GwdTt*SHE5c&c! zxG7wnaGR?|Vb$|NQ@83v$*Ph})Zq-T!CvbibLo;RKS@d_bKTr6LT(KQJP0VRwrC7q z|5ZFH9yB(5v#3;E488Jl{aE!J-pp=I;pOkQac^y$utZe;OTf7MNdkxomG}KQJDd?8 zs3zd<zLa4j1T^X(k3Rlk62)6HH!0cxyKS$oha_a&euF24tXDJI2j=U?qvv(~rZQ|^ zQtR~kX{+#PSsyXS#yW;d@fIt@7Gq-JhDg7XKs9E%pi2GdYo97<BdXj$y-hnzucZDm zJk3dcfG~d4FLdc%Yb5&S)QgnswTeFuJtQs(*uiRv?)m$57tAEgn8`;BZ~b_X;V`0+ zjtw)Co%W1o`DxgAvT6zQ2j3#;zneD9`Ndj$qpUnuXMbpib)ubq^R?`}urj^m+=2T9 z(_1j}>txGPG?ThrnF~R&Rw}hfyYJesw<f#MH=?jk8H0=b$z*H%{?BWKP5$FYBbFRq zcxIdx=Gf>hQ^ldFcSQT6LNAV_Jd76Ffmat0mLP$oQ2U9c@~{#W@A-)Pb(T7AVQvAv z)4Z($Nvm4{gw@jNx&EEncH&KBToyE(R9-)r!)U(b14o@oC=5b6_`3gUK9jWdH1<U^ zgrd}U8UDFH!(A3suOC0r6f&t{Zyi>?kXKQviEzteBPi*B25R}wH)VYnk5AEJSCW@U zR#|<aV_rRJtTZU1`Z6s-qB~Vp0I6fmg;V+MXc8Lra)q-@33~;Ew?k`ic+SMnO^pIT zeGI>r$N6%I;30lgMN*<@?(OWu5tH%fK^$lQElt9fEmwt5a+U#Afj>o=QJrjUSAzTm zmBSnatVre14LaXMk;=wmt|fnGd2&~vMW(ba_~<(z+_3AP%I^jnimi@mv$XW0$6E$^ z-tO1C@ywT!wI-e*O}Vwy7|IpwKR+OsrIazW-nI2f^QY9ky2C(t0MFJ_EpV%@3X9Rr zAr=gdFIpl`Q|@IRn}PKuEKeQDy2a^1*za*lbRUpntq0~h)KonY;P)Fi{=~84BYo-y z=&4dGckV5hboz5IwgUV7^kDSlxxm~;mKm<?Ap}KBnn)sk3=9ooYqYY|n^BWBn`g>| z97#wL!T_wJ@od<qaQq+;Zc>cA;4f9@nkQp-e55!b@6NPD>&Dz8)j*#vbS?#z$i6c* zmpy?ed*ojb%>U0p!%w2E=o*A2o*D-vZKGIGRY4lxL!JE95V$z0)>qxU#-QwMnjo2X zskh<_>t7<DRR-<)uW6cd+@50(vUkgH5ar80XwCXm24!b7gJQbspKsT3z^uXT9+*y> z_~@2JrUJkgSnYZ2J|l&4Q(y3_#<rwC6U;fR@CY_j=}}eOE`vzxmP*<f7uX|ZjFaoF zFLGrXhHke0^nB^QKHb9o>u0_wzKhpQbL!!LC;o@@`3{5r5XRQeU%RyAf(X-6jOR7& zO)kw+pezO(c;O@3!PHNYqWnc}F(<cGlsD)8=ldg@%PaP)WRwKx*E^_KmrO}f!k;C0 zVL8C6P8uc|=;$tZoq~NXueJL9suC<F#oLQ$j~9*qil6pY15ypupsAVraKW=**ra4l zZhe5SuzfCGE$(>@p{#)dBx6u{>g^qu^{xv)+Vq&)Jr?0=T;iiRv@^pWd=U&(u=)G= zx&{Mn7Aw*GYxt}F`+_;WBVkH6GNazfLh9~;JH0m6BL<rU2jB9(2^lWs0NPwFz?e2{ zT;awoe&Dw{_+s%?yj0P-^O_pZ07<3475!hb{(ld}RS}bMMwTU({sm!!4p4IWxM{W1 z6f<!jfF+v37D*yaMj?woH5<<++g(O8>Vk2<d1Tn_`*xYaBqK6-VMXkor~%=|L<f}O zDsQ}7?}>12u=44f33q<<frk<vp2qVHkciEO$_=g}IjiH<I+qZuA_cYxA+&11YAQb{ z98x|k@h#%)_OC&B-<j~%=*b!$%wQr{JzY$D`2OuW#es_bK}db#Ftc8sLDozVzr<t% zf|XJ6O;99gg1FG2<PE$s_y5Y*!;{;fH-1X$8|@diG1wdu`N+Bw0$A0TD1!u~ltDzN z?$p?+3uCqh4$)R&W_!0lq(@{2kswQ7FMx?oy)_v-*qnEBdccUb(lL~qLfWv8ep)^a z?YJsnNspsQv_$j?#33wd37Hb#fX{BDh3pK;>Mi@;|Cf~Xzx}u6P}qbXGc$XMb^kwC zleJ0^Qxiv8si3UIY-V-*l|a1=R42&GE0oej`gXoc0L0wy{M`qLmFYfxt;kjfze1On z?MiRl98<qOCXxv;c%ISq@truz+UR^cr&SO?N`LtJQIs^7?S(|_98_$LS68rOzfy4x z|7y-jWw!#}x`jsHG;@5!`@mnXLvQGJpT4^>SGz)KdCrO3+`NyJ9L3JXCg_^if?MVk zt!ysL5!Yxh>Z2K-3f7d!)*{igK$A;Q2!&FHjh88=Ryv&Vc4ls*PHZgy{1E4>0Md4z zsN3FI%CHRIw4q=H;#Z3BOr~=$G~%gSbL{VD8DH;7nr1qY=EOGn;S(K&y*KDSmpCr9 z98p}j2)eKV^Y{Sk7tDz8t$Q}Rj-StUdx%B%HXXxi8;`c1TAS|lYJWE}j+06-!D%DR z79`%KGv68FxV>mSl{y&}aQx00j`@=?Nz-0TjBtaHMob;;Ed3Va-g%{SFH^4PT!-j1 z6%$Rm1e7kw=h4(9^5bPH6&BWhOSQ9Sj$zp0FGNw|VEY?0w1NXWBk~o33SQUcYgs-1 z@wd{bJcxPzmHA9D)uh!Yk6SU9wW(ef_Kt9l=ohcxb_p5xA(#wx6saghHwyz;fxR=~ zaymNCoR`3@etE3YF$X1wx3G810R|h(+K#GPrzr8t)d~IzmB&Q#v9oI=n|R`Vi(Et9 zXhQoLPRVf6V_Wd6pxmvl>)+6DFY46gfgzud;EWLCwU!~BdhK*x?a1t8ImE|DuiW6# zcicpNmwUc@EZkiYLP@o&EL=|{RF99dsVSQnlW?_Kyn15s^k@2ISrEPjSsZ%~dy=hN z>l66RrR0$9_nuzu_@0;rDI@;3Q}%zF<bPW(<?a#J_Mn3k_$>S1I4lYPK)fJ?g3kN! zo7w?@Yi>c-AxgiJe4T<HK+)t^4p<!t_DKxA@n{8{JLp><GbmxeUg_y|KWjrPhO}vX zfL^8=Job><Mn`^grUXEZ9(W+xQ64d99BEaZDZxjKWvgaQW)gYu(WP$N0CQDxNJ?D+ zYt9R}ed=$Y#ew(sPmO2D+qGn|V3=cVqRAzYVMh1zHKaZ>iG85S9_e~PXY=p3y`b-z zE#g_w5&OdQk*uNpK(d`ObQbnKlNYJ~#`^T&0Rsz_hh;sF<vytvZ~|g%DAb$1e2?{2 zQ1$c*+~5>EzA(lx0d$O+6bOWu7heb6R2FqA;RLK8m<u3smRQ8)`!31=KrPGb0}(IZ zljG@NXAET=7+ZD%^ZDZ0zg@Eb^vnLsH`9mUaep%I*ZI^B=EG)e>NNh7jpA%ut1nov z^xDJPVm#YnDsKBHLbD|b()4e9hJ<^q(0&Vl$d$7&@i+MK^<JjF{GPCPaxkImpLQ3Z zJDkq+oFzQ!JAK#=2q#tjCpw=9H{A_DO;b8@&73Xj-;L?ON_ihc)e6*)0A<AC(<m5f zf#x@!p#(760@Cvbi>$nn@5$S~p&w=~Ww=1$?~B<;oFnp$nlBR_Y2~bB;>Q-lae{5T zZB1<L=Uxxf3$dShj<5n>#ClV0H@$A0I)G*OK-$#^To}C)Z|I@T)AGeP$720M5Mz{W z3?4Q+fhuYhcnV}|eT~k};w5uS0ebJBs!M7mM!CN-MY0=>W5fBs2hS}$$0wLK$b=;m zWT=-dCLKS%^9Z@lHjs=bc@>-DR@i1zaUJWuyTiibhdt4Q4E4<q+}X;YG?~hAQ#Vd3 z*f-OH+aITyl;W@!#IYrMqx`nA5Mh(TXzSSZV>S}DE%7rx9$uCt)y!RmPe#x9$8M{` z`dN>4_K^u^nza;SwqGCg6bjvJs0)&Zr!Pq~Z@>SFFtJm2g|(L-YM1;{++I6}m$j@e zp2pFV7cCifJL@6tyBbL5ymNx*lZeTKr}x0#{43miiw996a?Z_W06y*?w9a|^#y)Ik zl=13FiuJL0>lY>o-h-ux1~-%TBI4zrjg+pT1*WY}&HSlC!z;2NmiGZ_`&FcH4Yliz zfBBt4^GuZ^ovpd4X@C-fi07kLt^LK@@<OO#xEWo*MVjzK|5%UE+K8^n3;uWXIOo_4 z({h#DxYJl3_xXN0DM_Zf)F>;-Da+qPM4cEl->e`$cOekbctfEYyCVco!Pd1~Wi}h0 z%&=KIjU(Do&tR#)Bmy?oFPuT|Jhx5Bij+v`)rC~6mimSWsu?pq$onaNoyXcmsZ%t% z$i$ra)$2jMLjH&>zl8zE49{!U6I<r3)Wu9>`yVwr^*feGM2%N7VlZ!@+O_bUdf9qI z%U~k+mGwo^Y%K~3c<W~1X`A?IYrb6`W=Zv-pI3Bi`$!}8>v`PngvBnY&B!0_gx@_^ znjL?}3A272a7#A`Sc#z#X}<hRUcWcI5FMVlcA+oC=s@dqgSRT}<5ELNX8Y?xncDcA zlKTO(f@!QTkb8wZR0nI<-1VEZz)I#KhhTh>S#t(z1(KyQGv--EtnJIjg+5<hsw8hJ z8u=imk>5TU(;@<Uq=vf+sK?{=Ejc|+)@mqqESq~clL>|o)#5GO{knUdw7Ong-M&N3 zdgCIsRp({3Va1~=M|{rRDwV8<GvqH7@szCR>4)_kSUwm(Q8p|j|6B3Lv0d(8DOC75 zynQ3B(l@9bT`*y0l=U$G`3uSoJBCCcrr1Po@^nuSL;!K#GXE|9d=;P3_(E{;@?!1K zkoP0J4Dwya^h+Y4(j|RV+_JYyfu>kXhJ==GNwb*aB6Du#DD{3`S?GDGLmy>pwvfnL zk?RDuk?>ldXetki>y=osA7(uEso#oIE+LIC*-_f5D9I2T<WS2sxT2s}-0#Nt80?YK z3LlK7vxrQxgequd=GKSaN^$_<1)hiW*A;&$(w2j8=qlQmu5`@gT>tj*d{9nSVP(EL zX~@Z|v!Y~z=V4HDPVk10<GRH4-Moj|&qc?(rN3Hlixy6Nu8ZG|{1kR%p1grR=Xqv8 zQCo4xH!u(04jKF<fp@aQj8!EzYp7GS%rf)i{4E}=2O2X|?G!6_PU$LReCz$wB<_jm zHkX)Sx}^W^(HwdO?}VNxYSLmgbp?oO)TY0X_%`d*(YtD|^pqQVVz~BE##VXvhL?fG zo%1a*i6YujTeYk@uc`$nc<hlJ^}}6FHZJ+Hc{(nK54F_kBWW2K27Y+Sqw_k=Sj2aD z&(8+i(dxl0-?>=hT<<eJarO=Izn9M-W>=`&ONlkY!zu({;<DQ!j+sg}AKHlyWy@b1 zZVbZRA}?derC^4lQ>#<IWr@HSt>?Xa*ytv7TnJTk6ecNP)ipWZpz#8M+CV>j^Gg7; zj&`-U*jzm9Gnhvlo*qAF6oBwsYP_<#P=8`AJ)YmZ92uGIF(@vyA%NcfQ(i8=ci1jN ztwD<zI7YP6FQv)uc8h)?eJoQ6J+y*2eSiz*(J_1q1%!X)XNRXp{+)2O^1h$XlHZ?; zejWp*WM00dl6OG%@w-uz<2&fWiKfu}t&Ppm1&Xu}QM<m{;R>jF$ubNmyB3lCNyT9n zyQD9SF}(sJ)wR*;s7k=Khn~<`^?62N;55&|Fgkd11&#?7>4Y~MHr_ndLZiV;RhkBe zS!f}NbmF(}_PmdpDG}*CverJuB5hO82M;7kz3z597HxKJBak7x@se$EK8OXCkkRgj z&8ju@9T85_ABov~Z`Ux3jr|28SyNradQAN!H^*BxMaeFO4tY_KW~IuOfY<?cDj9hE zqeeiE`97(t5>eha8!c~Oux{R5-_h4Z``NlsWwyxFy9m=uu^8FB++Ty)*lK|Y#5RYR z?6V!`pHHat%K4M(REvnhR8Xakg7k!8WhV6aji*N=++O+UfqgZfsMv1p9&h2zRs5J2 za?ueny+%~YA?Ut|Le^Oh9n3nkPs|_@DmGqcs2gU=)=+~v%WtiWpPc{dZ}xDT*6;to zhwX>oV*BBjh*eB^C*mMNh`31814P+uV1zK!FbWn1XWK?hav^>|Y##rLmx|rTk^Jgk zREPdc0jZcq3N}|h1%JZlF21m49mI5hBEVf)`%0;IgBc~h_60ogEx_B`&FINQg#q1f zYa3asOL2DpdU9g-xKo8?k#+;NhglT5(3ufGCG=ze%2|++V<Nvfu2B;$fI<j`)`kRr zE&e^{BbSpq9$_Q+ba;Af$c5Uq&5REke`*45IbnJMG@Y+^Erx!tn4$g!agE^ATfutI zG>_7jkAm7O_i8s{o3t7i{I?FJWPfKn>3iAg86({+6{NThS)xm}EDfJ8eV0PLpOLGH z?vd3MCKVDXcv?x3dcSV%mg4l%$2v6l9JSP(C6*^CI^=V_oi?2W^QhxJw<(r~J)h|G zXBlEv4_5D|+dI}|8A9(j9&Yc)LYeOIE?(O#tfg1qt;39ojq*yI>cQ(lbjHojVFg!w zhoj-nXE5`jGQAM5;S(1UuwKKs$=Bz5n40cz>-7J?g+2%iA&j|&jFUHa<`Amqi9I+o zzHn)_$IV0n)Q;O&_C#K2E>7CY@JOOj`KdU=tm|t;gJ<$i=PL!Mtn%pIb3PA}dY|~6 z)V>7G@R+sof~FqUY)<HRoBc9R?p`7jUQfS5iI1yPV}j^`A_a;`)MF^8$HIyPJ&Dn! zc7!p0WJF`Zg%E)KKTHQ#zA$>=<v*D&<!`2=)??ioudYx_?5u?CqO6q94MLN7io3lU zbjF0@n7I#cavh#J%Ny7{Pbqa|;XTJ58ACL?ku{eP;HciNDie35e=x}UFmC3((soU} z?60wzMwLDK80=orqP4wQSMn}0*PtJD)9<^>%1Kh}{k8N3f%sm<u-gj3XGw9`8?HK_ ztOI2fAkGn%4P)?`d{Y{~mhLm>M!0XTj4O3C;|06cMZ`fm|G|_ZrQEHRZ*e&;>b)W3 z)CxzTCB=s`xAd8*Il-IIRMi<MGVgldphg46Vgh?iV*iTRPK?yi2<da(oMwTe&2E}+ z6z9DdUQ^8;EQuiJx@!Y3zYo2pfa{4H@#^>`$Qu&JXqTr$vV6Q_#zl?+otRPNcHMR@ zUx5rFAX9b<d6~3QxhB=+<H)K=4>VWLSFfHSY)LbklBm`V?axe(Gv8Xth`v2sYyw*> zuM@0-rzJkhuC=%!nwG|UB4?V-G5cNflk;>g@vu2&<^ScF2#MM60UhPCvtteoDt}SS zG=2L~qP(t)2%;VlAh$sY>Gl$L-c@fFoL>8sgU4EwV*WH=2!u$MPHCcIUOjg+G0*>$ z6Gr})ail@g(5a+tYLyw^w|}pofO>KQ)v9fSn1t6g$tcR@k39G)a<J%x2G-i(dYFeK z*B5Di6t}4zyGrupU)7uci6}1YH8&A6xD!o@**U+a-DuWjxV#=#xo~uPA@z0h^Vl)+ z`KFiBfcc;7I*57MSL(?_E!s`)Gm2!?bxXMmpxTM^;o9op(^Hq^lbuJQVl^wO;o9Xl z*<4Y=6nxL`GZ93)QHwcrmm!$DxbeYX1d}OcI*{<}klZ3dk!8dBep=)mCRaE10@7^h zyjyFo%~&WU+i}f%#O;#ql|Qn1k?E{nJ-Mpp&($~!5yCE8{Qs)Ecs$N!I9aCiU>Wpp z=kbBc*s$O4!ohf@b++^PN5mhFtq<77qwP6Rn{1n~FQqG;HAK5lJbEqTGYzy-#?EEQ zoy_)|9wgglQZ`*=KVTlY=Sij_{_-Sil7`QxeLk~!rz^$(xNYR!iUfmf+Z2a_bV61# z=L-EQvL|?tWXcq{xc*^dtjL4%6Edgl9*Tn)p+0(AMBV&26UxQ4OAJ)N`kOj?gmMrB zC^l0Y%$fdm{NqVZ)Iuc_PV0*b*HY@0hZI&XK_8<X){aT^8SG`i0^Rizy9BnC=?4E+ z#SvaqW(XDAGt8<5;h`NRG5L4&2XoHt_<rPjc^M8Gfc^niGt$*oqey()SS)G2=jHpD zWWl&6$!;h=Qligz=AD^?g^ZCnJ};C9FhWpa9+2Uirb}v%dWWo>2`2yy7c_M;?~2i_ zr-_LM&R=R`#x|w7KxJx~0c)cUR{`L`oxP&lS0AympF5L$yO4{;F8i;s`AYWP39x86 zhNnyn#y{fm<ZSZyI@!<f!D?1*CeQTFQ3*iIInXm6hXb&e|2V-MrMfk}YfNfd$;Zhx zG3*&ts%$4_YDFTI5guUt_bCFaTOD$Rm(aWUTjbIm`1J11$|YPFYlRc%4d1Zw78+T- z`R*Gb)aaiVIei9Iw=$6N=-Rj&I>cLgnR|xCC$e2iX;$6PVfcmZ=H|^0tnYS?@ygcP z?{0UL7K+4;yJM_hRk1MT`*Q9KS8<%YDG&NHNnoo=bX@#a3v{f8Kx!~0jSz4O5acj5 zUpbX1B-h+q^@$5_88{lZ0n6WJiELM0ZC?M)(s2l(u4Rm4 Ddq#ZsoaUpoNPFoaD z&EMVdM6$kJ#Z5G^{4%J5G1ZV|6|;lQS=I^U^6nMyPy1SyYx}~gx3qDr1-Xe$^$L2! zwu(y8&eRH`K8x9@TND=4=@z<CzXiUy8?r{q3qG>f(JJg*|B%Ek`+bP}4mjT{LCk7) z?Qr_y>=bQ^p-wQ49CXh@Dv}MrO$>b4Ao0m+uglS?tus;IksnulutwL-EBI8lzaRKH z(ZJG~F?AkZdpg(`lsR3ouVspz1>$s@%Eu-LeZZmgmFmK*d&4ZcUk3j?-lSK`1b@(Y zs8bX5jM25wRyYBjjh-YBtL)SX{p7CYM$L%@pUwjQGmX1^jflI!mZ1R#AuF}|Mxjz^ zASSzR^Rf0|XmYNmoVHK`;nCt(r%H@|wcGiv{pxF?Wa+@+gxuGPu$}K7c2^rRVeo4A z-I?9TkTXqBSX1aM-_HFmK}WLus&9qtc$M(ss&p;*NTDmH7Q2%BkL>VM(ZqJN%>k6? z36!=mZkI)ju1-VJUeGEiEh52RaooA>eIYXy_dl~L>k2eOhVMyUc^GNs9W0_lDA^rs zmySas!ta*QWYnl=)e{Ce`xALdV>+cG{ZZoZ6wV1&X28y;=G}qsV=5{Va%l*~Df<5K zKhL`<J~}0(@pHtd-}%O=Y6-*!b#!NdAB)Det(=^8p-_uuw^1HF!of2VMXH<2j~2K! z)2bR@^eLtK?$EI67)`$*>J~MG8MxMG2foUGO~rOKj8x`KjR>bip*?bpb>W><`47d2 zZfUu@lwB9t%`<RP6Sv8<p#I(}qCCh~U*X78N^`7lfy$dX$i%3!2zz5bbZ@blwfUSq z6MeF+Km5T}I=0-8+(Fh${M-*UQf*knn<gAKx{JZ<hHgDVdicl)g|`wcXKfZz$bG8g zzQg$8CdSN=HAn=1s+9{A!*?o(GQg>`Arae6Ir4t1yEhUo#2Ot;Rfm-!a!Ju3>)_zp z=_=#BSux3<tfS(y`g3pbl!b2ULtqq%g&gX%VqLIFCbLzbNMyG!>qdr`ydMOm%G^{n z#9O*%>6MBmC|&8h&SxQj=e92p38U9>{j6gTc(b!*KIIGf8FF5|SJg6;fplk%zaWj< z?>(sky@A2BClFOpihA+erfnS|+YIdc&lR0hM?MgDFE~zz<j2c>-Gd;EkD|ecrlB7h z?_VjU`Lh0yeL^OyDtuJgYTrdzMrZ8~N{p#yS7VPAP_5tSrt|VpTa%rer>jaetK(U9 zCG~{FsxpkttE$F(B0)Rb(_|C)Iu@O!?~pe1&wd<&4mHG6X8UNiCa`(AtPuOqJtnNr zp=zRjoP@s6z9A1vaND`0*^K={JWvY{ooiqiyrCCw`?3nIH8y^)`t+a=9#*gw(;PgT zxAeh#XQRW8F$`xR7|TVR_N=o=<zlZ8o?><lN5U%=o_46q&GrmoHsSqBDV6r*mgs3t zi}<}6Rew3lYi9{t(S)t$!y}T%{(49%26ektKlOLz4psBtB6-~ubq3j0^dge@)P8EB z8DY?H3uPF8x*dX@#iS;j02lq**PY7M=)4Cm>~|}KdbuJD9h<~t+Gbrd{%x2K{2eJ^ n`4Irbj-3Cet)0_k%nG}YtDOIKJI0y)UNUh1uFf3{%nJ1%*>T1| literal 0 HcmV?d00001