Yet another fixing commit

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

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/DocumentRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/DocumentRequest.java
index 779cf4fe1381acb5979e541d54fce12047115103..2f4f7eec62c3f887a70d7b8871cea1a347c3ad52 100644 (file)
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/DocumentRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/DocumentRequest.java
@@ -6,12 +6,9 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
 
 import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.ReadGraph;
-import org.simantics.db.common.GraphSemaphore;
 import org.simantics.db.common.procedure.adapter.TransientCacheAsyncListener;
 import org.simantics.db.common.request.AsyncReadRequest;
 import org.simantics.db.exception.DatabaseException;
@@ -82,44 +79,6 @@ public class DocumentRequest extends VariableRead<List<JSONObject>> {
                        System.out.println("               " + node.getURI(graph));
                }*/
 
-<<<<<<< Upstream, based on branch 'private/antti_threads' of ssh://villberg@gerrit.simantics.org:29418/simantics/platform.git
-               GraphSemaphore done = new GraphSemaphore(graph, 0);
-               
-               for(Variable node : nodes) {
-                       
-                       graph.asyncRequest(new NodeRequestE(node), new Listener<JSONObject>() {
-
-                                       @Override
-                                       public void execute(JSONObject result) {
-                                               synchronized(rs) {
-                                                       rs.add(result);
-                                               }
-                                               done.release();
-                                       }
-
-                                       @Override
-                                       public void exception(Throwable t) {
-                                               t.printStackTrace();
-                                               done.release();
-                                       }
-
-                                       @Override
-                                       public boolean isDisposed() {
-                                               return true;
-                                       }
-                                       
-                               });
-                       
-//                 rs.add(graph.syncRequest(new NodeRequest(node), TransientCacheAsyncListener.<JSONObject>instance()));
-                       
-               }
-               
-               try {
-                       done.waitFor(nodes.size());
-                       } catch (InterruptedException e) {
-                               e.printStackTrace();
-                       }
-=======
                graph.syncRequest(new AsyncReadRequest() {
                                
                                @Override
@@ -153,7 +112,6 @@ public class DocumentRequest extends VariableRead<List<JSONObject>> {
                                }
                                
                        });
->>>>>>> 82fa68e Generate parts of db client query code
        
                        ArrayList<JSONObject> result = new ArrayList<JSONObject>(rs);
                        Collections.sort(result, new Comparator<JSONObject>() {