From 39fbddc8ca48019f6ff99e745c1ad6c704cb1dfc Mon Sep 17 00:00:00 2001
From: "Hugh.C" <Hugh.C@fanruan.com>
Date: Thu, 17 Oct 2019 13:57:03 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-22877=20=E3=80=9010.0.4=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92=E3=80=91=E6=A8=A1=E7=89=88=E7=89=88=E6=9C=AC=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E9=9B=86=E7=BE=A4=E7=8E=AF=E5=A2=83=E4=BB=8D?=
 =?UTF-8?q?=E7=84=B6=E8=83=BD=E8=BF=9B=E5=85=A5=E7=89=88=E6=9C=AC=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/DesignerFrameFileDealerPane.java   | 3 ++-
 .../java/com/fr/design/mainframe/vcs/common/VcsHelper.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index c8f8280a4..a3bca31aa 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -3,6 +3,7 @@ package com.fr.design.mainframe;
 import com.fr.base.BaseUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.cluster.ClusterBridge;
+import com.fr.cluster.engine.base.FineClusterConfig;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -367,7 +368,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         private void fireVcsActionChange() {
             if (!DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable()
                     || VcsHelper.getInstance().isUnSelectedTemplate()
-                    || ClusterBridge.isClusterMode()) {
+                    || FineClusterConfig.getInstance().isCluster()) {
                 setEnabled(false);
                 return;
             }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java
index dc4af8750..547ddf6ae 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java
@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.vcs.common;
 
 import com.fr.cluster.ClusterBridge;
+import com.fr.cluster.engine.base.FineClusterConfig;
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.file.HistoryTemplateListCache;
@@ -173,7 +174,7 @@ public class VcsHelper implements JTemplateActionListener {
     public void templateSaved(JTemplate<?, ?> jt) {
         if (needInit()
                 && DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable()
-                && !ClusterBridge.isClusterMode()) {
+                && !FineClusterConfig.getInstance().isCluster()) {
             fireVcs(jt);
         }
     }