Browse Source

Merge pull request #307 in DESIGN/design from release/10.0 to 10.0

* commit '921fdbc4e201e4e78a3c6bdcc6d45a22fa7b9dfc':
  无JIRA任务 启动演示程序时路径错误的问题
  REPORT-10142 【10.0冒烟】设计器参数面板上的控件,鼠标悬浮之后  显示有问题=>按钮控件名称
master
abel.chen 6 years ago
parent
commit
aaa70cbc2f
  1. 2
      designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java
  2. 2
      designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

2
designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java

@ -155,7 +155,7 @@ public abstract class WidgetOption implements Serializable {
Button.class); Button.class);
public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass( 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); FreeButton.class);
public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass( public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(

2
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); final Designer designer = new Designer(args);
startSub(DesignerWorkspaceProvider.class); startSub(DesignerWorkspaceProvider.class);
registerEnvListener();
//启动env //启动env
startSub(EnvBasedModule.class); startSub(EnvBasedModule.class);
@ -48,7 +49,6 @@ public class DesignerStartup extends Activator {
} }
} }
ExecutorService service = Executors.newSingleThreadExecutor(); ExecutorService service = Executors.newSingleThreadExecutor();
registerEnvListener();
service.submit(new Runnable() { service.submit(new Runnable() {
@Override @Override
public void run() { public void run() {

Loading…
Cancel
Save