X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FURIDocumentRequest.java;h=0086b33f7487d0889fc366be9c1f1ef15a7860e3;hp=0f9325d7be665e8b082641378274ba253db20214;hb=ae2e31aa5eb35410e5b2ce222d42421154f3fecc;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/URIDocumentRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/URIDocumentRequest.java
index 0f9325d7b..0086b33f7 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/URIDocumentRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/URIDocumentRequest.java
@@ -1,43 +1,65 @@
-package org.simantics.document.server.request;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.simantics.db.ReadGraph;
-import org.simantics.db.common.request.UnaryRead;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.variable.Variable;
-import org.simantics.db.layer0.variable.Variables;
-import org.simantics.document.server.JSONObject;
-
-public class URIDocumentRequest extends UnaryRead<String, List<JSONObject>> {
-
-    public URIDocumentRequest(String var) {
-        super(var);
-	}
-
-	@Override
-	public List<JSONObject> perform(ReadGraph graph) throws DatabaseException {
-		
-		Variable var = Variables.getPossibleVariable(graph, parameter);
-		if(var == null) {
-			Variables.getPossibleVariable(graph, parameter);
-			return Collections.emptyList();
-		}
-		
-		ArrayList<JSONObject> result = new ArrayList<JSONObject>(graph.syncRequest(new DocumentRequest(var)));
-		Collections.sort(result, new Comparator<JSONObject>() {
-
-			@Override
-			public int compare(JSONObject o1, JSONObject o2) {
-				return o1.id.compareTo(o2.id);
-			}
-			
-		});
-		return result;
-				
-	}
-	
+package org.simantics.document.server.request;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.simantics.Simantics;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.common.request.UnaryRead;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.variable.ProxyVariables;
+import org.simantics.db.layer0.variable.Variable;
+import org.simantics.db.layer0.variable.Variables;
+import org.simantics.document.server.ConsoleSCLReportingHandler;
+import org.simantics.document.server.JSONObject;
+import org.simantics.document.server.io.IConsole;
+import org.simantics.document.server.io.IConsoleSupport;
+import org.simantics.scl.runtime.SCLContext;
+import org.simantics.scl.runtime.reporting.SCLReportingHandler;
+
+public class URIDocumentRequest extends UnaryRead<String, List<JSONObject>> {
+
+    public URIDocumentRequest(String var) {
+        super(var);
+	}
+
+	@Override
+	public List<JSONObject> perform(ReadGraph graph) throws DatabaseException {
+
+		Variable var = Variables.getPossibleVariable(graph, parameter);
+		if(var == null) {
+			Variables.getPossibleVariable(graph, parameter);
+			return Collections.emptyList();
+		}
+
+		IConsole console = null;
+		IConsoleSupport cs = Simantics.getSession().peekService(IConsoleSupport.class);
+		if (cs != null) {
+			Variable root = ProxyVariables.proxyVariableRoot(graph, var);
+			if (root == null)
+				return Collections.emptyList();
+			Variable session = root.getParent(graph);
+			String guid = session.getName(graph);
+			console = cs.getConsole(guid);
+		}
+
+		SCLContext sclContext = SCLContext.getCurrent();
+		SCLReportingHandler printer = (console != null) ? new ConsoleSCLReportingHandler(console)
+				: (SCLReportingHandler) sclContext.get(SCLReportingHandler.REPORTING_HANDLER);
+		Object oldPrinter = sclContext.put(SCLReportingHandler.REPORTING_HANDLER, printer);
+
+		try {
+			List<JSONObject> result = new ArrayList<>(graph.syncRequest(new DocumentRequest(var)));
+			Collections.sort(result, COMPARATOR);
+			return result;
+		} finally {
+			sclContext.put(SCLReportingHandler.REPORTING_HANDLER, oldPrinter);
+		}
+
+	}
+
+	private static final Comparator<JSONObject> COMPARATOR = (o1, o2) -> o1.id.compareTo(o2.id);
+
 }
\ No newline at end of file