diff --git a/designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java
index 0db58dc361..c08f49d0c9 100644
--- a/designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java
+++ b/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"}));
diff --git a/designer-base/src/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/com/fr/design/env/DesignerWorkspaceGenerator.java
index b666b0f63f..b7b550739e 100644
--- a/designer-base/src/com/fr/design/env/DesignerWorkspaceGenerator.java
+++ b/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;
}
}
diff --git a/designer-base/src/com/fr/env/RemoteEnv.java b/designer-base/src/com/fr/env/RemoteEnv.java
index 1d8aa0de8d..1bb6064179 100644
--- a/designer-base/src/com/fr/env/RemoteEnv.java
+++ b/designer-base/src/com/fr/env/RemoteEnv.java
@@ -756,4 +756,4 @@
// return true;
// }
//
-//}
\ No newline at end of file
+//}
diff --git a/designer-realize/pom.xml b/designer-realize/pom.xml
index 3731d163e2..1e9d72c76e 100644
--- a/designer-realize/pom.xml
+++ b/designer-realize/pom.xml
@@ -11,7 +11,7 @@
com.fr.report
designer-realize
10.0-RELEASE-SNAPSHOT
-
+
com.fr.report
designer-form
diff --git a/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java b/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
index 51bba7487c..74b36372b5 100644
--- a/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java
+++ b/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);
}
diff --git a/designer-realize/src/com/fr/start/Designer.java b/designer-realize/src/com/fr/start/Designer.java
index fad29deb3f..178739fe39 100644
--- a/designer-realize/src/com/fr/start/Designer.java
+++ b/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");
diff --git a/designer-realize/src/com/fr/start/module/DesignerActivator.java b/designer-realize/src/com/fr/start/module/DesignerActivator.java
index 7fb07e640b..079dd15002 100644
--- a/designer-realize/src/com/fr/start/module/DesignerActivator.java
+++ b/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");
}
-}
+}
\ No newline at end of file
diff --git a/designer-realize/src/com/fr/start/module/DesignerStartup.java b/designer-realize/src/com/fr/start/module/DesignerStartup.java
index 1936451f26..bd43d4c831 100644
--- a/designer-realize/src/com/fr/start/module/DesignerStartup.java
+++ b/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);
//启动基础部分