Browse Source

Merge pull request #645 in DESIGN/design from ~ZACK/design:10.0 to 10.0

* commit 'b0b89fb5f634e0e22d26a01416c172acb8b5e429':
  REPORT-13215 10.0设计器启动过程中可能由于报错导致白色蒙层不消失.同步master
10.0
Kara 6 years ago
parent
commit
1a6f50240a
  1. 4
      designer-base/src/main/java/com/fr/start/ServerStarter.java
  2. 4
      designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

4
designer-base/src/main/java/com/fr/start/ServerStarter.java

@ -66,7 +66,11 @@ public class ServerStarter {
@Override @Override
public void run() { public void run() {
try {
FineEmbedServer.start(); FineEmbedServer.start();
} finally {
FineEmbedServerMonitor.getInstance().setComplete();
}
BrowseUtils.browser(url); BrowseUtils.browser(url);
} }
}); });

4
designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

@ -52,10 +52,12 @@ public class DesignerStartup extends Activator {
@Override @Override
public void run() { public void run() {
try {
designer.show(args); designer.show(args);
} finally {
DesignerContext.getDesignerFrame().getProgressDialog().dispose(); DesignerContext.getDesignerFrame().getProgressDialog().dispose();
} }
}
}); });
service.shutdown(); service.shutdown();
DesignerContext.getDesignerFrame().setVisible(true); DesignerContext.getDesignerFrame().setVisible(true);

Loading…
Cancel
Save