From 8af4238d849a48e950ed7efd965c34b9c02ab9cf Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 20 Mar 2018 14:31:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CORE-57=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=87=87=E7=94=A8=E6=A8=A1=E5=9D=97=E5=8C=96?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=9A=84=E6=96=B9=E5=BC=8F=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/start/module/DesignerModuleActivator.java | 10 +++++++++- .../src/com/fr/start/module/PreStartActivator.java | 6 ------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/designer/src/com/fr/start/module/DesignerModuleActivator.java b/designer/src/com/fr/start/module/DesignerModuleActivator.java index c51444ef54..fcb00d03e0 100644 --- a/designer/src/com/fr/start/module/DesignerModuleActivator.java +++ b/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"); + } } diff --git a/designer/src/com/fr/start/module/PreStartActivator.java b/designer/src/com/fr/start/module/PreStartActivator.java index e11997b346..9ef1af8dc7 100644 --- a/designer/src/com/fr/start/module/PreStartActivator.java +++ b/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() { From f98c49de2e05f9b69de5160ae9d726472feb3bb4 Mon Sep 17 00:00:00 2001 From: CL <824983662@qq.com> Date: Wed, 21 Mar 2018 14:01:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E5=8F=98=E7=9A=84list?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=BC=BA=E8=BD=AC=E6=88=90ArrayList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/data/DesignTableDataManager.java | 2 +- .../src/com/fr/design/data/datapane/TableDataSourceOP.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/data/DesignTableDataManager.java b/designer_base/src/com/fr/design/data/DesignTableDataManager.java index fb09ab7cf9..f3fc75c637 100644 --- a/designer_base/src/com/fr/design/data/DesignTableDataManager.java +++ b/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 resultNames = storeProcedure.getResultNames(); + List resultNames = storeProcedure.getResultNames(); TableDataWrapper tdw = new StoreProcedureNameWrapper(name + "_Table", storeProcedure); for (StoreProcedureParameter parameter : parameters) { diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java b/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java index 2c7d7726f3..c5d0908753 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java @@ -186,7 +186,7 @@ public class TableDataSourceOP implements UserObjectOP { StoreProcedure storeProcedure = (StoreProcedure) tableData; String name = ((NameObject) tmpNode.getUserObject()).getName(); StoreProcedureParameter[] parameters = StoreProcedure.getSortPara(storeProcedure.getParameters()); - ArrayList resultNames = storeProcedure.getResultNames(); + List resultNames = storeProcedure.getResultNames(); boolean hasChild = false; tmpNode.remove(0); TableDataWrapper tdw = new StoreProcedureNameWrapper(name + "_Table1", storeProcedure);