X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Furi%2FUnescapedChildMapOfResource.java;fp=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Furi%2FUnescapedChildMapOfResource.java;h=53ee12219747f28970872bc3f1b3d86455990f99;hb=1f8b50d81a1aa1bbd67a77f7cbc1060f2eb805d4;hp=f9517f7bbe0c495ba6e6ab9b32b5c2b1d6b3e8fe;hpb=86bb6157fdcb4a11caee57487cf8fa894eaae2dd;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..53ee12219 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
@@ -11,17 +11,12 @@
  *******************************************************************************/
 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;
 
@@ -35,22 +30,23 @@ public class UnescapedChildMapOfResource extends ResourceRead<Map<String, Resour
 	
 	@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);
+//	    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;
 	}	
 	
 }