X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FSingleObjectWithType.java;h=a986034889963bf6eedcdd99ff17fc4c3d9d2aef;hp=c2fd2d18fc06cf17e12131c0ff8fe0dcec81bcaf;hb=bc5e6cb19f6af5f67bc5cfaad7d602841b8fdd0b;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/SingleObjectWithType.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/SingleObjectWithType.java
index c2fd2d18f..a98603488 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/SingleObjectWithType.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/SingleObjectWithType.java
@@ -1,53 +1,55 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.db.common.request;
-
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.common.utils.NameUtils;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.exception.NoSingleResultException;
-
-/**
- * @author Tuukka Lehtonen
- */
-public final class SingleObjectWithType extends ResourceRead3<Resource> {
-
-    public SingleObjectWithType(Resource resource, Resource predicate, Resource type) {
-        super(resource, predicate, type);
-    }
-
-    @Override
-    public Resource perform(ReadGraph graph) throws DatabaseException {
-        Resource result = null;
-        for (Resource object : graph.getObjects(resource, resource2)) {
-            if (graph.isInstanceOf(object, resource3)) {
-                if (result != null)
-                    throw new NoSingleResultException("More than 1 objects for relation "
-                            + NameUtils.getSafeName(graph, resource2) + " with type "
-                            + NameUtils.getSafeName(graph, resource3) + " at "
-                            + NameUtils.getSafeName(graph, resource));
-
-                result = object;
-            }
-        }
-
-        if (result == null)
-            throw new NoSingleResultException("No objects for relation "
-                    + NameUtils.getSafeName(graph, resource2) + " with type "
-                    + NameUtils.getSafeName(graph, resource3) + " at "
-                    + NameUtils.getSafeName(graph, resource));
-
-        return result;
-    }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.common.request;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.NoSingleResultException;
+
+/**
+ * @author Tuukka Lehtonen
+ */
+public final class SingleObjectWithType extends ResourceRead3<Resource> {
+
+    public SingleObjectWithType(Resource resource, Resource predicate, Resource type) {
+        super(resource, predicate, type);
+    }
+
+    @Override
+    public Resource perform(ReadGraph graph) throws DatabaseException {
+        Resource result = null;
+        int resultCount = 0;
+        for (Resource object : graph.getObjects(resource, resource2)) {
+            if (graph.isInstanceOf(object, resource3)) {
+                if (result == null) {
+                    result = object;
+                } else {
+                    // okay, too many results but lets calculate for debug
+                    resultCount++;
+                }
+            }
+        }
+        
+        if (resultCount != 1) {
+            String reason = resultCount == 0 ? "No objects for relation " : "Multiple objects for relation ";
+            throw new NoSingleResultException(reason
+                    + NameUtils.getSafeName(graph, resource2) + " with type "
+                    + NameUtils.getSafeName(graph, resource3) + " at "
+                    + NameUtils.getSafeName(graph, resource), resultCount);
+        }
+
+        return result;
+    }
+
+}