|
|
|
@ -2,6 +2,7 @@ package com.fr.start;
|
|
|
|
|
|
|
|
|
|
import com.fr.base.ConfigManager; |
|
|
|
|
import com.fr.base.FRContext; |
|
|
|
|
import com.fr.dav.LocalEnv; |
|
|
|
|
import com.fr.design.DesignModelAdapter; |
|
|
|
|
import com.fr.design.DesignerEnvManager; |
|
|
|
|
import com.fr.design.data.datapane.TableDataTreePane; |
|
|
|
@ -58,28 +59,9 @@ public class StartServer {
|
|
|
|
|
+ "?op=fs"); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
DesignerEnvManager envManager = DesignerEnvManager.getEnvManager(); |
|
|
|
|
if (!envManager.isCurrentEnvDefault()) { |
|
|
|
|
InformationPane inf = new InformationPane(envManager.getDefaultEnvName()); |
|
|
|
|
inf.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { |
|
|
|
|
@Override |
|
|
|
|
public void doOk() { |
|
|
|
|
try { |
|
|
|
|
SignIn.signIn(DesignerEnvManager.getEnvManager().getDefaultEnv()); |
|
|
|
|
TemplateTreePane.getInstance().refreshDockingView(); |
|
|
|
|
TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
FRContext.getLogger().errorWithServerLevel(e.getMessage()); |
|
|
|
|
} |
|
|
|
|
initDemoServerAndBrowser(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}).setVisible(true); |
|
|
|
|
} else { |
|
|
|
|
initDemoServerAndBrowser(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static void initDemoServerAndBrowser() { |
|
|
|
|
if (jettyHost != null) { |
|
|
|
|
if (!jettyHost.isDemoAppLoaded()) { |
|
|
|
|