From 28ee487a79086915137394df33fdc8d20c3e43a3 Mon Sep 17 00:00:00 2001
From: "Cloud.Liu" <cloud.liu@fanruan.com>
Date: Thu, 9 Feb 2023 19:26:10 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"KERNEL-12978=20fix:=20=E9=80=82?=
 =?UTF-8?q?=E9=85=8DCBB=E6=94=B9=E5=8A=A8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5a717baaea4cc0f968841f55dff8675ce5ac932c.
---
 .../src/main/java/com/fr/design/actions/file/LocalePane.java   | 3 +--
 .../main/java/com/fr/design/actions/file/PreferencePane.java   | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java
index 843b3bf72..634af28b9 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java
@@ -12,7 +12,6 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.GeneralUtils;
 
-import com.fr.general.Inter;
 import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
@@ -122,7 +121,7 @@ public class LocalePane extends BasicPane {
 
     private void initPredefinedProperties() {
     
-        Map<Locale, String> supportLocaleMap = Inter.getSupportLocaleMap();
+        Map<Locale, String> supportLocaleMap = InterProviderFactory.getProvider().getSupportLocaleMap();
 
         // richie:暂时去掉设计器中国际化键值对的显示
         Map<String, String> map = new HashMap<>();
diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
index 840de5867..46485409b 100644
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
@@ -46,6 +46,7 @@ import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 import com.fr.general.log.Log4jConfig;
 import com.fr.io.attr.ImageExportAttr;
+import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.ReportConfigManager;
 import com.fr.stable.Constants;
@@ -633,7 +634,7 @@ public class PreferencePane extends BasicPane {
     }
 
     private UIDictionaryComboBox<Locale> createLanguageComboBox() {
-        Map<Locale, String> map = Inter.getSupportLocaleMap();
+        Map<Locale, String> map = InterProviderFactory.getProvider().getSupportLocaleMap();
         int size = map.size();
         Locale[] keys = new Locale[size];
         String[] values = new String[size];