Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev

designer/src/com/fr/design/mainframe/templateinfo/JWorkBookProcessInfo.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.templateinfo;
 
-import com.fr.base.io.IOFile;
 import com.fr.base.parameter.ParameterUI;
 import com.fr.main.impl.WorkBook;
 import com.fr.report.cellcase.CellCase;

designer_base/src/com/fr/design/mainframe/JTemplate.java

@@ -85,7 +85,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     public JTemplate(T t, String defaultFileName) {
         this(t, new MemFILE(newTemplateNameByIndex(defaultFileName)), true);
-        initForCollect();
+        openTime = System.currentTimeMillis();
     }
 
     public JTemplate(T t, FILE file) {
@@ -111,14 +111,15 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     // 为收集模版信息作准备
     private void initForCollect() {
-        if (template.getTemplateID() == null) {
+        template.initTemplateID();  // 为新模板设置 templateID 属性
-            template.initTemplateID();  // 为新模板设置 templateID 属性
-        }
         if (openTime == 0) {
             openTime = System.currentTimeMillis();
         }
     }
     private void collectInfo() {  // 执行收集操作
+        if (openTime == 0) {  // 旧模板，不收集数据
+            return;
+        }
         long saveTime = System.currentTimeMillis();  // 保存模板的时间点
         tic.collectInfo(template, this, openTime, saveTime);
         openTime = saveTime;  // 更新 openTime，准备下一次计算
@@ -371,7 +372,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     }
 
     protected boolean accept(Object o){
-    	return true;
+        return true;
     }
 
     private void fireSuperTargetModified() {
@@ -487,15 +488,15 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         collectInfo();
         return this.saveFile();
     }
-    
+
     private boolean isCancelOperation(int operation){
-    	return operation == FILEChooserPane.CANCEL_OPTION ||
+        return operation == FILEChooserPane.CANCEL_OPTION ||
-    	       operation == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION;
+                operation == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION;
     }
-    
+
     private boolean isOkOperation(int operation){
-    	return operation == FILEChooserPane.JOPTIONPANE_OK_OPTION ||
+        return operation == FILEChooserPane.JOPTIONPANE_OK_OPTION ||
-    		   operation == FILEChooserPane.OK_OPTION;
+                operation == FILEChooserPane.OK_OPTION;
     }
 
     private boolean saveAsTemplate(boolean isShowLoc) {
@@ -512,8 +513,8 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         if (isCancelOperation(chooseResult)) {
             fileChooser = null;
             return false;
-        } 
+        }
-        
+
         if (isOkOperation(chooseResult)) {
             if (!FRContext.getCurrentEnv().hasFileFolderAllow(fileChooser.getSelectedFILE().getPath()) ) {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
@@ -523,40 +524,40 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
             mkNewFile(editingFILE);
             fileChooser = null;
         }
-        
+
         return saveNewFile(editingFILE, oldName);
     }
-    
+
     protected boolean saveNewFile(FILE editingFILE, String oldName){
         this.editingFILE = editingFILE;
 
         boolean result = this.saveFile();
         if (result) {
             DesignerFrameFileDealerPane.getInstance().refresh();
-            initForCollect();  // 如果是旧模板另存为新模板，则添加 templateID
+            initForCollect();  // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
             collectInfo();
         }
         //更换最近打开
         DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getFullPathName());
         return result;
     }
-    
+
     protected void mkNewFile(FILE file){
         try {
-        	file.mkfile();
+            file.mkfile();
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
         }
     }
-    
+
     /**
-	 * 将模板另存为可以分享出去的混淆后内置数据集模板
+     * 将模板另存为可以分享出去的混淆后内置数据集模板
-	 * 
+     *
-	 * @return 是否另存成功
+     * @return 是否另存成功
-	 * 
+     *
-	 */
+     */
     public boolean saveShareFile(){
-    	return true;
+        return true;
     }
     public Widget getSelectElementCase(){
         return new NoneWidget();
@@ -761,7 +762,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     public void revert() {
 
     }
-    
+
     private int getVersionCompare(String versionString){
         if (StringUtils.isBlank(versionString)) {
             return 0;
@@ -771,7 +772,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return ComparatorUtils.compare(versionString.substring(0, len), ProductConstants.DESIGNER_VERSION.substring(0, len));
 
     }
-    
+
     private int getVersionCompareHBB(String versionString){
         if (StringUtils.isBlank(versionString)) {
             return 0;
@@ -779,17 +780,17 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return ComparatorUtils.compare(versionString, "HBB");
 
     }
-    
+
     private boolean isHigherThanCurrent(String versionString) {
         return getVersionCompare(versionString) > 0;
     }
-    
+
     private boolean isLowerThanCurrent(String versionString) {
-    	return getVersionCompare(versionString) < 0;
+        return getVersionCompare(versionString) < 0;
     }
-    
+
     private boolean isLowerThanHBB(String versionString) {
-    	return getVersionCompareHBB(versionString) < 0;
+        return getVersionCompareHBB(versionString) < 0;
     }
 
     /**
@@ -799,7 +800,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     public boolean isNewDesigner() {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isLowerThanHBB(xmlDesignerVersion)) {
-        	String info = Inter.getLocText("FR-Designer_open-new-form-tip");
+            String info = Inter.getLocText("FR-Designer_open-new-form-tip");
             String moreInfo = Inter.getLocText("FR-Designer_Server-version-tip-moreInfo");
             new InformationWarnPane(info, moreInfo, Inter.getLocText("FR-Designer_Tooltips")).show();
             return true;
@@ -853,13 +854,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * @return 是则返回true
      */
     public abstract boolean isJWorkBook();
-    
+
     /**
      * 返回当前支持的超链界面pane
      * @return 超链连接界面
      */
     public HyperlinkGroupPane getHyperLinkPane() {
-    	return new HyperlinkGroupPane();
+        return new HyperlinkGroupPane();
     }
 
     /**
@@ -914,29 +915,29 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     public void requestGridFocus() {
 
     }
-    
+
     /**
-	 * 创建内置sql提交的pane
+     * 创建内置sql提交的pane
-	 * 
+     *
-	 * @return 内置sql提交的pane
+     * @return 内置sql提交的pane
-	 * 
+     *
-	 *
+     *
-	 * @date 2014-10-14-下午7:39:27
+     * @date 2014-10-14-下午7:39:27
-	 */
+     */
     public DBManipulationPane createDBManipulationPane(){
-    	return new DBManipulationPane();
+        return new DBManipulationPane();
     }
-    
+
     /**
      * 创建控件事件里内置sql提交的pane
-     * 
+     *
      * @return 内置sql提交的pane
-     * 
+     *
      *
      * @date 2014-10-14-下午7:39:27
      */
     public DBManipulationPane createDBManipulationPaneInWidget(){
-    	return new DBManipulationInWidgetEventPane();
+        return new DBManipulationInWidgetEventPane();
     }
 
     /**
@@ -964,15 +965,15 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     public void styleChange(){
 
     }
-    
+
     /**
-	 * 创建分享模板的按钮, 目前只有jworkbook实现了
+     * 创建分享模板的按钮, 目前只有jworkbook实现了
-	 * 
+     *
-	 * @return 分享模板按钮
+     * @return 分享模板按钮
-	 * 
+     *
-	 */
+     */
     public UIButton[] createShareButton(){
-    	return new UIButton[0]; 
+        return new UIButton[0];
     }
 
     /**

designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java

@@ -5,6 +5,7 @@ import com.fr.base.io.IOFile;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.env.RemoteEnv;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.GeneralUtils;
@@ -15,9 +16,7 @@ import org.json.JSONObject;
 
 import java.io.*;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Calendar;
-import java.util.HashMap;
 
 /**
  * 做模板的过程和耗时收集，辅助类
@@ -70,18 +69,28 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
             } catch (FileNotFoundException ex) {
                 // 如果之前没有存储过，则创建新对象
                 instance = new TemplateInfoCollector();
-            } catch (Exception ex) {
+            } catch (InvalidClassException ex) {
+                // 如果 TemplateInfoCollecor 类结构有改动，则放弃之前收集的数据（下次保存时覆盖）
+                // 这种情况主要在开发、测试过程中遇到，正式上线后不应该出现
+                FRLogger.getLogger().error(ex.getMessage());
+                FRLogger.getLogger().info("use a new instance");
+                instance = new TemplateInfoCollector();
+            }
+            catch (Exception ex) {
                 FRLogger.getLogger().error(ex.getMessage(), ex);
             }
         }
         return instance;
     }
 
-    private static boolean shouldCollectInfo() {
+    private boolean shouldCollectInfo() {
+        if (FRContext.getCurrentEnv() instanceof RemoteEnv) {  // 远程设计不收集数据
+            return false;
+        }
         return DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv();
     }
 
-    public static void appendProcess(String log) {
+    public void appendProcess(String log) {
         if (!shouldCollectInfo()) {
             return;
         }
@@ -113,7 +122,14 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
     private void saveInfo() {
         try {
             ObjectOutputStream os = new ObjectOutputStream(new FileOutputStream(getInfoFile()));
-            FRLogger.getLogger().info("writing: " + instance.templateInfoList);
+            String log = "";
+            int count = 1;
+            for (String key : templateInfoList.keySet()) {
+                String createTime = ((HashMap)templateInfoList.get(key).get("consumingMap")).get("create_time").toString();
+                log += (count + ". id: " + key + " " + createTime + "\n" + templateInfoList.get(key).toString() + "\n");
+                count ++;
+            }
+            FRLogger.getLogger().info("writing tplInfo: \n" + log);
             os.writeObject(instance);
             os.close();
         } catch (Exception ex) {
@@ -225,7 +241,9 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
             if (sendSingleTemplateInfo(consumingUrl, jsonConsumingMap) && sendSingleTemplateInfo(processUrl, jsonProcessMap)) {
                 // 清空记录
                 FRLogger.getLogger().info("successfully send " + templateInfo.get("templateID"));
-                templateInfoList.remove(templateInfo.get("templateID"));
+                removeFromTemplateInfoList(templateInfo.get("templateID"));
+            } else {
+                FRLogger.getLogger().info("send template info failed, will try next time, " + templateInfo.get("templateID"));
             }
         }
         saveInfo();
@@ -277,12 +295,16 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         }
         // 删除测试模板
         for (String key : testTemplateKeys) {
-            templateInfoList.remove(key);
+            removeFromTemplateInfoList(key);
-//            System.out.println(key + " is removed...");
         }
         return completeTemplatesInfo;
     }
 
+    private void removeFromTemplateInfoList(String key) {
+        templateInfoList.remove(key);
+        FRLogger.getLogger().info(key + " is removed...");
+    }
+
     @SuppressWarnings("unchecked")
     private boolean isTestTemplate(HashMap<String, Object> templateInfo) {
         HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get("processMap");