From eab8d702ec8821091d6b55b71546ad6ca2746f3d Mon Sep 17 00:00:00 2001 From: Harrison Date: Wed, 22 Aug 2018 21:14:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-10785=20report=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=99=BE=E5=A4=9A=E4=B8=AA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=A7=84=E8=8C=83=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/env/EnvListPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/env/EnvListPane.java b/designer-base/src/main/java/com/fr/env/EnvListPane.java index 59eaea4e6..b8f99de11 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -53,7 +53,7 @@ public class EnvListPane extends JListControlPane { */ @Override public NameableCreator[] createNameableCreators() { - NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", + NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", LocalDesignerWorkspaceInfo.class, LocalEnvPane.class); NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png", RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class); From 8794a3282bfb99cef37c148c5222bc28c4c1a166 Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 23 Aug 2018 22:13:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-10785=20report=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=99=BE=E5=A4=9A=E4=B8=AA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=A7=84=E8=8C=83=E4=B8=8B=20=E5=88=86=E5=87=BA=20cor?= =?UTF-8?q?e-server=20/=20core-web?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/extra/PluginUtils.java | 2 +- .../java/com/fr/design/webattr/ReportWebWidgetConstants.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java b/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java index 50f81d574..ba8fdc408 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java @@ -177,7 +177,7 @@ public class PluginUtils { private static String getInterKeyByErrorCode(PluginErrorCode errorCode) { - return ERROR_CODE_I18N_PREFIX + errorCode.getDescription(); + return errorCode.getDescription(); } public static PluginMarker getInstalledPluginMarkerByID(String pluginID) { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java index 9cc57ce50..6c70d6843 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java @@ -101,7 +101,7 @@ public class ReportWebWidgetConstants { // 导出成Word public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class); // 页面设置 - public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class); + public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Report_PageSetup_Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class); // 导出 public static final WidgetOption EXPORT = WidgetOptionFactory .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Export"), BaseUtils.readIcon("/com/fr/web/images/export.png"), Export.class); From 2a3080183965dac1bce5f61d07f01d3387440e2f Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 23 Aug 2018 22:54:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-10785=20report=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E7=99=BE=E5=A4=9A=E4=B8=AA=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=A7=84=E8=8C=83=E4=B8=8B=20=E6=94=B9=E9=94=99?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/webattr/ReportWebWidgetConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java index 6c70d6843..9cc57ce50 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java @@ -101,7 +101,7 @@ public class ReportWebWidgetConstants { // 导出成Word public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class); // 页面设置 - public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Report_PageSetup_Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class); + public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class); // 导出 public static final WidgetOption EXPORT = WidgetOptionFactory .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Export"), BaseUtils.readIcon("/com/fr/web/images/export.png"), Export.class); From 8c595308481f7e3e852d78d1f90f01a456dd9930 Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 24 Aug 2018 10:41:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-10490=20=E3=80=90=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=8D=87=E7=BA=A710.0=E3=80=91=E8=BF=9C=E7=A8=8B=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=96=AD=E5=BC=80=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/socketio/DesignerSocketIO.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java index 33f1558b9..6318d0e05 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java @@ -23,6 +23,7 @@ import io.socket.emitter.Emitter; import javax.swing.*; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.net.URL; @@ -80,9 +81,17 @@ public class DesignerSocketIO { @Override public void call(Object... objects) { if (status != Status.Disconnecting) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Disconnected"), - null, 0, UIManager.getIcon("OptionPane.errorIcon")); - TemplatePane.getInstance().editItems(); + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Disconnected"), + null, 0, UIManager.getIcon("OptionPane.errorIcon")); + TemplatePane.getInstance().editItems(); + } + }); + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } } status = Status.Disconnected; } From c51d7d034c27e0a5ca5153b39c745cee7d62172a Mon Sep 17 00:00:00 2001 From: plough Date: Fri, 24 Aug 2018 10:42:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?REPORT-10490=20=E3=80=90=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=8D=87=E7=BA=A710.0=E3=80=91=E8=BF=9C=E7=A8=8B=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=96=AD=E5=BC=80=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD=3D>=E6=95=B4?= =?UTF-8?q?=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/socketio/DesignerSocketIO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java index 6318d0e05..e9b12e7b1 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java @@ -6,7 +6,6 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.TemplatePane; import com.fr.design.mainframe.loghandler.DesignerLogHandler; import com.fr.event.EventDispatcher; - import com.fr.log.FineLoggerFactory; import com.fr.serialization.SerializerHelper; import com.fr.stable.ArrayUtils; @@ -21,9 +20,10 @@ import io.socket.client.IO; import io.socket.client.Socket; import io.socket.emitter.Emitter; -import javax.swing.*; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.net.URL;