Merge branch 'feature/10.0' of http://www.cloud.finedevelop.com:2015/scm/~zheng/C-design into feature/10.0

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

@@ -87,6 +87,8 @@ public class Designer extends BaseDesigner {
         //传递启动参数
         designerRoot.setSingleton(StartupArgs.class, new StartupArgs(args));
         designerRoot.start();
+        // 预启动一下
+        StartServer.start();
     }
 
     public Designer(String[] args) {

designer/src/com/fr/start/module/DesignerModuleActivator.java

@@ -30,6 +30,6 @@ public class DesignerModuleActivator extends Activator implements Prepare {
     @Override
     public void prepare() {
         
-        addMutable(InterMutableKey.Path, "com/fr/design/i18n/designer");
+        addMutable(InterMutableKey.Path, "com/fr/design/i18n/main", "com/fr/design/i18n/chart");
     }
 }

designer_base/src/com/fr/design/module/DesignModule.java

@@ -36,7 +36,7 @@ import java.util.Set;
  * 所有设计器模块的父类
  */
 public abstract class DesignModule extends TopModule {
-    public static final String LOCALE_FILE_PATH = "com/fr/design/locale/designer";
+    public static final String LOCALE_FILE_PATH = "com/fr/design/i18n/main";
 
     public void start() {
         super.start();

designer_base/src/com/fr/start/StartServer.java

@@ -34,6 +34,7 @@ public class StartServer {
     // 原先的tomcatHost放在类TomcatHost里面，很不方便操作，而且因为存在多个进程的原因，
     // 原先的getInstance()方法无多大意义
     private static TomcatHost tomcatHost = null;
+    private static Object lock = new Object();
 
     static {
         GeneralContext.addEnvChangedListener(new EnvChangedListener() {
@@ -80,15 +81,17 @@ public class StartServer {
     }
 
     private static void initDemoServerAndBrowser() {
-        if (tomcatHost != null) {
-            if (!tomcatHost.isDemoAppLoaded()) {
-                tomcatHost.exit();
+        synchronized (lock) {
+            if (tomcatHost != null) {
+                if (!tomcatHost.isDemoAppLoaded()) {
+                    tomcatHost.exit();
+                    tomcatHost = new TomcatHost(DesignerEnvManager.getEnvManager().getJettyServerPort());
+                    tomcatHost.addAndStartInstallHomeWebApp();
+                }
+            } else {
                 tomcatHost = new TomcatHost(DesignerEnvManager.getEnvManager().getJettyServerPort());
                 tomcatHost.addAndStartInstallHomeWebApp();
             }
-        } else {
-            tomcatHost = new TomcatHost(DesignerEnvManager.getEnvManager().getJettyServerPort());
-            tomcatHost.addAndStartInstallHomeWebApp();
         }
         try {
             if (!tomcatHost.isStarted()) {
@@ -103,24 +106,21 @@ public class StartServer {
         }
     }
 
-    /**
-     * 本地环境浏览url
-     *
-     * @param url 指定路径
-     */
-    public static void browserURLWithLocalEnv(String url) {
+    public static void start() {
         try {
-            if (tomcatHost != null) {
-                if (NEED_LOAD_ENV) {
-                    tomcatHost.exit();
+            synchronized (lock) {
+                if (tomcatHost != null) {
+                    if (NEED_LOAD_ENV) {
+                        tomcatHost.exit();
+                        tomcatHost = new TomcatHost(DesignerEnvManager.getEnvManager().getJettyServerPort());
+                        tomcatHost.addAndStartLocalEnvHomeWebApp();
+
+                    }
+                } else {
                     tomcatHost = new TomcatHost(DesignerEnvManager.getEnvManager().getJettyServerPort());
                     tomcatHost.addAndStartLocalEnvHomeWebApp();
 
                 }
-            } else {
-                tomcatHost = new TomcatHost(DesignerEnvManager.getEnvManager().getJettyServerPort());
-                tomcatHost.addAndStartLocalEnvHomeWebApp();
-
             }
             if (!tomcatHost.isStarted()) {
                 tomcatHost.start();
@@ -131,10 +131,19 @@ public class StartServer {
             FRContext.getLogger().errorWithServerLevel(e.getMessage());
         } finally {
             NEED_LOAD_ENV = false;
-            browser(url);
         }
     }
 
+    /**
+     * 本地环境浏览url
+     *
+     * @param url 指定路径
+     */
+    public static void browserURLWithLocalEnv(String url) {
+        start();
+        browser(url);
+    }
+
     public static TomcatHost getInstance() {
         // august： 正确的逻辑能保证jettyHost不为null，不然就有bug，不允许这儿加是否等于null判断
         return tomcatHost;