X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Fscl%2FSCLScripts.java;h=3cd006fce736d3282e1e94e2fae2a93e692f2f61;hp=350a819fd94b9af2755c2fa28c36a33fef0ccc79;hb=d1c23bec0b9900d92fc522429ef5476757a2af93;hpb=4bb82aede02d798846196cc4f51e09d9f9161fef diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/scl/SCLScripts.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/scl/SCLScripts.java index 350a819fd..3cd006fce 100644 --- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/scl/SCLScripts.java +++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/scl/SCLScripts.java @@ -39,7 +39,7 @@ public class SCLScripts { private static final Logger LOGGER = LoggerFactory.getLogger(SCLScripts.class); - private static final String SCL_CONSOLE_ID = "org.simantics.scl.ui.console"; + private static final String SCL_SCRIPT_CONSOLE_ID = "org.simantics.scl.ui.scriptConsole"; /** * @param processor database handle @@ -78,16 +78,16 @@ public class SCLScripts { public static Pair getSCLConsoleCommandSession(boolean createIfNecessary) { IWorkbenchPart part; + SCLReportingHandler handler = SCLReportingHandler.DEFAULT_WITHOUT_ECHO; try { part = createIfNecessary - ? WorkbenchUtils.showView(SCL_CONSOLE_ID, IWorkbenchPage.VIEW_VISIBLE) - : WorkbenchUtils.findView(SCL_CONSOLE_ID); + ? WorkbenchUtils.showView(SCL_SCRIPT_CONSOLE_ID, IWorkbenchPage.VIEW_VISIBLE) + : WorkbenchUtils.findView(SCL_SCRIPT_CONSOLE_ID); if (part != null) - return Pair.make(part.getAdapter(CommandSession.class), part.getAdapter(SCLReportingHandler.class)); + return Pair.make(new CommandSession(SCLOsgi.MODULE_REPOSITORY, handler), part.getAdapter(SCLReportingHandler.class)); } catch (PartInitException e) { LOGGER.error("Failed to open SCL Console view. Using new CommandSession, reporting to stdout via Logger.", e); } - SCLReportingHandler handler = SCLReportingHandler.DEFAULT_WITHOUT_ECHO; return Pair.make(new CommandSession(SCLOsgi.MODULE_REPOSITORY, handler), SCLReportingHandler.DEFAULT); }