From 0b3336c1bc9239843960ce5e7a31a62f5602f75a Mon Sep 17 00:00:00 2001
From: Maksim <Maksim@fanruan.com>
Date: Fri, 14 Feb 2020 13:47:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/EnvChangeEntrance.java        | 3 ++-
 .../java/com/fr/design/write/submit/CheckServiceDialog.java   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
index b7c572650a..209efaf7ed 100644
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@@ -20,6 +20,7 @@ import com.fr.general.GeneralUtils;
 import com.fr.invoke.Reflect;
 import com.fr.json.JSONArray;
 import com.fr.license.exception.RegistEditionException;
+import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.rpc.Result;
 import com.fr.stable.AssistUtils;
@@ -154,7 +155,7 @@ public class EnvChangeEntrance {
                 StringBuilder textBuilder = new StringBuilder();
                 for(Class clazz : noExistServiceSet){
                     WorkspaceAPI workspaceAPI = (WorkspaceAPI) clazz.getAnnotation(WorkspaceAPI.class);
-                    String descriptionOfCN = Toolkit.i18nText(workspaceAPI.description());
+                    String descriptionOfCN = InterProviderFactory.getProvider().getLocText(workspaceAPI.description());
                     textBuilder.append(descriptionOfCN).append("\n");
                 }
                 String areaText = textBuilder.toString();
diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java b/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java
index e55de3fe26..3797c0f8a2 100644
--- a/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java
@@ -8,7 +8,7 @@ import com.fr.general.FRFont;
 import com.fr.general.IOUtils;
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
+import javax.swing.Icon;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -34,7 +34,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         //上面的标签面板
         topPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
         JPanel imagePanel = new JPanel();
-        ImageIcon icon = (ImageIcon) IOUtils.readIcon("com/fr/design/images/warnings/warning4.png");
+        Icon icon = IOUtils.readIcon("com/fr/design/images/warnings/warning4.png");
 
         JLabel imageLabel = new JLabel();
         imageLabel.setIcon(icon);