Merge "Adding SCL REST server feature and including to SDK"

[simantics/platform.git] / bundles / org.simantics.scl.ui / src / org / simantics / scl / ui / console / SCLConsoleView.java

diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/console/SCLConsoleView.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/console/SCLConsoleView.java
index a7eb4332333cc0cba1a4325c36e69b829c7a7a75..8b49ea345fac656a70b4027959b297f7c4cfa889 100644 (file)
--- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/console/SCLConsoleView.java
+++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/console/SCLConsoleView.java
@@ -30,11 +30,13 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
+import org.simantics.scl.compiler.commands.CommandSession;
 import org.simantics.scl.compiler.commands.CommandSessionImportEntry;
 import org.simantics.scl.compiler.commands.SCLConsoleListener;
 import org.simantics.scl.compiler.module.repository.UpdateListener;
 import org.simantics.scl.compiler.testing.TestRunnable;
 import org.simantics.scl.osgi.internal.TestUtils;
+import org.simantics.scl.runtime.reporting.SCLReportingHandler;
 import org.simantics.scl.ui.Activator;
 import org.simantics.scl.ui.imports.internal.ManageImportsDialog;
 import org.simantics.scl.ui.tests.SCLTestsDialog;
@@ -168,6 +170,8 @@ public class SCLConsoleView extends ViewPart {
     @Override
     public void createPartControl(Composite parent) {
         store = new ScopedPreferenceStore(InstanceScope.INSTANCE, PLUGIN_ID);
+        store.setDefault(REFRESH_AUTOMATICALLY, true);
+        
         this.console = new SCLConsole(parent, SWT.NONE);
         
         setRefreshAutomatically(store.getBoolean(REFRESH_AUTOMATICALLY), false);
@@ -335,4 +339,14 @@ public class SCLConsoleView extends ViewPart {
         console.dispose();
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T getAdapter(Class<T> adapter) {
+        if (adapter == CommandSession.class)
+            return (T) console.getSession();
+        if (adapter == SCLReportingHandler.class)
+            return (T) console.getHandler();
+        return super.getAdapter(adapter);
+    }
+
 }