From 57aa1021eb53850cf9b0c987c3fa1c8c405e3632 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 17 Aug 2018 12:01:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?DEC-3945=20=E6=8F=92=E4=BB=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=E8=84=9A=E6=9C=AC=E7=9A=84=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E7=8B=AC=E7=AB=8B=E5=88=B0scripts=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/extra/PluginWebBridge.java | 8 -------- .../src/main/java/com/fr/design/extra/PluginWebPane.java | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java index ba2ee26f34..de96c10b9b 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java @@ -53,7 +53,6 @@ public class PluginWebBridge { private static final String PLUGIN_INFO = "pluginInfo"; private static final int COREPOOLSIZE = 3; private static final int MAXPOOLSIZE = 5; - private static final String I18N_PREFIX = "FR-"; private static PluginWebBridge helper; @@ -571,13 +570,6 @@ public class PluginWebBridge { //todo 初始化设计器其他部分 } - /** - * 国际化 - */ - public String parseI18(final String key) { - return com.fr.design.i18n.Toolkit.i18nText(I18N_PREFIX + key); - } - /** * 是否是在设计器中操作 */ diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java index 1d3f1ac2b7..3e2cafdfea 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java @@ -1,6 +1,7 @@ package com.fr.design.extra; import com.fr.base.TemplateUtils; +import com.fr.general.GeneralContext; import com.fr.general.IOUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.StableUtils; @@ -30,6 +31,7 @@ import java.util.Map; */ public class PluginWebPane extends JFXPanel { private static final String RESOURCE_URL = "resourceURL"; + private static final String LANGUAGE = "language"; private WebEngine webEngine; public PluginWebPane(final String installHome, final String mainJs) { @@ -75,6 +77,7 @@ public class PluginWebPane extends JFXPanel { Map map4Tpl = new HashMap(); map4Tpl.put(RESOURCE_URL, "file:///" + URLEncoder.encode(installHome, "UTF-8")); + map4Tpl.put(LANGUAGE, GeneralContext.getLocale().toString()); while ((line = read.readLine()) != null) { if (sb.length() > 0) { sb.append('\n'); From db4ced49cb2a7930be2f339f6715bd3d0419917f Mon Sep 17 00:00:00 2001 From: richie Date: Fri, 17 Aug 2018 15:09:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9pom=E7=89=88=E6=9C=AC=E5=8F=B7=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/pom.xml | 9 ++--- .../actions/help/ConfigManagerAction.java | 33 +++++++++++++++++++ designer-chart/pom.xml | 6 ++-- designer-form/pom.xml | 6 ++-- designer-realize/pom.xml | 8 ++--- pom.xml | 4 +-- 6 files changed, 50 insertions(+), 16 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/actions/help/ConfigManagerAction.java diff --git a/designer-base/pom.xml b/designer-base/pom.xml index d97a420933..25e3c1ec51 100644 --- a/designer-base/pom.xml +++ b/designer-base/pom.xml @@ -6,8 +6,11 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 + com.fr.report + designer-base + ${branch}-SNAPSHOT io.socket @@ -15,7 +18,5 @@ 0.7.0 - com.fr.report - designer-base - 10.0-RELEASE-SNAPSHOT + \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/actions/help/ConfigManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/help/ConfigManagerAction.java new file mode 100644 index 0000000000..20d146b880 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/actions/help/ConfigManagerAction.java @@ -0,0 +1,33 @@ +package com.fr.design.actions.help; + +import com.fr.config.ConfigContext; +import com.fr.design.actions.UpdateAction; +import com.fr.design.dialog.BasicPane; +import com.fr.workspace.WorkContext; + +import java.awt.event.ActionEvent; + +public class ConfigManagerAction extends UpdateAction { + + + public ConfigManagerAction() { + setName("ConfigManager"); + } + + @Override + public void actionPerformed(ActionEvent e) { + + } + + public static class ConfigManagerPane extends BasicPane { + + public ConfigManagerPane() { + + } + + @Override + protected String title4PopupWindow() { + return "ConfigManagerPane"; + } + } +} diff --git a/designer-chart/pom.xml b/designer-chart/pom.xml index 472b1e62ba..6a6bc80c09 100644 --- a/designer-chart/pom.xml +++ b/designer-chart/pom.xml @@ -6,16 +6,16 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-chart - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file diff --git a/designer-form/pom.xml b/designer-form/pom.xml index 19df80505a..31c439f0cb 100644 --- a/designer-form/pom.xml +++ b/designer-form/pom.xml @@ -6,16 +6,16 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-form - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file diff --git a/designer-realize/pom.xml b/designer-realize/pom.xml index 1e9d72c76e..a0b56b093a 100644 --- a/designer-realize/pom.xml +++ b/designer-realize/pom.xml @@ -6,21 +6,21 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-realize - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-form - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-chart - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3398bbd08a..408bc7be85 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.fr.report fine-report-designer - 10.0-RELEASE-SNAPSHOT + 10.0 ../design-settings/fine-report-designer @@ -19,7 +19,7 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 pom From 66ee1e7028eab11c2c6dd34f9f31ef85ab29549c Mon Sep 17 00:00:00 2001 From: richie Date: Fri, 17 Aug 2018 15:11:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=94=99=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=B1=BB=EF=BC=8C=E5=88=A0=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/help/ConfigManagerAction.java | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 designer-base/src/main/java/com/fr/design/actions/help/ConfigManagerAction.java diff --git a/designer-base/src/main/java/com/fr/design/actions/help/ConfigManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/help/ConfigManagerAction.java deleted file mode 100644 index 20d146b880..0000000000 --- a/designer-base/src/main/java/com/fr/design/actions/help/ConfigManagerAction.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.fr.design.actions.help; - -import com.fr.config.ConfigContext; -import com.fr.design.actions.UpdateAction; -import com.fr.design.dialog.BasicPane; -import com.fr.workspace.WorkContext; - -import java.awt.event.ActionEvent; - -public class ConfigManagerAction extends UpdateAction { - - - public ConfigManagerAction() { - setName("ConfigManager"); - } - - @Override - public void actionPerformed(ActionEvent e) { - - } - - public static class ConfigManagerPane extends BasicPane { - - public ConfigManagerPane() { - - } - - @Override - protected String title4PopupWindow() { - return "ConfigManagerPane"; - } - } -}