Fixed URIDocumentRequest to work also without IConsoleSupport.

[simantics/platform.git] / bundles / org.simantics.document.server / src / org / simantics / document / server / request / URIDocumentRequest.java

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 7c79e639ef98445bde2ff53b651e1550004a1aca..0086b33f7487d0889fc366be9c1f1ef15a7860e3 100644 (file)
--- 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
@@ -5,12 +5,19 @@ 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>> {
 
@@ -20,24 +27,39 @@ public class URIDocumentRequest extends UnaryRead<String, List<JSONObject>> {
 
        @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;
-                               
+
+               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