Attempt to fix regressions in new code base

[simantics/platform.git] / bundles / org.simantics.db.services / src / org / simantics / db / services / adaption / reflection / ReflectionAdapter2.java

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 251cb764296ca486421cd51a4f300056f4a8ab69..187fc52199a390f37b68b3a48a940d20faa4d359 100644 (file)
--- 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,9 +17,8 @@ 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.common.request.AsyncReadRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.procedure.AsyncProcedure;
 
@@ -79,10 +78,10 @@ public class ReflectionAdapter2<T> implements Adapter<T, Resource> {
                
        } else {
        
-            g.asyncRequest(new ReadRequest() {
+            g.asyncRequest(new AsyncReadRequest() {
     
                 @Override
-                public void run(ReadGraph graph) throws DatabaseException {
+                public void run(AsyncReadGraph graph) {
                        
                     Object[] args = new Object[parameters.length];
                     try {
@@ -90,22 +89,22 @@ public class ReflectionAdapter2<T> implements Adapter<T, Resource> {
                                args[i] = parameters[i].adapt(graph, r);
                        procedure.execute(graph, constructor.newInstance(args));
                                } catch (IllegalArgumentException e) {
-                                   procedure.exception(graph, e);
+                                   procedure.exception(g, e);
                                        e.printStackTrace();
                                } catch (InstantiationException e) {
-                        procedure.exception(graph, e);
+                        procedure.exception(g, e);
                                        e.printStackTrace();
                                } catch (IllegalAccessException e) {
-                        procedure.exception(graph, e);
+                        procedure.exception(g, e);
                                        e.printStackTrace();
                                } catch (InvocationTargetException e) {
-                        procedure.exception(graph, e.getCause());
+                        procedure.exception(g, e.getCause());
                                        e.getCause().printStackTrace();
                                } catch (DatabaseException e) {
-                        procedure.exception(graph, e);
+                        procedure.exception(g, e);
                                        e.printStackTrace();
                                } catch (Throwable t) {
-                                   procedure.exception(graph, t);
+                                   procedure.exception(g, t);
                                    t.printStackTrace();
                                }
                 }