Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into release/10.0

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionCellEditor.java

@@ -8,6 +8,7 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.vcs.common.VcsHelper;
 import com.fr.design.mainframe.vcs.common.VcsCacheFileNodeFile;
 import com.fr.file.filetree.FileNode;
+import com.fr.general.ComparatorUtils;
 import com.fr.report.entity.VcsEntity;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
@@ -53,9 +54,13 @@ public class FileVersionCellEditor extends AbstractCellEditor implements TableCe
             //先关闭当前打开的模板版本
             JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
             jt.stopEditing();
-            MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
-            MutilTempalteTabPane.getInstance().closeFormat(jt);
-            MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(jt);
+            //只有模板路径一致时关闭当前模板
+            if (ComparatorUtils.equals(fileOfVersion, jt.getPath())) {
+                MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
+                MutilTempalteTabPane.getInstance().closeFormat(jt);
+                MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(jt);
+            }
+
             //再打开cache中的模板
             DesignerContext.getDesignerFrame().openTemplate(new VcsCacheFileNodeFile(new FileNode(fileOfVersion, false)));
 

designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java

@@ -205,7 +205,7 @@ public class InformationCollector implements XMLReadable, XMLWriter {
 				TemplateInfoCollector.getInstance().sendTemplateInfo();
 				ErrorInfoUploader.getInstance().sendErrorInfo();
 			}
-		}, SEND_DELAY, TimeUnit.SECONDS);
+		}, SEND_DELAY, TimeUnit.MILLISECONDS);
 	}
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java

@@ -27,7 +27,6 @@ import com.fr.base.vcs.DesignerMode;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.menu.MenuDef;
@@ -45,7 +44,6 @@ import com.fr.report.poly.PolyWorkSheet;
 import com.fr.report.report.TemplateReport;
 import com.fr.report.worksheet.WorkSheet;
 import com.fr.stable.ProductConstants;
-import org.apache.tools.ant.taskdefs.Sleep;
 
 /**
  * NameTabPane of sheets