[T3CMS] Rename settings property for translation folding (#344)

cedricziel · web-flow · commit 8b4849fead87 · 2020-12-05T18:48:29.000+01:00
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/TYPO3CMSProjectSettings.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/TYPO3CMSProjectSettings.java
@@ -21,7 +21,7 @@ public class TYPO3CMSProjectSettings implements PersistentStateComponent<TYPO3CM
     public boolean iconAnnotatorEnabled;
     public boolean routeAnnotatorEnabled;
     public boolean translationEnableTextFolding;
-    public Object translationFavoriteLocale;
+    public String translationFoldingLocale;
 
     public TYPO3CMSProjectSettings() {
         this.pluginEnabled = false;
@@ -32,7 +32,7 @@ public TYPO3CMSProjectSettings() {
         this.routeAnnotatorEnabled = true;
 
         this.translationEnableTextFolding = true;
-        this.translationFavoriteLocale = "en";
+        this.translationFoldingLocale = "en";
     }
 
     public static TYPO3CMSProjectSettings getInstance(@NotNull Project project) {
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/configuration/TYPO3CMSSettingsForm.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/configuration/TYPO3CMSSettingsForm.java
@@ -18,7 +18,7 @@ public class TYPO3CMSSettingsForm implements Configurable {
     private JCheckBox iconAnnotatorEnabled;
     private JCheckBox routeAnnotatorEnabled;
     private JCheckBox translationEnableTextFolding;
-    private JComboBox translationFavoriteLocale;
+    private JComboBox<String> translationFavoriteLocale;
 
     public TYPO3CMSSettingsForm(@NotNull Project project) {
         this.project = project;
@@ -53,7 +53,7 @@ public boolean isModified() {
             || iconAnnotatorEnabled.isSelected() != getSettings().iconAnnotatorEnabled
             || routeAnnotatorEnabled.isSelected() != getSettings().routeAnnotatorEnabled
             || translationEnableTextFolding.isSelected() != getSettings().translationEnableTextFolding
-            || translationFavoriteLocale.getSelectedItem() != getSettings().translationFavoriteLocale
+            || translationFavoriteLocale.getSelectedItem() != getSettings().translationFoldingLocale
         ;
     }
 
@@ -64,7 +64,7 @@ public void apply() {
         getSettings().routeAnnotatorEnabled = routeAnnotatorEnabled.isSelected();
 
         getSettings().translationEnableTextFolding = translationEnableTextFolding.isSelected();
-        getSettings().translationFavoriteLocale = translationFavoriteLocale.getSelectedItem();
+        getSettings().translationFoldingLocale = (String) translationFavoriteLocale.getSelectedItem();
     }
 
     public TYPO3CMSProjectSettings getSettings() {
@@ -77,6 +77,6 @@ private void updateUIFromSettings() {
         routeAnnotatorEnabled.setSelected(getSettings().routeAnnotatorEnabled);
 
         translationEnableTextFolding.setSelected(getSettings().translationEnableTextFolding);
-        translationFavoriteLocale.setSelectedItem(getSettings().translationFavoriteLocale);
+        translationFavoriteLocale.setSelectedItem(getSettings().translationFoldingLocale);
     }
 }
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/TranslationUtil.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/util/TranslationUtil.java
@@ -207,7 +207,7 @@ public static StubTranslation findDefaultTranslationFromVariants(Project project
         }
 
         // Try to find the one with the selected favorite locale
-        String defaultLocale = (String) TYPO3CMSProjectSettings.getInstance(project).translationFavoriteLocale;
+        String defaultLocale = (String) TYPO3CMSProjectSettings.getInstance(project).translationFoldingLocale;
         if (defaultLocale != null && !defaultLocale.isEmpty()) {
             for (StubTranslation property : stubs) {
                 if (property.getLanguage().equals(defaultLocale)) {
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/translation/TranslationFoldingBuilderTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/translation/TranslationFoldingBuilderTest.java
@@ -11,7 +11,7 @@ protected String getTestDataPath() {
 
     public void testXMLTranslationsCanBeFolded() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "en";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "en";
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
         myFixture.copyFileToProject("folding_xml.xml", "foo/Resources/Private/Language/locallang.xml");
@@ -23,7 +23,7 @@ public void testXMLTranslationsCanBeFolded() {
 
     public void testXMLTranslationsCanBeFoldedInNonDefaultLanguage() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "de";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "de";
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
         myFixture.copyFileToProject("folding_xml.xml", "foo/Resources/Private/Language/locallang.xml");
@@ -57,7 +57,7 @@ public void testXMLTranslationsAreNotFoldedWhenDisabledInPluginSettings() {
 
     public void testXLFTranslationsCanBeFolded() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "en";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "en";
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
         myFixture.copyFileToProject("folding_xlf.xlf", "foo/Resources/Private/Language/locallang.xlf");
@@ -69,7 +69,7 @@ public void testXLFTranslationsCanBeFolded() {
 
     public void testXLFTranslationsCanBeFoldedInNonDefaultLanguage() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "de";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "de";
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
         myFixture.copyFileToProject("folding_xlf.xlf", "foo/Resources/Private/Language/locallang.xlf");
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/translation/TranslatorTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/translation/TranslatorTest.java
@@ -29,7 +29,7 @@ protected void setUp() throws Exception {
 
     public void testWillReturnNullOnEmptyResult() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "en";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "en";
 
         myFixture.copyFileToProject("folding_xml.xml", "typo3conf/ext/foo/Resources/Private/Language/locallang.xml");
 
@@ -38,7 +38,7 @@ public void testWillReturnNullOnEmptyResult() {
 
     public void testCanTranslateLLLString() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "en";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "en";
 
         myFixture.copyFileToProject("folding_xml.xml", "typo3conf/ext/foo/Resources/Private/Language/locallang.xml");
 
@@ -47,7 +47,7 @@ public void testCanTranslateLLLString() {
 
     public void testCanTranslateLLLStringInNonDefaultXMLLanguage() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "de";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "de";
 
         myFixture.copyFileToProject("folding_xml.xml", "typo3conf/ext/foo/Resources/Private/Language/locallang.xml");
 
@@ -58,7 +58,7 @@ public void testCanTranslateLLLStringInNonDefaultXMLLanguage() {
 
     public void testCanTranslateLLLStringXLF() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "en";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "en";
 
         myFixture.copyFileToProject("folding_xlf.xlf", "typo3conf/ext/foo/Resources/Private/Language/locallang.xlf");
 
@@ -67,7 +67,7 @@ public void testCanTranslateLLLStringXLF() {
 
     public void testCanTranslateLLLStringXLFNonDefaultLanguage() {
         TYPO3CMSProjectSettings.getInstance(getProject()).translationEnableTextFolding = true;
-        TYPO3CMSProjectSettings.getInstance(getProject()).translationFavoriteLocale = "de";
+        TYPO3CMSProjectSettings.getInstance(getProject()).translationFoldingLocale = "de";
 
         myFixture.copyFileToProject("folding_xlf.xlf", "typo3conf/ext/foo/Resources/Private/Language/locallang.xlf");
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class TYPO3CMSSettingsForm implements Configurable {`
`18`	`18`	`private JCheckBox iconAnnotatorEnabled;`
`19`	`19`	`private JCheckBox routeAnnotatorEnabled;`
`20`	`20`	`private JCheckBox translationEnableTextFolding;`
`21`		`- private JComboBox translationFavoriteLocale;`
	`21`	`+ private JComboBox<String> translationFavoriteLocale;`
`22`	`22`
`23`	`23`	`public TYPO3CMSSettingsForm(@NotNull Project project) {`
`24`	`24`	`this.project = project;`
`@@ -53,7 +53,7 @@ public boolean isModified() {`
`53`	`53`	`\|\| iconAnnotatorEnabled.isSelected() != getSettings().iconAnnotatorEnabled`
`54`	`54`	`\|\| routeAnnotatorEnabled.isSelected() != getSettings().routeAnnotatorEnabled`
`55`	`55`	`\|\| translationEnableTextFolding.isSelected() != getSettings().translationEnableTextFolding`
`56`		`- \|\| translationFavoriteLocale.getSelectedItem() != getSettings().translationFavoriteLocale`
	`56`	`+ \|\| translationFavoriteLocale.getSelectedItem() != getSettings().translationFoldingLocale`
`57`	`57`	`;`
`58`	`58`	`}`
`59`	`59`
`@@ -64,7 +64,7 @@ public void apply() {`
`64`	`64`	`getSettings().routeAnnotatorEnabled = routeAnnotatorEnabled.isSelected();`
`65`	`65`
`66`	`66`	`getSettings().translationEnableTextFolding = translationEnableTextFolding.isSelected();`
`67`		`- getSettings().translationFavoriteLocale = translationFavoriteLocale.getSelectedItem();`
	`67`	`+ getSettings().translationFoldingLocale = (String) translationFavoriteLocale.getSelectedItem();`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public TYPO3CMSProjectSettings getSettings() {`
`@@ -77,6 +77,6 @@ private void updateUIFromSettings() {`
`77`	`77`	`routeAnnotatorEnabled.setSelected(getSettings().routeAnnotatorEnabled);`
`78`	`78`
`79`	`79`	`translationEnableTextFolding.setSelected(getSettings().translationEnableTextFolding);`
`80`		`- translationFavoriteLocale.setSelectedItem(getSettings().translationFavoriteLocale);`
	`80`	`+ translationFavoriteLocale.setSelectedItem(getSettings().translationFoldingLocale);`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public static StubTranslation findDefaultTranslationFromVariants(Project project`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`// Try to find the one with the selected favorite locale`
`210`		`- String defaultLocale = (String) TYPO3CMSProjectSettings.getInstance(project).translationFavoriteLocale;`
	`210`	`+ String defaultLocale = (String) TYPO3CMSProjectSettings.getInstance(project).translationFoldingLocale;`
`211`	`211`	`if (defaultLocale != null && !defaultLocale.isEmpty()) {`
`212`	`212`	`for (StubTranslation property : stubs) {`
`213`	`213`	`if (property.getLanguage().equals(defaultLocale)) {`