Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0

designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java

@@ -114,7 +114,6 @@ public class SwitchExistEnv extends MenuDef {
 
                 @Override
                 public void fail() {
-                    TemplatePane.getInstance().editItems();
                     JOptionPane.showMessageDialog(
                             DesignerContext.getDesignerFrame(),
                             Inter.getLocText(new String[]{"M-SwitchWorkspace", "Failed"}));

designer-base/src/com/fr/design/env/DesignerWorkspaceGenerator.java

@@ -8,13 +8,13 @@ import com.fr.workspace.connect.WorkspaceClient;
  * 根据配置生成运行环境
  */
 public class DesignerWorkspaceGenerator {
-    
+
     public static Workspace generate(DesignerWorkspaceInfo config) {
-        
+
         if (config == null || config.getType() == null) {
             return null;
         }
-        
+
         Workspace workspace = null;
         switch (config.getType()) {
             case Local: {
@@ -23,7 +23,9 @@ public class DesignerWorkspaceGenerator {
             }
             case Remote: {
                 WorkspaceClient client = WorkContext.getConnector().connect(config.getConnection());
-                workspace = new RemoteWorkspace(client, config.getConnection());
+                if (client != null) {
+                    workspace = new RemoteWorkspace(client, config.getConnection());
+                }
                 break;
             }
         }

designer-base/src/com/fr/env/RemoteEnv.java

@@ -756,4 +756,4 @@
 //        return true;
 //    }
 //
-//}
+//}

designer-realize/pom.xml

@@ -11,7 +11,7 @@
     <groupId>com.fr.report</groupId>
     <artifactId>designer-realize</artifactId>
     <version>10.0-RELEASE-SNAPSHOT</version>
-      <dependencies>
+    <dependencies>
         <dependency>
             <groupId>com.fr.report</groupId>
             <artifactId>designer-form</artifactId>

designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java

@@ -120,7 +120,6 @@ public class ErrorInfoLogAppender extends AppenderSkeleton {
 
             @Override
             public void readXML(XMLableReader reader) {
-                super.readXML(reader);
                 readDesign(reader);
             }
 

designer-realize/src/com/fr/start/Designer.java

@@ -44,6 +44,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
 import com.fr.module.Module;
 import com.fr.module.ModuleContext;
+import com.fr.record.analyzer.FineAnalyzer;
 import com.fr.stable.BuildContext;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.ProductConstants;
@@ -97,6 +98,8 @@ public class Designer extends BaseDesigner {
      */
     public static void main(String[] args) {
 
+        FineAnalyzer.init();
+
         BuildContext.setBuildFilePath("/com/fr/stable/build.properties");
 
 

designer-realize/src/com/fr/start/module/DesignerActivator.java

@@ -304,8 +304,7 @@ public class DesignerActivator extends Activator implements Prepare {
             }
         });
     }
-    
-    
+
     private static void designerRegister() {
         registerCellEditor();
         registerFloatEditor();
@@ -394,4 +393,4 @@ public class DesignerActivator extends Activator implements Prepare {
 
         addMutable(InterMutableKey.Path, "com/fr/design/i18n/main", "com/fr/design/i18n/chart");
     }
-}
+}

designer-realize/src/com/fr/start/module/DesignerStartup.java

@@ -4,6 +4,8 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.event.Event;
 import com.fr.event.Listener;
 import com.fr.module.Activator;
+import com.fr.record.analyzer.EnableMetrics;
+import com.fr.record.analyzer.Metrics;
 import com.fr.start.Designer;
 import com.fr.start.EnvSwitcher;
 import com.fr.start.SplashContext;
@@ -17,9 +19,11 @@ import java.util.concurrent.Executors;
 /**
  * Created by juhaoyu on 2018/1/8.
  */
+@EnableMetrics
 public class DesignerStartup extends Activator {
 
     @Override
+    @Metrics
     public void start() {
         startSub(PreStartActivator.class);
         //启动基础部分