|
|
|
@ -35,6 +35,7 @@ import com.fr.start.common.DesignerStartupContext;
|
|
|
|
|
import com.fr.start.common.DesignerStartupUtil; |
|
|
|
|
import com.fr.start.event.LazyStartupEvent; |
|
|
|
|
import com.fr.workspace.base.WorkspaceStatus; |
|
|
|
|
import org.jetbrains.annotations.Nullable; |
|
|
|
|
|
|
|
|
|
import java.awt.Window; |
|
|
|
|
import java.lang.reflect.Method; |
|
|
|
@ -126,7 +127,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
|
|
|
|
|
if (args != null && args.length > 0) { |
|
|
|
|
file = DesignerStartupUtil.convertArgs2FILE(args); |
|
|
|
|
} else { |
|
|
|
|
file = FILEFactory.createFILE(FILEFactory.ENV_PREFIX + DesignerEnvManager.getEnvManager().getLastOpenFile()); |
|
|
|
|
file = getLastOpenFile(); |
|
|
|
|
} |
|
|
|
|
DesignerFrame df = DesignerContext.getDesignerFrame(); |
|
|
|
|
isException = openFile(df, isException, file); |
|
|
|
@ -142,6 +143,16 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Nullable |
|
|
|
|
private FILE getLastOpenFile() { |
|
|
|
|
|
|
|
|
|
FILE file = DesignerStartupContext.getInstance().getStartingTemplateFile(); |
|
|
|
|
if (file == null) { |
|
|
|
|
file = FILEFactory.createFILE(FILEFactory.ENV_PREFIX + DesignerEnvManager.getEnvManager().getLastOpenFile()); |
|
|
|
|
} |
|
|
|
|
return file; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private boolean openFile(final DesignerFrame df, boolean isException, FILE file) { |
|
|
|
|
|
|
|
|
|
AtomicBoolean isExWrapper = new AtomicBoolean(isException); |
|
|
|
|