Browse Source

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

* commit 'ef07745d35dede2b4b34111828f9abbe263e563a':
  REPORT-13215 10.0设计器启动过程中可能由于报错导致白色蒙层不消失
  rt
  rt
  REPORT-13215 10.0设计器启动过程中可能由于报错导致白色蒙层不消失
final/10.0
neil 6 years ago
parent
commit
26ce821984
  1. 13
      designer-base/src/main/java/com/fr/start/ServerStarter.java
  2. 8
      designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

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

@ -5,18 +5,11 @@ import com.fr.design.DesignerEnvManager;
import com.fr.design.utils.BrowseUtils;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.OperatingSystem;
import com.fr.stable.StableUtils;
import com.fr.start.server.FineEmbedServer;
import com.fr.start.server.FineEmbedServerMonitor;
import com.fr.workspace.WorkContext;
import javax.swing.JOptionPane;
import java.awt.Desktop;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@ -66,7 +59,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