X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.services%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fservices%2Fadaption%2FAdapterRegistry2.java;h=e9b59023fbb28130c45a14782805e3cdb4b864af;hb=21bef5bfa30007c081028f4f40d52a20c43794ca;hp=578b42a61d885d13cfb06e20e7c31436d00a6af2;hpb=e2f997281a0eb7c0108000e5462659f5906d3e23;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdapterRegistry2.java b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdapterRegistry2.java
index 578b42a61..e9b59023f 100644
--- a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdapterRegistry2.java
+++ b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdapterRegistry2.java
@@ -34,8 +34,8 @@ import org.simantics.db.Session;
 import org.simantics.db.adaption.Adapter;
 import org.simantics.db.adaption.AdapterInstaller;
 import org.simantics.db.adaption.AdaptionService;
-import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.request.Read;
 import org.simantics.db.services.adaption.reflection.AdaptingDynamicAdapter2;
 import org.simantics.db.services.adaption.reflection.AtMostOneRelatedResource2;
 import org.simantics.db.services.adaption.reflection.ConstantAdapter;
@@ -95,15 +95,12 @@ public class AdapterRegistry2 {
     }
 
     private static void handleException(Exception e, String fileName) {
-        System.err.println("At " + fileName);
-        e.printStackTrace();
+        LOGGER.error("At {}", fileName, e);
     }
 
     private void handleException(Exception e, AdapterInstaller installer) {
         String desc = installerSources.get(installer);
-        if (desc != null)
-            System.err.println("At " + desc);
-        e.printStackTrace();
+        LOGGER.error("At {}, installer {}", desc, installer, e);
     }
 
     private void handleAdaptersDocument(Loader b, Document doc, String fileName) {
@@ -227,7 +224,6 @@ public class AdapterRegistry2 {
 
                     }, fileName);
         } catch (Exception e) {
-            e.printStackTrace();
             handleException(e, fileName);
         }
     }
@@ -241,9 +237,9 @@ public class AdapterRegistry2 {
                 NamedNodeMap attr = n.getAttributes();
                 IDynamicAdapter2 da = null;
                 if(n.getNodeName().equals("this"))
-                    da = new ThisResource2();
+                    da = ThisResource2.INSTANCE;
                 else if(n.getNodeName().equals("graph"))
-                    da = new GraphObject2();
+                    da = GraphObject2.INSTANCE;
                 else if(n.getNodeName().equals("bundle")) {
                     String bundleId = null;
                     Node fc = n.getFirstChild();
@@ -337,9 +333,9 @@ public class AdapterRegistry2 {
     }
 
     public void updateAdaptionService(Session s, final AdaptionService service) throws DatabaseException {
-        s.syncRequest(new ReadRequest() {
+        s.syncRequest(new Read() {
             @Override
-            public void run(ReadGraph g) {
+            public Object perform(ReadGraph g) {
                 for(AdapterInstaller t : installerSources.keySet()) {
                     try {
                         t.install(g, service);
@@ -347,6 +343,7 @@ public class AdapterRegistry2 {
                         AdapterRegistry2.this.handleException(e, t);
                     }
                 }
+                return null;
             }
         });
     }