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] 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))); } }; }