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. 6
      designer-base/src/main/java/com/fr/start/ServerStarter.java
  2. 8
      designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

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

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

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

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

Loading…
Cancel
Save