Browse Source

REPORT-13215 10.0设计器启动过程中可能由于报错导致白色蒙层不消失

final/10.0
zack 6 years ago
parent
commit
20a39e41ed
  1. 2
      designer-base/src/main/java/com/fr/start/BaseDesigner.java
  2. 13
      designer-base/src/main/java/com/fr/start/ServerStarter.java

2
designer-base/src/main/java/com/fr/start/BaseDesigner.java

@ -64,6 +64,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
TemplateTreePane.getInstance().getTemplateFileTree().refresh(); TemplateTreePane.getInstance().getTemplateFileTree().refresh();
} }
DesignerContext.getDesignerFrame().updateProgress(PERCENT_COMPLETE); DesignerContext.getDesignerFrame().updateProgress(PERCENT_COMPLETE);
throw new NullPointerException();
} }

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.design.utils.BrowseUtils;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext; import com.fr.general.GeneralContext;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.OperatingSystem;
import com.fr.stable.StableUtils; import com.fr.stable.StableUtils;
import com.fr.start.server.FineEmbedServer; import com.fr.start.server.FineEmbedServer;
import com.fr.start.server.FineEmbedServerMonitor; import com.fr.start.server.FineEmbedServerMonitor;
import com.fr.workspace.WorkContext; 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.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -66,7 +59,11 @@ public class ServerStarter {
@Override @Override
public void run() { public void run() {
FineEmbedServer.start(); try {
FineEmbedServer.start();
} finally {
FineEmbedServerMonitor.getInstance().setComplete();
}
BrowseUtils.browser(url); BrowseUtils.browser(url);
} }
}); });

Loading…
Cancel
Save