From cdd0cea75b33bd54232fb367ac1d962032e10c4a Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Fri, 26 Apr 2019 17:27:13 +0800
Subject: [PATCH] bug fix

---
 .../fr/design/mainframe/vcs/ui/FileVersionCellEditor.java  | 5 +++--
 designer-realize/src/main/java/com/fr/start/Designer.java  | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionCellEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionCellEditor.java
index bdb4bc1ee..a7f7f5ef0 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionCellEditor.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionCellEditor.java
@@ -35,15 +35,16 @@ public class FileVersionCellEditor extends AbstractCellEditor implements TableCe
     @Override
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
         String fileOfVersion;
+        VcsOperator vcsOperator = WorkContext.getCurrent().get(VcsOperator.class);
         Component editor = row == 0 ? firstRowPanel : renderAndEditor;
         if (isSelected) {
             return editor;
         } else if (row == 0) {
             String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
-            fileOfVersion = WorkContext.getCurrent().get(VcsOperator.class).getFileOfCurrent(path.replaceFirst("/", ""));
+            fileOfVersion = vcsOperator.getFileOfCurrent(path.replaceFirst("/", ""));
         } else {
             renderAndEditor.update((VcsEntity) value);
-            fileOfVersion = WorkContext.getCurrent().get(VcsOperator.class).getFileOfFileVersion(((VcsEntity) value).getFilename(), ((VcsEntity) value).getVersion());
+            fileOfVersion = vcsOperator.getFileOfFileVersion(((VcsEntity) value).getFilename(), ((VcsEntity) value).getVersion());
 
         }
 
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 daf0046d7..5c81ee258 100644
--- a/designer-realize/src/main/java/com/fr/start/Designer.java
+++ b/designer-realize/src/main/java/com/fr/start/Designer.java
@@ -11,6 +11,7 @@ import com.fr.design.actions.file.newReport.NewWorkBookAction;
 import com.fr.design.actions.server.ServerConfigManagerAction;
 import com.fr.design.actions.server.StyleListAction;
 import com.fr.design.actions.server.WidgetManagerAction;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -363,12 +364,12 @@ public class Designer extends BaseDesigner {
 
     @Override
     protected void refreshLargeToolbarState() {
-        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         if (jt == null) {
             return;
         }
-        saveButton.setEnabled(!jt.isSaved() && !DesignerMode.isVcsMode());
-        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListPane.getInstance().getHistoryList());
+        saveButton.setEnabled(!jt.isSaved() && !DesignModeContext.isVcsMode());
+        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListCache.getInstance().getHistoryList());
         MutilTempalteTabPane.getInstance().repaint();
         if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
             undo.setEnabled(jt.canUndo());