X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Furi%2FUnescapedChildMapOfResource.java;h=7713535b50ddcf5b4366070ed644ddc5185875c6;hb=0d9b90834ce56b292c00b1a39850ed842c3e4d42;hp=f9517f7bbe0c495ba6e6ab9b32b5c2b1d6b3e8fe;hpb=e5db6157fd8722c946613d4e46d7aaf6bfa92609;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/uri/UnescapedChildMapOfResource.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/uri/UnescapedChildMapOfResource.java
index f9517f7bb..7713535b5 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/uri/UnescapedChildMapOfResource.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/uri/UnescapedChildMapOfResource.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * Copyright (c) 2007, 2018 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
@@ -11,46 +11,22 @@
  *******************************************************************************/
 package org.simantics.db.common.uri;
 
-import java.util.Collection;
 import java.util.Map;
 
-import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.request.ResourceRead;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.service.CollectionSupport;
-import org.simantics.layer0.Layer0;
-import org.simantics.utils.Development;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class UnescapedChildMapOfResource extends ResourceRead<Map<String, Resource>> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnescapedChildMapOfResource.class);
-
 	public UnescapedChildMapOfResource(Resource resource) {
-	    super(resource);
+		super(resource);
 	}
-	
+
 	@Override
 	public Map<String, Resource> perform(ReadGraph graph) throws DatabaseException {
-	    Layer0 L0 = Layer0.getInstance(graph);
-	    Collection<Resource> objects = graph.getObjects(resource, L0.ConsistsOf);
-	    CollectionSupport cs = graph.getService(CollectionSupport.class);
-	    Map<String,Resource> result = cs.createObjectResourceMap(String.class, objects.size());
-	    for(Resource r : objects) {
-	        String name = graph.getPossibleRelatedValue(r, L0.HasName, Bindings.STRING);
-	        if(name != null) {
-	            Resource old = result.put(name, r);
-	            if (old != null)
-	                LOGGER.error("The database contains siblings with the same name " + name + " (resource=$" + resource.getResourceId() + ", child=$" + r.getResourceId() + ", previous child=$" + old.getResourceId() + ").");
-	        } else {
-	        	if(Development.DEVELOPMENT)
-	        	    LOGGER.error("The database contains a child with no unique name (resource=$" + resource.getResourceId() + ", child=$" + r.getResourceId() + ").");
-	        }
-	    }
-	    return result;
-	}	
-	
+		return graph.getChildren(resource);
+	}
+
 }