From 5abda4a5c8068b7b684b39ee136c7adb5375bdb4 Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 2 Aug 2018 15:54:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-10142=20=E3=80=9010.0=E5=86=92?= =?UTF-8?q?=E7=83=9F=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E4=B8=8A=E7=9A=84=E6=8E=A7=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=82=AC=E6=B5=AE=E4=B9=8B=E5=90=8E=20=20?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=89=E9=97=AE=E9=A2=98=3D>=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8E=A7=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/gui/core/WidgetOption.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java index be7045817..febdaa0b8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java @@ -155,7 +155,7 @@ public abstract class WidgetOption implements Serializable { Button.class); public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Free_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"), FreeButton.class); public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass( From d4c7996b414a6ac1fb2754fd34bc8be64bc9292d Mon Sep 17 00:00:00 2001 From: rinoux Date: Thu, 2 Aug 2018 20:04:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=BC=94=E7=A4=BA=E7=A8=8B=E5=BA=8F=E6=97=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/start/module/DesignerStartup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java index 9d684a821..4698b760d 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java @@ -35,6 +35,7 @@ public class DesignerStartup extends Activator { final Designer designer = new Designer(args); startSub(DesignerWorkspaceProvider.class); + registerEnvListener(); //启动env startSub(EnvBasedModule.class); @@ -48,7 +49,6 @@ public class DesignerStartup extends Activator { } } ExecutorService service = Executors.newSingleThreadExecutor(); - registerEnvListener(); service.submit(new Runnable() { @Override public void run() {