From 2c3b24af3c827d6f045f0970c61f0a36e2379ed9 Mon Sep 17 00:00:00 2001
From: "Hugh.C" <Hugh.C@fanruan.com>
Date: Tue, 10 Sep 2019 10:41:39 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-20981=20=E6=A8=A1=E6=9D=BF=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=AE=A1=E7=90=86=E5=87=8F=E5=B0=91=E7=A3=81=E7=9B=98?=
 =?UTF-8?q?=E5=8D=A0=E7=94=A8=EF=BC=88=E8=BF=9C=E7=A8=8B=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0jar=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=9B=B8=E5=BA=94=E4=BF=A1=E6=81=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/actions/file/PreferencePane.java   | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

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 a994711eb..968d395f4 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
@@ -897,17 +897,13 @@ public class PreferencePane extends BasicPane {
             protected void done() {
                 try {
                     get();
-                } catch (InterruptedException | ExecutionException e) {
+                } catch (ExecutionException e) {
+                    updateGcDialogPanelInfo(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Need_Update_Remote_Server_Jar"));
+                    return;
+                } catch (InterruptedException e) {
                     FineLoggerFactory.getLogger().error(e, e.getMessage());
                 }
-                stopGcProgressTimer();
-                gcMessage.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size));
-                if (null != gcProgressBar) {
-                    gcProgressBarPanel.remove(gcProgressBar);
-                }
-                if (null != gcDialog) {
-                    gcDialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"));
-                }
+                updateGcDialogPanelInfo(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Vcs_Reduce_File_Size") + fileSizeConvert(size));
                 gcDialogDownPane.revalidate();
                 gcDialogDownPane.repaint();
                 gcDialogDownPane.add(gcOkButton);
@@ -932,6 +928,22 @@ public class PreferencePane extends BasicPane {
         gcDialog.dispose();
     }
 
+    /**
+     * gc 后更新进度条面板信息
+     *
+     * @param message
+     */
+    private void updateGcDialogPanelInfo(String message) {
+        stopGcProgressTimer();
+        gcMessage.setText(message);
+        if (null != gcProgressBar) {
+            gcProgressBarPanel.remove(gcProgressBar);
+        }
+        if (null != gcDialog) {
+            gcDialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"));
+        }
+    }
+
     /**
      * 初始化 gc 对话框
      */