X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.services%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fservices%2Fadaption%2Freflection%2FReflectionAdapter2.java;h=870b17e78e6132439e450b27ef42053bf03d99f0;hb=refs%2Fheads%2Fprivate%2Fantin_tyomaa;hp=ed750f538f615140b893d3ece55f3711d670226d;hpb=9f0fd59be54719b1fe9322d8fd37e4950857308c;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/ReflectionAdapter2.java b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/ReflectionAdapter2.java
index ed750f538..870b17e78 100644
--- a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/ReflectionAdapter2.java
+++ b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/ReflectionAdapter2.java
@@ -17,11 +17,10 @@ import java.util.Arrays;
 
 import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.Resource;
-import org.simantics.db.ReadGraph;
 import org.simantics.db.adaption.Adapter;
-import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.procedure.AsyncProcedure;
+import org.simantics.db.request.AsyncRead;
 
 public class ReflectionAdapter2<T> implements Adapter<T, Resource> {
 
@@ -79,35 +78,36 @@ public class ReflectionAdapter2<T> implements Adapter<T, Resource> {
     		
     	} else {
     	
-            g.asyncRequest(new ReadRequest() {
-    
+            g.asyncRequest(new AsyncRead() {
+                
                 @Override
-                public void run(ReadGraph graph) throws DatabaseException {
-                	
+                public void perform(AsyncReadGraph graph, AsyncProcedure p) {
+                    
                     Object[] args = new Object[parameters.length];
                     try {
-                    	for(int i=0;i<parameters.length;++i)
-                    		args[i] = parameters[i].adapt(graph, r);
-                    	procedure.execute(g, constructor.newInstance(args));
-    				} catch (IllegalArgumentException e) {
-    				    procedure.exception(g, e);
-    					e.printStackTrace();
-    				} catch (InstantiationException e) {
-                        procedure.exception(g, e);
-    					e.printStackTrace();
-    				} catch (IllegalAccessException e) {
-                        procedure.exception(g, e);
-    					e.printStackTrace();
-    				} catch (InvocationTargetException e) {
-                        procedure.exception(g, e.getCause());
-    					e.getCause().printStackTrace();
-    				} catch (DatabaseException e) {
-                        procedure.exception(g, e);
-    					e.printStackTrace();
-    				} catch (Throwable t) {
-    				    procedure.exception(g, t);
-    				    t.printStackTrace();
-    				}
+                        for(int i=0;i<parameters.length;++i)
+                            args[i] = parameters[i].adapt(graph, r);
+                        p.execute(graph, constructor.newInstance(args));
+                    } catch (IllegalArgumentException e) {
+                        p.exception(g, e);
+                        e.printStackTrace();
+                    } catch (InstantiationException e) {
+                        p.exception(g, e);
+                        e.printStackTrace();
+                    } catch (IllegalAccessException e) {
+                        p.exception(g, e);
+                        e.printStackTrace();
+                    } catch (InvocationTargetException e) {
+                        p.exception(g, e.getCause());
+                        e.getCause().printStackTrace();
+                    } catch (DatabaseException e) {
+                        p.exception(g, e);
+                        e.printStackTrace();
+                    } catch (Throwable t) {
+                        p.exception(g, t);
+                        t.printStackTrace();
+                    }
+                    
                 }
                 
                 @Override
@@ -115,7 +115,7 @@ public class ReflectionAdapter2<T> implements Adapter<T, Resource> {
                 	return "ReflectionAdapter$1" + constructor + "$" + Arrays.toString(parameters);
                 }
                 
-            });
+            }, procedure);
         
     	}