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/module/DesignerModuleActivator.java

@@ -2,7 +2,9 @@ package com.fr.start.module;
 
 import com.fr.design.module.DesignerModule;
 import com.fr.general.ModuleContext;
+import com.fr.locale.InterMutableKey;
 import com.fr.module.Activator;
+import com.fr.module.extension.Prepare;
 import com.fr.stable.module.ModuleListener;
 
 /**
@@ -10,7 +12,7 @@ import com.fr.stable.module.ModuleListener;
  * 触发原来的DesignerModule的启动
  * 之后慢慢将DesignerModule拆成Activator
  */
-public class DesignerModuleActivator extends Activator {
+public class DesignerModuleActivator extends Activator implements Prepare {
     
     @Override
     public void start() {
@@ -24,4 +26,10 @@ public class DesignerModuleActivator extends Activator {
     public void stop() {
     
     }
+    
+    @Override
+    public void prepare() {
+        
+        addMutable(InterMutableKey.Path, "com/fr/design/i18n/designer");
+    }
 }

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

@@ -3,9 +3,6 @@ package com.fr.start.module;
 import com.fr.base.FRContext;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.RestartHelper;
-import com.fr.design.module.DesignModule;
-import com.fr.general.GeneralContext;
-import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
 import com.fr.module.Activator;
 import com.fr.stable.BuildContext;
@@ -22,9 +19,6 @@ public class PreStartActivator extends Activator {
         BuildContext.setBuildFilePath("/com/fr/stable/build.properties");
         SiteCenter.getInstance();
         initLanguage();
-        
-        // 在 initLanguage 之后加载设计器国际化文件，确保是正确的语言环境
-        Inter.loadLocaleFile(GeneralContext.getLocale(), DesignModule.LOCALE_FILE_PATH);
     }
     
     private void initLanguage() {

designer_base/src/com/fr/design/data/DesignTableDataManager.java

@@ -241,7 +241,7 @@ public abstract class DesignTableDataManager {
                 boolean hasSchemaOrResult = false;
                 StoreProcedureParameter[] parameters = StoreProcedure.getSortPara(storeProcedure.getParameters());
                 String name = tableDataWrapper.getTableDataName();
-                ArrayList<String> resultNames = storeProcedure.getResultNames();
+                List<String> resultNames = storeProcedure.getResultNames();
                 TableDataWrapper tdw = new StoreProcedureNameWrapper(name + "_Table", storeProcedure);
 
                 for (StoreProcedureParameter parameter : parameters) {

designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java

@@ -186,7 +186,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
         StoreProcedure storeProcedure = (StoreProcedure) tableData;
         String name = ((NameObject) tmpNode.getUserObject()).getName();
         StoreProcedureParameter[] parameters = StoreProcedure.getSortPara(storeProcedure.getParameters());
-        ArrayList<String> resultNames = storeProcedure.getResultNames();
+        List<String> resultNames = storeProcedure.getResultNames();
         boolean hasChild = false;
         tmpNode.remove(0);
         TableDataWrapper tdw = new StoreProcedureNameWrapper(name + "_Table1", storeProcedure);