From a9fac171c6473917d2e9ce790c1cf2dffee6dd1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Wed, 28 Jul 2021 10:31:32 +0200 Subject: [PATCH 1/4] add support for platform version 2021.2 --- CHANGELOG.md | 3 +++ gradle.properties | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f1002d..e1e1ed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ # easy-i18n Changelog ## [Unreleased] +### Added +- Support for IntelliJ 2021.2 + ## [1.4.0] ### THANKS FOR OVER 1000 DOWNLOADS SO FAR! diff --git a/gradle.properties b/gradle.properties index 67ea370..4a7f47f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,19 @@ pluginGroup = de.marhali.easyi18n pluginName = easy-i18n -pluginVersion = 1.4.0 +pluginVersion = 1.4.1 + +# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html +# for insight into build numbers and IntelliJ Platform versions. pluginSinceBuild = 202 -pluginUntilBuild = 211.* +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.1.1 +pluginVerifierIdeVersions = 2020.2.4, 2020.3.4, 2021.2 platformType = IC -platformVersion = 2021.1.3 +platformVersion = 2021.2 platformDownloadSources = true # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 From 5a5fa2cfd7b49beca91cbbf814af46444a2a103e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Wed, 28 Jul 2021 11:31:03 +0200 Subject: [PATCH 2/4] add support for platform version 2021.2 --- CHANGELOG.md | 3 +++ .../java/de/marhali/easyi18n/service/SettingsService.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1e1ed3..d8b94ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ ### Added - Support for IntelliJ 2021.2 +### Changed +- Replace deprecated api methods + ## [1.4.0] ### THANKS FOR OVER 1000 DOWNLOADS SO FAR! diff --git a/src/main/java/de/marhali/easyi18n/service/SettingsService.java b/src/main/java/de/marhali/easyi18n/service/SettingsService.java index e2e8f3f..92a1cd1 100644 --- a/src/main/java/de/marhali/easyi18n/service/SettingsService.java +++ b/src/main/java/de/marhali/easyi18n/service/SettingsService.java @@ -1,10 +1,10 @@ package de.marhali.easyi18n.service; import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.project.Project; +import com.intellij.util.xmlb.XmlSerializerUtil; import de.marhali.easyi18n.model.SettingsState; import org.jetbrains.annotations.NotNull; @@ -17,8 +17,7 @@ import org.jetbrains.annotations.NotNull; public class SettingsService implements PersistentStateComponent { public static SettingsService getInstance(Project project) { - ServiceManager.getService(project, SettingsService.class).initializeComponent(); - return ServiceManager.getService(project, SettingsService.class); + return project.getService(SettingsService.class); } private SettingsState state; From 83b42679e02891115ddbbb1fdebd11e594c6054f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Wed, 28 Jul 2021 11:33:58 +0200 Subject: [PATCH 3/4] fix warning for unset target --- CHANGELOG.md | 3 +++ src/main/java/de/marhali/easyi18n/tabs/TreeView.java | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8b94ab..a99e756 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ ### Changed - Replace deprecated api methods +### Fixed +- Warning for unset target element inside tree-view toolbar + ## [1.4.0] ### THANKS FOR OVER 1000 DOWNLOADS SO FAR! diff --git a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java index 069f975..69c63e7 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java @@ -2,6 +2,7 @@ package de.marhali.easyi18n.tabs; import com.intellij.ide.projectView.PresentationData; import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.ActionToolbar; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.project.Project; import com.intellij.ui.components.JBScrollPane; @@ -68,10 +69,11 @@ public class TreeView implements DataSynchronizer { group.add(collapse); group.add(expand); - JComponent actionToolbar = ActionManager.getInstance() - .createActionToolbar("TranslationsActions", group, false).getComponent(); + ActionToolbar actionToolbar = ActionManager.getInstance() + .createActionToolbar("TranslationsActions", group, false); - toolBarPanel.add(actionToolbar); + toolBarPanel.add(actionToolbar.getComponent()); + actionToolbar.setTargetComponent(toolBarPanel); } @Override From 7cf86e1345441a880cfce79ee1aa40ef56f287a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Wed, 28 Jul 2021 11:41:54 +0200 Subject: [PATCH 4/4] fix order for setting target component --- src/main/java/de/marhali/easyi18n/tabs/TreeView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java index 69c63e7..95ddecb 100644 --- a/src/main/java/de/marhali/easyi18n/tabs/TreeView.java +++ b/src/main/java/de/marhali/easyi18n/tabs/TreeView.java @@ -72,8 +72,8 @@ public class TreeView implements DataSynchronizer { ActionToolbar actionToolbar = ActionManager.getInstance() .createActionToolbar("TranslationsActions", group, false); - toolBarPanel.add(actionToolbar.getComponent()); actionToolbar.setTargetComponent(toolBarPanel); + toolBarPanel.add(actionToolbar.getComponent()); } @Override