diff --git a/designer_base/src/com/fr/design/actions/help/WebDemoAction.java b/designer_base/src/com/fr/design/actions/help/WebDemoAction.java index a1808e43e7..c2cfeb9a41 100644 --- a/designer_base/src/com/fr/design/actions/help/WebDemoAction.java +++ b/designer_base/src/com/fr/design/actions/help/WebDemoAction.java @@ -23,7 +23,7 @@ public class WebDemoAction extends UpdateAction { * @param evt 事件 */ public void actionPerformed(ActionEvent evt) { - StartServer.browerDemoURL(); + StartServer.browserDemoURL(); } public static final MenuKeySet PRODUCT_DEMO = new MenuKeySet() { @@ -34,7 +34,7 @@ public class WebDemoAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("Product_Demo"); + return Inter.getLocText("FR-Product_Demo"); } @Override diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index ac49629e1a..dfc8881372 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -1990,4 +1990,5 @@ FormulaD-Data_Fields=Data Fields FR-Designer_Role=Role FR-Designer_Permissions=Permissions FR-Designer_Form_Button=Button -FR-Designer_WF_Name=Name \ No newline at end of file +FR-Designer_WF_Name=Name +FR-Product_Demo=Demo \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 8413c05968..c3e9cf7641 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -1991,4 +1991,5 @@ FormulaD-Data_Fields=Data Items FR-Designer_Role=Role FR-Designer_Permissions=Permissions FR-Designer_Form_Button=Button -FR-Designer_WF_Name=Name \ No newline at end of file +FR-Designer_WF_Name=Name +FR-Product_Demo=Demo \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index 5d8a311f78..841f431cb5 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -1982,4 +1982,5 @@ FR-Designer_Edit_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5 FR-Base_UnSignIn=\ \u672A\u30ED\u30B0\u30A4\u30F3 Every=\u6BCF CellWrite-Preview_Cell_Content=\u30BB\u30EB\u306E\u5185\u5BB9\u3092\u30D7\u30EC\u30D3\u30E5\u30FC\u3059\u308B -FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9 \ No newline at end of file +FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9 +FR-Product_Demo=\u88FD\u54C1\u30C7\u30E2 \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index dbf4da3a0b..5585ae62d5 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -1983,4 +1983,5 @@ FR-Designer_Edit_String_To_Formula=\uBB38\uC790\uC5F4\uC744\uC218\uC2DD\uC73C\uB FR-Base_UnSignIn=\uC544\uC9C1 \uB4F1\uB85D Every=\uAC01 CellWrite-Preview_Cell_Content=\uC140\uB0B4\uC6A9\uBBF8\uB9AC\uBCF4\uAE30 -FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9 \ No newline at end of file +FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9 +FR-Product_Demo=\uC81C\uD488\uC2DC\uC5F0 \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 4f044f84f6..ef6bc883d1 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -1986,4 +1986,5 @@ FormulaD-Data_Fields=\u6570\u636E\u9879 FR-Designer_Role=\u89D2\u8272 FR-Designer_Permissions=\u6743\u9650 FR-Designer_Form_Button=\u6309\u94AE -FR-Designer_WF_Name=\u540D\u79F0 \ No newline at end of file +FR-Designer_WF_Name=\u540D\u79F0 +FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 2a156e5c29..e8c7d43e7f 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -1986,4 +1986,5 @@ FormulaD-Data_Fields=\u8CC7\u6599\u9805 FR-Designer_Role=\u89D2\u8272 FR-Designer_Permissions=\u6B0A\u9650 FR-Designer_Form_Button=\u6309\u9215 -FR-Designer_WF_Name=\u540D\u7A31 \ No newline at end of file +FR-Designer_WF_Name=\u540D\u7A31 +FR-Product_Demo=\u529F\u80FD\u5C55\u793A \ No newline at end of file diff --git a/designer_base/src/com/fr/design/utils/DesignUtils.java b/designer_base/src/com/fr/design/utils/DesignUtils.java index 8ed8aa6175..96ed33711b 100644 --- a/designer_base/src/com/fr/design/utils/DesignUtils.java +++ b/designer_base/src/com/fr/design/utils/DesignUtils.java @@ -112,7 +112,7 @@ public class DesignUtils { String line = null; while ((line = reader.readLine()) != null) { if (line.startsWith("demo")) { - StartServer.browerDemoURL(); + StartServer.browserDemoURL(); } else if (StringUtils.isNotEmpty(line)) { File f = new File(line); String path = f.getAbsolutePath(); @@ -315,7 +315,7 @@ public class DesignUtils { String web = GeneralContext.getCurrentAppNameOfEnv(); String url = "http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping() + postfixOfUri; - StartServer.browerURLWithLocalEnv(url); + StartServer.browserURLWithLocalEnv(url); } catch (Throwable e) { // } diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 301a9191ff..412b657271 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -71,7 +71,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { for (String arg : args) { if (ComparatorUtils.equals(arg, "demo")) { DesignerEnvManager.getEnvManager().setCurrentEnv2Default(); - StartServer.browerDemoURL(); + StartServer.browserDemoURL(); break; } } diff --git a/designer_base/src/com/fr/start/StartServer.java b/designer_base/src/com/fr/start/StartServer.java index 31f68e800a..e21beef7b1 100644 --- a/designer_base/src/com/fr/start/StartServer.java +++ b/designer_base/src/com/fr/start/StartServer.java @@ -45,10 +45,10 @@ public class StartServer { * 预览Demo * 找默认工作目录，不应该按照名字去找，而应该按照安装路径，因为默认工作目录的名字可能会改变。 */ - public static void browerDemoURL() { + public static void browserDemoURL() { if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用 String web = GeneralContext.getCurrentAppNameOfEnv(); - browerURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping() + browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getJettyServerPort() + "/" + web + "/" + ConfigManager.getProviderInstance().getServletMapping() + "?op=fs"); return; } @@ -65,16 +65,16 @@ public class StartServer { } catch (Exception e) { FRContext.getLogger().errorWithServerLevel(e.getMessage()); } - initDemoServerAndBrower(); + initDemoServerAndBrowser(); } }).setVisible(true); } else { - initDemoServerAndBrower(); + initDemoServerAndBrowser(); } } - private static void initDemoServerAndBrower() { + private static void initDemoServerAndBrowser() { if (jettyHost != null) { if (!jettyHost.isDemoAppLoaded()) { jettyHost.exit(); @@ -104,7 +104,7 @@ public class StartServer { * * @param url 指定路径 */ - public static void browerURLWithLocalEnv(String url) { + public static void browserURLWithLocalEnv(String url) { try { if (jettyHost != null) { if (NEED_LOAD_ENV) { diff --git a/designer_chart/src/com/fr/design/mainframe/actions/ChartWebAction.java b/designer_chart/src/com/fr/design/mainframe/actions/ChartWebAction.java index 24218c8761..341e9a0eb4 100644 --- a/designer_chart/src/com/fr/design/mainframe/actions/ChartWebAction.java +++ b/designer_chart/src/com/fr/design/mainframe/actions/ChartWebAction.java @@ -50,7 +50,7 @@ public class ChartWebAction extends UpdateAction { * @param e 事件 */ public void actionPerformed(ActionEvent e) { - StartServer.browerURLWithLocalEnv("http://www.vancharts.com/demo.html"); + StartServer.browserURLWithLocalEnv("http://www.vancharts.com/demo.html"); return; } } \ No newline at end of file