From 1ec46c20d5bf6dfcf06ed6c8c668bf873c2ce47b Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Tue, 23 Apr 2019 15:13:17 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-14835=20=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/start/Designer.java  | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java
index 458efaef9..edd26cb05 100644
--- a/designer-realize/src/main/java/com/fr/start/Designer.java
+++ b/designer-realize/src/main/java/com/fr/start/Designer.java
@@ -279,32 +279,34 @@ public class Designer extends BaseDesigner {
                 jt.stopEditing();
                 jt.saveTemplate();
                 jt.requestFocus();
-                String fileName = VcsHelper.getEditingFilename();
-                int latestFileVersion = 0;
-                try {
-                    latestFileVersion = WorkContext.getCurrent().get(VcsOperator.class).getLatestFileVersion(fileName);
-
-                } catch (Exception e1) {
-                    FineLoggerFactory.getLogger().error(e1.getMessage());
-                }
-                try {
-                    if (jt.getEditingFILE() instanceof VcsCacheFileNodeFile) {
-                        WorkContext.getCurrent().get(VcsOperator.class).saveVersionFromCache(VcsHelper.CURRENT_USERNAME, fileName, StringUtils.EMPTY, latestFileVersion + 1);
-                        String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
-                        FileVersionTable.getInstance().updateModel(1, WorkContext.getCurrent().get(VcsOperator.class).getVersions(path.replaceFirst("/", "")));
-
-                    } else {
-                        WorkContext.getCurrent().get(VcsOperator.class).saveVersion(VcsHelper.CURRENT_USERNAME, fileName, StringUtils.EMPTY, latestFileVersion + 1);
-                    }
-                } catch (Exception e1) {
-                    FineLoggerFactory.getLogger().error(e1.getMessage());
+                if (DesignerEnvManager.getEnvManager().isVcsEnable()) {
+                    dealWithVcs(jt);
                 }
-
             }
         });
         return saveButton;
     }
 
+    /**
+     * 版本控制
+     * @param jt
+     */
+    private void dealWithVcs(JTemplate jt) {
+        try {
+            String fileName = VcsHelper.getEditingFilename();
+            int latestFileVersion = WorkContext.getCurrent().get(VcsOperator.class).getLatestFileVersion(fileName);
+            if (jt.getEditingFILE() instanceof VcsCacheFileNodeFile) {
+                WorkContext.getCurrent().get(VcsOperator.class).saveVersionFromCache(VcsHelper.CURRENT_USERNAME, fileName, StringUtils.EMPTY, latestFileVersion + 1);
+                String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
+                FileVersionTable.getInstance().updateModel(1, WorkContext.getCurrent().get(VcsOperator.class).getVersions(path.replaceFirst("/", "")));
+            } else {
+                WorkContext.getCurrent().get(VcsOperator.class).saveVersion(VcsHelper.CURRENT_USERNAME, fileName, StringUtils.EMPTY, latestFileVersion + 1);
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error("vcs error: {}", e.getMessage());
+        }
+    }
+
     private UIButton createUndoButton() {
         undo = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/undo.png"));
         undo.setToolTipText(KeySetUtils.UNDO.getMenuKeySetName());