Pull request #11061: KERNEL-12978 fix: 适配CBB改动

Merge in DESIGN/design from ~CLOUD.LIU/design:feature/x to feature/x

* commit '5a717baaea4cc0f968841f55dff8675ce5ac932c':
  KERNEL-12978 fix: 适配CBB改动

designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java

@@ -12,6 +12,7 @@ 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;
@@ -121,7 +122,7 @@ public class LocalePane extends BasicPane {
 
     private void initPredefinedProperties() {
     
-        Map<Locale, String> supportLocaleMap = InterProviderFactory.getProvider().getSupportLocaleMap();
+        Map<Locale, String> supportLocaleMap = Inter.getSupportLocaleMap();
 
         // richie:暂时去掉设计器中国际化键值对的显示
         Map<String, String> map = new HashMap<>();

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -46,7 +46,6 @@ 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;
@@ -634,7 +633,7 @@ public class PreferencePane extends BasicPane {
     }
 
     private UIDictionaryComboBox<Locale> createLanguageComboBox() {
-        Map<Locale, String> map = InterProviderFactory.getProvider().getSupportLocaleMap();
+        Map<Locale, String> map = Inter.getSupportLocaleMap();
         int size = map.size();
         Locale[] keys = new Locale[size];
         String[] values = new String[size];