Browse Source

Merge pull request #678 in DESIGN/design from ~PLOUGH/10-design:10.0 to 10.0

* commit '94857554978ca4984db9f9d9c309cb5de5b7efbb':
  REPORT-13363 数据迁移后,设计器启动闪退=>调整代码
  REPORT-13363 数据迁移后,设计器启动闪退
10.0
Kara 6 years ago
parent
commit
bca9381ea5
  1. 6
      designer-realize/src/main/java/com/fr/start/Designer.java

6
designer-realize/src/main/java/com/fr/start/Designer.java

@ -57,6 +57,7 @@ import com.fr.start.server.ServerTray;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.border.MatteBorder; import javax.swing.border.MatteBorder;
import java.awt.Component; import java.awt.Component;
@ -92,7 +93,7 @@ public class Designer extends BaseDesigner {
* @param args 参数 * @param args 参数
*/ */
public static void main(String[] args) { public static void main(String[] args) {
//启动运行时 //启动运行时
FineRuntime.start(); FineRuntime.start();
BuildContext.setBuildFilePath("/com/fr/stable/build.properties"); BuildContext.setBuildFilePath("/com/fr/stable/build.properties");
@ -115,7 +116,10 @@ public class Designer extends BaseDesigner {
try { try {
designerRoot.start(); designerRoot.start();
} catch (LifecycleFatalError fatal) { } catch (LifecycleFatalError fatal) {
SplashContext.getInstance().hide();
JOptionPane.showMessageDialog(null, fatal.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
FineLoggerFactory.getLogger().error(fatal.getMessage(), fatal); FineLoggerFactory.getLogger().error(fatal.getMessage(), fatal);
System.exit(0);
} }
if (WorkContext.getCurrent().isLocal()) { if (WorkContext.getCurrent().isLocal()) {

Loading…
Cancel
Save